Merge pull request #39 from kaferi/master

Update to v20.8

Author: kaferi

README.md

@@ -1,6 +1,6 @@
 # Aspose.PDF Cloud
 - API version: 3.0
-- Package version: 20.7.0
+- Package version: 20.8.0
 
 [Aspose.PDF Cloud](https://products.aspose.cloud/pdf) is a true REST API that enables you to perform a wide range of document processing operations including creation, manipulation, conversion and rendering of PDF documents in the cloud.
 
@@ -38,7 +38,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.aspose</groupId>
     <artifactId>aspose-cloud-pdf-android</artifactId>
-    <version>20.7.0</version>
+    <version>20.8.0</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -48,7 +48,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "com.aspose:aspose-cloud-pdf-android:20.7.0"
+compile "com.aspose:aspose-cloud-pdf-android:20.8.0"
 ```
 
 ### Others
@@ -59,7 +59,7 @@ At first generate the JAR by executing:
 
 Then manually install the following JARs:
 
-* target/aspose-cloud-pdf-android-20.7.0.jar
+* target/aspose-cloud-pdf-android-20.8.0.jar
 * target/lib/*.jar
 
 ## Getting Started

sdk/build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.aspose'
-version = '20.7.0'
+version = '20.8.0'
 
 buildscript {
     repositories {
@@ -96,7 +96,7 @@ dependencies {
 publish {
     groupId = 'com.aspose'
     artifactId = 'aspose-cloud-pdf-android'
-    publishVersion = '20.7.0'
+    publishVersion = '20.8.0'
     desc = 'Aspose.PDF Cloud is a REST API for creating and editing PDF files. It can also be used to convert PDF files to different formats like DOC, HTML, XPS, TIFF and many more. Aspose.PDF Cloud gives you control: create PDFs from scratch or from HTML, XML, template, database, XPS or an image. Render PDFs to image formats such as JPEG, PNG, GIF, BMP, TIFF and many others. Aspose.PDF Cloud helps you manipulate elements of a PDF file like text, annotations, watermarks, signatures, bookmarks, stamps and so on. Its REST API also allows you to manage PDF pages by using features like merging, splitting, and inserting. Add images to a PDF file or convert PDF pages to images.'
     licences = ['MIT']
     website = 'https://products.aspose.cloud/pdf/cloud'

sdk/docs/Paragraph.md

@@ -7,15 +7,15 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **lineSpacing** | [**LineSpacing**](LineSpacing.md) | Line spacing mode. | [optional]
 **wrapMode** | [**WrapMode**](WrapMode.md) | Word wrap mode. | [optional]
-**horizontalAlignment** | [**TextHorizontalAlignment**](TextHorizontalAlignment.md) | Horizontal alignment for the text inside paragrph's rectangle. | [optional]
+**horizontalAlignment** | [**TextHorizontalAlignment**](TextHorizontalAlignment.md) | Horizontal alignment for the text inside paragraph's rectangle. | [optional]
 **leftMargin** | **Double** | Left margin. | [optional]
 **rightMargin** | **Double** | Right margin. | [optional]
 **topMargin** | **Double** | Top margin. | [optional]
 **bottomMargin** | **Double** | Bottom margin. | [optional]
 **rectangle** | [**Rectangle**](Rectangle.md) | Rectangle of the paragraph. | [optional]
 **rotation** | **Double** | Rotation angle in degrees. | [optional]
 **subsequentLinesIndent** | **Double** | Subsequent lines indent value. | [optional]
-**verticalAlignment** | [**VerticalAlignment**](VerticalAlignment.md) | Vertical alignment for the text inside paragrph's rectangle | [optional]
+**verticalAlignment** | [**VerticalAlignment**](VerticalAlignment.md) | Vertical alignment for the text inside paragraph's rectangle | [optional]
 **lines** | [**List<TextLine>**](TextLine.md) | An array of text lines. | 
 
 

sdk/docs/TextState.md

@@ -6,10 +6,11 @@ Represents a text state of a text
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **fontSize** | **Double** | Gets or sets font size of the text. | 
-**font** | **String** | Gets or sets font of the text. | [optional]
+**font** | **String** | Gets or sets font name of the text. | [optional]
 **foregroundColor** | [**Color**](Color.md) | Gets or sets foreground color of the text. | [optional]
 **backgroundColor** | [**Color**](Color.md) | Sets background color of the text. | [optional]
 **fontStyle** | [**FontStyles**](FontStyles.md) | Sets font style of the text. | 
+**fontFile** | **String** | Sets path of font file in storage. | [optional]
 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)

sdk/src/main/java/com/aspose/asposecloudpdfandroid/ApiClient.java

@@ -92,7 +92,7 @@ public ApiClient() {
 
         // Add custom headers
         addDefaultHeader("x-aspose-client", "android sdk");
-        addDefaultHeader("x-aspose-client-version", "20.7.0");
+        addDefaultHeader("x-aspose-client-version", "20.8.0");
 
         // PDFCLOUD-418 Set default Connect Timeout
         setConnectTimeout(5 * 60 * 1000);

sdk/src/main/java/com/aspose/asposecloudpdfandroid/model/Paragraph.java

@@ -124,10 +124,10 @@ public Paragraph horizontalAlignment(TextHorizontalAlignment horizontalAlignment
   }
 
    /**
-   * Horizontal alignment for the text inside paragrph's rectangle.
+   * Horizontal alignment for the text inside paragraph's rectangle.
    * @return horizontalAlignment
   **/
-  @ApiModelProperty(value = "Horizontal alignment for the text inside paragrph's rectangle.")
+  @ApiModelProperty(value = "Horizontal alignment for the text inside paragraph's rectangle.")
   public TextHorizontalAlignment getHorizontalAlignment() {
     return horizontalAlignment;
   }
@@ -268,10 +268,10 @@ public Paragraph verticalAlignment(VerticalAlignment verticalAlignment) {
   }
 
    /**
-   * Vertical alignment for the text inside paragrph's rectangle
+   * Vertical alignment for the text inside paragraph's rectangle
    * @return verticalAlignment
   **/
-  @ApiModelProperty(value = "Vertical alignment for the text inside paragrph's rectangle")
+  @ApiModelProperty(value = "Vertical alignment for the text inside paragraph's rectangle")
   public VerticalAlignment getVerticalAlignment() {
     return verticalAlignment;
   }

sdk/src/main/java/com/aspose/asposecloudpdfandroid/model/TextState.java

@@ -55,6 +55,9 @@ public class TextState {
   @SerializedName("FontStyle")
   private FontStyles fontStyle = null;
 
+  @SerializedName("FontFile")
+  private String fontFile = null;
+
   public TextState fontSize(Double fontSize) {
     this.fontSize = fontSize;
     return this;
@@ -79,10 +82,10 @@ public TextState font(String font) {
   }
 
    /**
-   * Gets or sets font of the text.
+   * Gets or sets font name of the text.
    * @return font
   **/
-  @ApiModelProperty(value = "Gets or sets font of the text.")
+  @ApiModelProperty(value = "Gets or sets font name of the text.")
   public String getFont() {
     return font;
   }
@@ -145,6 +148,24 @@ public void setFontStyle(FontStyles fontStyle) {
     this.fontStyle = fontStyle;
   }
 
+  public TextState fontFile(String fontFile) {
+    this.fontFile = fontFile;
+    return this;
+  }
+
+   /**
+   * Sets path of font file in storage.
+   * @return fontFile
+  **/
+  @ApiModelProperty(value = "Sets path of font file in storage.")
+  public String getFontFile() {
+    return fontFile;
+  }
+
+  public void setFontFile(String fontFile) {
+    this.fontFile = fontFile;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -159,12 +180,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.font, textState.font) &&
         Objects.equals(this.foregroundColor, textState.foregroundColor) &&
         Objects.equals(this.backgroundColor, textState.backgroundColor) &&
-        Objects.equals(this.fontStyle, textState.fontStyle);
+        Objects.equals(this.fontStyle, textState.fontStyle) &&
+        Objects.equals(this.fontFile, textState.fontFile);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(fontSize, font, foregroundColor, backgroundColor, fontStyle);
+    return Objects.hash(fontSize, font, foregroundColor, backgroundColor, fontStyle, fontFile);
   }
 
 
@@ -178,6 +200,7 @@ public String toString() {
     sb.append("    foregroundColor: ").append(toIndentedString(foregroundColor)).append("\n");
     sb.append("    backgroundColor: ").append(toIndentedString(backgroundColor)).append("\n");
     sb.append("    fontStyle: ").append(toIndentedString(fontStyle)).append("\n");
+    sb.append("    fontFile: ").append(toIndentedString(fontFile)).append("\n");
     sb.append("}");
     return sb.toString();
   }

sdk/src/test/java/com/aspose/asposecloudpdfandroid/api/HeaderFooterTests.java

@@ -64,7 +64,8 @@ public void postDocumentTextHeaderTest()throws ApiException
         TextState textState = new TextState()
                 .fontSize(14.)
                 .foregroundColor(foregroundColor)
-                .backgroundColor(backgroundColor);
+                .backgroundColor(backgroundColor)
+                .font("Arial");
 
         TextHeader header = new TextHeader()
                 .leftMargin(1.)
@@ -116,7 +117,8 @@ public void postDocumentTextFooterTest()throws ApiException
         TextState textState = new TextState()
                 .fontSize(14.)
                 .foregroundColor(foregroundColor)
-                .backgroundColor(backgroundColor);
+                .backgroundColor(backgroundColor)
+                .font("Arial");
 
         TextFooter footer = new TextFooter()
                 .leftMargin(1.)

sdk/src/test/java/com/aspose/asposecloudpdfandroid/api/StampTests.java

@@ -111,7 +111,7 @@ public void postPageTextStampsTest()throws ApiException
         th.uploadFile(name);
         int pageNumber = 1;
 
-        TextState textState = new TextState().fontSize(14.);
+        TextState textState = new TextState().fontSize(14.).font("Arial");
 
         TextStamp stamp = new TextStamp()
                 .textAlignment(HorizontalAlignment.CENTER)

sdk/src/test/java/com/aspose/asposecloudpdfandroid/api/TextTests.java

@@ -99,6 +99,9 @@ public void putAddTextTest() throws ApiException
         String name = "4pages.pdf";
         th.uploadFile(name);
 
+        String fontFile = "Righteous-Regular.ttf";
+        th.uploadFile(fontFile);
+
         int pageNumber = 1;
         String folder = th.tempFolder;
 
@@ -121,11 +124,12 @@ public void putAddTextTest() throws ApiException
         backgroundColor.setB(0x00);
 
         TextState textState = new TextState();
-        textState.setFont("Arial");
+        textState.setFont("Righteous");
         textState.setFontSize(10.);
         textState.setForegroundColor(foregroundColor);
         textState.setBackgroundColor(backgroundColor);
-        textState.setFontStyle(FontStyles.BOLD);
+        textState.setFontStyle(FontStyles.REGULAR);
+        textState.setFontFile(folder + '/' + fontFile);
 
         final Segment segment = new Segment();
         segment.setValue("segment 1");