Updated sources

Author: product-team

README.md

@@ -24,7 +24,7 @@ Add following repository and dependency to your project's POM
 <dependency>
     <groupId>com.groupdocs</groupId>
     <artifactId>groupdocs-conversion-cloud</artifactId>
-    <version>24.1</version>
+    <version>24.2</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -43,7 +43,7 @@ repositories {
 ...
 dependencies {
     ...
-    implementation 'com.groupdocs:groupdocs-conversion-cloud:24.1'
+    implementation 'com.groupdocs:groupdocs-conversion-cloud:24.2'
 }
 ```
 
@@ -100,7 +100,7 @@ mvn package -D maven.test.skip=true
 
 Then manually install the following JARs:
 
-* target/groupdocs-conversion-cloud-24.1.jar
+* target/groupdocs-conversion-cloud-24.2.jar
 * target/lib/*.jar
 
 ## Licensing

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>groupdocs-conversion-cloud</artifactId>
     <packaging>jar</packaging>
     <name>groupdocs-conversion-cloud</name>
-    <version>24.1</version>
+    <version>24.2</version>
     <url>https://github.com/groupdocs-conversion-cloud/groupdocs-conversion-cloud-java</url>
     <description>Java library for communicating with the GroupDocs.Conversion Cloud API</description>
     <scm>

simplified-pom.template

@@ -5,7 +5,7 @@
 
     <groupId>com.groupdocs</groupId>
     <artifactId>groupdocs-conversion-cloud</artifactId>
-    <version>24.1</version>
+    <version>24.2</version>
     <packaging>jar</packaging>
 
     <name>groupdocs-conversion-cloud</name>

src/main/java/com/groupdocs/cloud/conversion/client/ApiClient.java

@@ -62,11 +62,9 @@
 
 import com.groupdocs.cloud.conversion.client.auth.Authentication;
 import com.groupdocs.cloud.conversion.client.auth.OAuth;
-import com.groupdocs.cloud.conversion.model.ApiError;
 import com.groupdocs.cloud.conversion.model.AuthError;
 
-public class ApiClient {
-    private Configuration configuration = null;
+public class ApiClient {    
 
     private String serverUrl = null;
     private boolean debugging = false;
@@ -90,14 +88,14 @@ public class ApiClient {
      * Constructor for ApiClient
      */
     public ApiClient(Configuration configuration) {
-        this.configuration = configuration;
+
         this.serverUrl = configuration.getServerUrl();
         this.httpClient = new OkHttpClient();
         this.verifyingSsl = true;
         this.json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("java-sdk/24.1");
+        setUserAgent("java-sdk/24.2");
 
         // Set connection timeout
         setConnectTimeout(configuration.getTimeout());

src/main/java/com/groupdocs/cloud/conversion/model/PdfConvertOptions.java

@@ -52,7 +52,7 @@ public class PdfConvertOptions extends ConvertOptions {
   private Integer height = null;
 
   @SerializedName("dpi")
-  private Double dpi = null;
+  private Integer dpi = null;
 
   @SerializedName("password")
   private String password = null;
@@ -475,6 +475,140 @@ public RotateEnum read(final JsonReader jsonReader) throws IOException {
   @SerializedName("rotate")
   private RotateEnum rotate = null;
 
+  /**
+   * Specifies page size
+   */
+  @JsonAdapter(PageSizeEnum.Adapter.class)
+  public enum PageSizeEnum {
+    DEFAULT("Default"),
+    
+    A3("A3"),
+    
+    STATEMENT("Statement"),
+    
+    QUARTO("Quarto"),
+    
+    PAPER11X17("Paper11x17"),
+    
+    PAPER10X14("Paper10x14"),
+    
+    LETTER("Letter"),
+    
+    LEGAL("Legal"),
+    
+    LEDGER("Ledger"),
+    
+    FOLIO("Folio"),
+    
+    EXECUTIVE("Executive"),
+    
+    ENVELOPEDL("EnvelopeDL"),
+    
+    CUSTOM("Custom"),
+    
+    B5("B5"),
+    
+    B4("B4"),
+    
+    A5("A5"),
+    
+    A4("A4"),
+    
+    TABLOID("Tabloid");
+
+    private String value;
+
+    PageSizeEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static PageSizeEnum fromValue(String text) {
+      for (PageSizeEnum b : PageSizeEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+
+    public static class Adapter extends TypeAdapter<PageSizeEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final PageSizeEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public PageSizeEnum read(final JsonReader jsonReader) throws IOException {
+        String value = jsonReader.nextString();
+        return PageSizeEnum.fromValue(String.valueOf(value));
+      }
+    }
+  }
+
+  @SerializedName("pageSize")
+  private PageSizeEnum pageSize = null;
+
+  /**
+   * Specifies page orientation
+   */
+  @JsonAdapter(PageOrientationEnum.Adapter.class)
+  public enum PageOrientationEnum {
+    DEFAULT("Default"),
+    
+    LANDSCAPE("Landscape"),
+    
+    PORTRAIT("Portrait");
+
+    private String value;
+
+    PageOrientationEnum(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    public static PageOrientationEnum fromValue(String text) {
+      for (PageOrientationEnum b : PageOrientationEnum.values()) {
+        if (String.valueOf(b.value).equals(text)) {
+          return b;
+        }
+      }
+      return null;
+    }
+
+    public static class Adapter extends TypeAdapter<PageOrientationEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final PageOrientationEnum enumeration) throws IOException {
+        jsonWriter.value(enumeration.getValue());
+      }
+
+      @Override
+      public PageOrientationEnum read(final JsonReader jsonReader) throws IOException {
+        String value = jsonReader.nextString();
+        return PageOrientationEnum.fromValue(String.valueOf(value));
+      }
+    }
+  }
+
+  @SerializedName("pageOrientation")
+  private PageOrientationEnum pageOrientation = null;
+
   public PdfConvertOptions width(Integer width) {
     this.width = width;
     return this;
@@ -511,7 +645,7 @@ public void setHeight(Integer height) {
     this.height = height;
   }
 
-  public PdfConvertOptions dpi(Double dpi) {
+  public PdfConvertOptions dpi(Integer dpi) {
     this.dpi = dpi;
     return this;
   }
@@ -521,11 +655,11 @@ public PdfConvertOptions dpi(Double dpi) {
    * @return dpi
   **/
   @ApiModelProperty(required = true, value = "Desired page DPI after conversion. The default resolution is: 96dpi")
-  public Double getDpi() {
+  public Integer getDpi() {
     return dpi;
   }
 
-  public void setDpi(Double dpi) {
+  public void setDpi(Integer dpi) {
     this.dpi = dpi;
   }
 
@@ -1015,6 +1149,42 @@ public void setRotate(RotateEnum rotate) {
     this.rotate = rotate;
   }
 
+  public PdfConvertOptions pageSize(PageSizeEnum pageSize) {
+    this.pageSize = pageSize;
+    return this;
+  }
+
+   /**
+   * Specifies page size
+   * @return pageSize
+  **/
+  @ApiModelProperty(required = true, value = "Specifies page size")
+  public PageSizeEnum getPageSize() {
+    return pageSize;
+  }
+
+  public void setPageSize(PageSizeEnum pageSize) {
+    this.pageSize = pageSize;
+  }
+
+  public PdfConvertOptions pageOrientation(PageOrientationEnum pageOrientation) {
+    this.pageOrientation = pageOrientation;
+    return this;
+  }
+
+   /**
+   * Specifies page orientation
+   * @return pageOrientation
+  **/
+  @ApiModelProperty(required = true, value = "Specifies page orientation")
+  public PageOrientationEnum getPageOrientation() {
+    return pageOrientation;
+  }
+
+  public void setPageOrientation(PageOrientationEnum pageOrientation) {
+    this.pageOrientation = pageOrientation;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -1055,12 +1225,14 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.pageLayout, pdfConvertOptions.pageLayout) &&
         Objects.equals(this.pageMode, pdfConvertOptions.pageMode) &&
         Objects.equals(this.rotate, pdfConvertOptions.rotate) &&
+        Objects.equals(this.pageSize, pdfConvertOptions.pageSize) &&
+        Objects.equals(this.pageOrientation, pdfConvertOptions.pageOrientation) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(width, height, dpi, password, marginTop, marginBottom, marginLeft, marginRight, pdfFormat, removePdfaCompliance, zoom, linearize, linkDuplicateStreams, removeUnusedObjects, removeUnusedStreams, compressImages, imageQuality, unembedFonts, grayscale, centerWindow, direction, displayDocTitle, fitWindow, hideMenuBar, hideToolBar, hideWindowUI, nonFullScreenPageMode, pageLayout, pageMode, rotate, super.hashCode());
+    return Objects.hash(width, height, dpi, password, marginTop, marginBottom, marginLeft, marginRight, pdfFormat, removePdfaCompliance, zoom, linearize, linkDuplicateStreams, removeUnusedObjects, removeUnusedStreams, compressImages, imageQuality, unembedFonts, grayscale, centerWindow, direction, displayDocTitle, fitWindow, hideMenuBar, hideToolBar, hideWindowUI, nonFullScreenPageMode, pageLayout, pageMode, rotate, pageSize, pageOrientation, super.hashCode());
   }
 
 
@@ -1099,6 +1271,8 @@ public String toString() {
     sb.append("    pageLayout: ").append(toIndentedString(pageLayout)).append("\n");
     sb.append("    pageMode: ").append(toIndentedString(pageMode)).append("\n");
     sb.append("    rotate: ").append(toIndentedString(rotate)).append("\n");
+    sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
+    sb.append("    pageOrientation: ").append(toIndentedString(pageOrientation)).append("\n");
     sb.append("}");
     return sb.toString();
   }

src/main/java/com/groupdocs/cloud/conversion/model/WordProcessingConvertOptions.java

@@ -52,7 +52,7 @@ public class WordProcessingConvertOptions extends ConvertOptions {
   private Integer height = null;
 
   @SerializedName("dpi")
-  private Double dpi = null;
+  private Integer dpi = null;
 
   @SerializedName("password")
   private String password = null;
@@ -280,7 +280,7 @@ public void setHeight(Integer height) {
     this.height = height;
   }
 
-  public WordProcessingConvertOptions dpi(Double dpi) {
+  public WordProcessingConvertOptions dpi(Integer dpi) {
     this.dpi = dpi;
     return this;
   }
@@ -290,11 +290,11 @@ public WordProcessingConvertOptions dpi(Double dpi) {
    * @return dpi
   **/
   @ApiModelProperty(required = true, value = "Desired page DPI after conversion. The default resolution is: 96dpi")
-  public Double getDpi() {
+  public Integer getDpi() {
     return dpi;
   }
 
-  public void setDpi(Double dpi) {
+  public void setDpi(Integer dpi) {
     this.dpi = dpi;
   }
 

src/test/java/com/groupdocs/cloud/conversion/api/ConvertApiTests.java

@@ -36,6 +36,7 @@
 
 import com.groupdocs.cloud.conversion.client.ApiException;
 import com.groupdocs.cloud.conversion.model.*;
+import com.groupdocs.cloud.conversion.model.PdfConvertOptions.PageSizeEnum;
 import com.groupdocs.cloud.conversion.model.requests.*;
 
 import org.junit.Test;
@@ -125,6 +126,7 @@ public void convertDocumentDirectWithOptionsTest() throws ApiException, FileNotF
         loadOptions.setFormat("docx");
         loadOptions.setPassword(testFile.getPassword());
         PdfConvertOptions convertOptions = new PdfConvertOptions();
+        convertOptions.setPageSize(PageSizeEnum.A4);
         convertOptions.setMarginTop(5);
 
         ConvertDocumentDirectRequest request = new ConvertDocumentDirectRequest(format, fileObj, 1, 0, loadOptions, convertOptions);