Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,13 @@ This repository contains Aspose.Words Cloud SDK for Java source code. This SDK a
 * Watermarks and protection
 * Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
 
+## Enhancements in Version 22.2
+
+- Made 'SaveOprionsData.SaveFormat' property readonly with default value.
+- Added subclasses for all formats of SaveOprionsData with specified SaveFormat.
+- 'SaveOptionsData', 'FixedPageSaveOptionsData', 'ImageSaveOptionsData', 'OoxmlSaveOptionsData', 'TxtSaveOptionsBaseData' classes now is abstract.
+
+
 ## Enhancements in Version 22.1
 
 - Added 'FieldOptions.FieldUpdateCultureName' to set Culture for fields
@@ -190,7 +197,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>22.1.0</version>
+        <version>22.2.0</version>
     </dependency>
 </dependencies>
 ```

checkstyle.xml

@@ -12,7 +12,6 @@
     </module>
 
     <module name="TreeWalker">
-        <module name="AbstractClassName"/>
         <module name="ClassTypeParameterName"/>
         <module name="ConstantName"/>
         <module name="InterfaceTypeParameterName"/>

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>aspose-words-cloud</artifactId>
     <packaging>jar</packaging>
     <name>AsposeWordsCloud</name>
-    <version>22.1.0</version>
+    <version>22.2.0</version>
     <url>https://www.aspose.cloud/</url>
     <description>Aspose Words Java SDK</description>
     <scm>
@@ -17,7 +17,7 @@
     <distributionManagement>
         <repository>
             <id>aspose</id>
-            <url>https://repository.aspose.cloud/repo/</url>
+            <url>http://repository.aspose.cloud/repo/</url>
         </repository>
     </distributionManagement>
 

src/main/java/com/aspose/words/cloud/ApiClient.java

@@ -68,7 +68,7 @@ public class ApiClient {
     private String apiVersion = "v4.0";
     private String baseUrl = "https://api.aspose.cloud";
     private String basePath = baseUrl + "/" + apiVersion;
-    private String clientVersion = "22.1";
+    private String clientVersion = "22.2";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;

src/main/java/com/aspose/words/cloud/model/ApiError.java

@@ -48,24 +48,19 @@
 @ApiModel(description = "Api error.")
 public class ApiError {
     @SerializedName("Code")
-    private String code = null;
+    protected String code;
 
     @SerializedName("DateTime")
-    private OffsetDateTime dateTime = null;
+    protected OffsetDateTime dateTime;
 
     @SerializedName("Description")
-    private String description = null;
+    protected String description;
 
     @SerializedName("InnerError")
-    private ApiError innerError = null;
+    protected ApiError innerError;
 
     @SerializedName("Message")
-    private String message = null;
-    public ApiError code(String code) {
-        this.code = code;
-        return this;
-    }
-
+    protected String message;
     /**
      * Gets or sets the API error code.
     * @return code
@@ -75,15 +70,16 @@ public String getCode() {
         return code;
     }
 
-    public void setCode(String code) {
+    public ApiError code(String code) {
         this.code = code;
+        return this;
     }
 
-    public ApiError dateTime(OffsetDateTime dateTime) {
-        this.dateTime = dateTime;
-        return this;
+    public void setCode(String code) {
+        this.code = code;
     }
 
+
     /**
      * Gets or sets the server DateTime.
     * @return dateTime
@@ -93,15 +89,16 @@ public OffsetDateTime getDateTime() {
         return dateTime;
     }
 
-    public void setDateTime(OffsetDateTime dateTime) {
+    public ApiError dateTime(OffsetDateTime dateTime) {
         this.dateTime = dateTime;
+        return this;
     }
 
-    public ApiError description(String description) {
-        this.description = description;
-        return this;
+    public void setDateTime(OffsetDateTime dateTime) {
+        this.dateTime = dateTime;
     }
 
+
     /**
      * Gets or sets the error description.
     * @return description
@@ -111,15 +108,16 @@ public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public ApiError description(String description) {
         this.description = description;
+        return this;
     }
 
-    public ApiError innerError(ApiError innerError) {
-        this.innerError = innerError;
-        return this;
+    public void setDescription(String description) {
+        this.description = description;
     }
 
+
     /**
      * Gets or sets the inner error.
     * @return innerError
@@ -129,15 +127,16 @@ public ApiError getInnerError() {
         return innerError;
     }
 
-    public void setInnerError(ApiError innerError) {
+    public ApiError innerError(ApiError innerError) {
         this.innerError = innerError;
+        return this;
     }
 
-    public ApiError message(String message) {
-        this.message = message;
-        return this;
+    public void setInnerError(ApiError innerError) {
+        this.innerError = innerError;
     }
 
+
     /**
      * Gets or sets the error message.
     * @return message
@@ -147,10 +146,24 @@ public String getMessage() {
         return message;
     }
 
+    public ApiError message(String message) {
+        this.message = message;
+        return this;
+    }
+
     public void setMessage(String message) {
         this.message = message;
     }
 
+
+    public ApiError() {
+        this.code = null;
+        this.dateTime = null;
+        this.description = null;
+        this.innerError = null;
+        this.message = null;
+    }
+
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -178,11 +191,11 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ApiError {\n");
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    innerError: ").append(toIndentedString(innerError)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("    code: ").append(toIndentedString(getCode())).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(getDateTime())).append("\n");
+    sb.append("    description: ").append(toIndentedString(getDescription())).append("\n");
+    sb.append("    innerError: ").append(toIndentedString(getInnerError())).append("\n");
+    sb.append("    message: ").append(toIndentedString(getMessage())).append("\n");
     sb.append("}");
     return sb.toString();
   }

src/main/java/com/aspose/words/cloud/model/AvailableFontsResponse.java

@@ -48,13 +48,22 @@
 @ApiModel(description = "The REST response with data on system, additional and custom fonts, available for document processing.")
 public class AvailableFontsResponse extends WordsResponse {
     @SerializedName("AdditionalFonts")
-    private List<FontInfo> additionalFonts = null;
+    protected List<FontInfo> additionalFonts;
 
     @SerializedName("CustomFonts")
-    private List<FontInfo> customFonts = null;
+    protected List<FontInfo> customFonts;
 
     @SerializedName("SystemFonts")
-    private List<FontInfo> systemFonts = null;
+    protected List<FontInfo> systemFonts;
+    /**
+     * Gets or sets the list of additional fonts, provided by Aspose team.
+    * @return additionalFonts
+    **/
+    @ApiModelProperty(value = "Gets or sets the list of additional fonts, provided by Aspose team.")
+    public List<FontInfo> getAdditionalFonts() {
+        return additionalFonts;
+    }
+
     public AvailableFontsResponse additionalFonts(List<FontInfo> additionalFonts) {
         this.additionalFonts = additionalFonts;
         return this;
@@ -68,19 +77,21 @@ public AvailableFontsResponse addAdditionalFontsItem(FontInfo additionalFontsIte
         return this;
     }
 
-    /**
-     * Gets or sets the list of additional fonts, provided by Aspose team.
-    * @return additionalFonts
-    **/
-    @ApiModelProperty(value = "Gets or sets the list of additional fonts, provided by Aspose team.")
-    public List<FontInfo> getAdditionalFonts() {
-        return additionalFonts;
-    }
 
     public void setAdditionalFonts(List<FontInfo> additionalFonts) {
         this.additionalFonts = additionalFonts;
     }
 
+
+    /**
+     * Gets or sets the list of custom user fonts from user cloud storage. To use them, you should specify "fontsLocation" parameter in any request.
+    * @return customFonts
+    **/
+    @ApiModelProperty(value = "Gets or sets the list of custom user fonts from user cloud storage. To use them, you should specify \"fontsLocation\" parameter in any request.")
+    public List<FontInfo> getCustomFonts() {
+        return customFonts;
+    }
+
     public AvailableFontsResponse customFonts(List<FontInfo> customFonts) {
         this.customFonts = customFonts;
         return this;
@@ -94,19 +105,21 @@ public AvailableFontsResponse addCustomFontsItem(FontInfo customFontsItem) {
         return this;
     }
 
-    /**
-     * Gets or sets the list of custom user fonts from user cloud storage. To use them, you should specify "fontsLocation" parameter in any request.
-    * @return customFonts
-    **/
-    @ApiModelProperty(value = "Gets or sets the list of custom user fonts from user cloud storage. To use them, you should specify \"fontsLocation\" parameter in any request.")
-    public List<FontInfo> getCustomFonts() {
-        return customFonts;
-    }
 
     public void setCustomFonts(List<FontInfo> customFonts) {
         this.customFonts = customFonts;
     }
 
+
+    /**
+     * Gets or sets the list of system fonts, available on the server.
+    * @return systemFonts
+    **/
+    @ApiModelProperty(value = "Gets or sets the list of system fonts, available on the server.")
+    public List<FontInfo> getSystemFonts() {
+        return systemFonts;
+    }
+
     public AvailableFontsResponse systemFonts(List<FontInfo> systemFonts) {
         this.systemFonts = systemFonts;
         return this;
@@ -120,19 +133,19 @@ public AvailableFontsResponse addSystemFontsItem(FontInfo systemFontsItem) {
         return this;
     }
 
-    /**
-     * Gets or sets the list of system fonts, available on the server.
-    * @return systemFonts
-    **/
-    @ApiModelProperty(value = "Gets or sets the list of system fonts, available on the server.")
-    public List<FontInfo> getSystemFonts() {
-        return systemFonts;
-    }
 
     public void setSystemFonts(List<FontInfo> systemFonts) {
         this.systemFonts = systemFonts;
     }
 
+
+    public AvailableFontsResponse() {
+        super();
+        this.additionalFonts = null;
+        this.customFonts = null;
+        this.systemFonts = null;
+    }
+
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -159,10 +172,10 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AvailableFontsResponse {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    additionalFonts: ").append(toIndentedString(additionalFonts)).append("\n");
-    sb.append("    customFonts: ").append(toIndentedString(customFonts)).append("\n");
-    sb.append("    systemFonts: ").append(toIndentedString(systemFonts)).append("\n");
+    sb.append("    requestId: ").append(toIndentedString(getRequestId())).append("\n");
+    sb.append("    additionalFonts: ").append(toIndentedString(getAdditionalFonts())).append("\n");
+    sb.append("    customFonts: ").append(toIndentedString(getCustomFonts())).append("\n");
+    sb.append("    systemFonts: ").append(toIndentedString(getSystemFonts())).append("\n");
     sb.append("}");
     return sb.toString();
   }

src/main/java/com/aspose/words/cloud/model/BmpSaveOptionsData.java

@@ -48,6 +48,11 @@
 @ApiModel(description = "Container class for bmp save options.")
 public class BmpSaveOptionsData extends ImageSaveOptionsData {
 
+    public BmpSaveOptionsData() {
+        super();
+        this.saveFormat = "bmp";
+    }
+
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -69,7 +74,40 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class BmpSaveOptionsData {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    allowEmbeddingPostScriptFonts: ").append(toIndentedString(getAllowEmbeddingPostScriptFonts())).append("\n");
+    sb.append("    customTimeZoneInfoData: ").append(toIndentedString(getCustomTimeZoneInfoData())).append("\n");
+    sb.append("    dml3DEffectsRenderingMode: ").append(toIndentedString(getDml3DEffectsRenderingMode())).append("\n");
+    sb.append("    dmlEffectsRenderingMode: ").append(toIndentedString(getDmlEffectsRenderingMode())).append("\n");
+    sb.append("    dmlRenderingMode: ").append(toIndentedString(getDmlRenderingMode())).append("\n");
+    sb.append("    fileName: ").append(toIndentedString(getFileName())).append("\n");
+    sb.append("    flatOpcXmlMappingOnly: ").append(toIndentedString(getFlatOpcXmlMappingOnly())).append("\n");
+    sb.append("    imlRenderingMode: ").append(toIndentedString(getImlRenderingMode())).append("\n");
+    sb.append("    updateCreatedTimeProperty: ").append(toIndentedString(getUpdateCreatedTimeProperty())).append("\n");
+    sb.append("    updateFields: ").append(toIndentedString(getUpdateFields())).append("\n");
+    sb.append("    updateLastPrintedProperty: ").append(toIndentedString(getUpdateLastPrintedProperty())).append("\n");
+    sb.append("    updateLastSavedTimeProperty: ").append(toIndentedString(getUpdateLastSavedTimeProperty())).append("\n");
+    sb.append("    updateSdtContent: ").append(toIndentedString(getUpdateSdtContent())).append("\n");
+    sb.append("    zipOutput: ").append(toIndentedString(getZipOutput())).append("\n");
+    sb.append("    colorMode: ").append(toIndentedString(getColorMode())).append("\n");
+    sb.append("    jpegQuality: ").append(toIndentedString(getJpegQuality())).append("\n");
+    sb.append("    metafileRenderingOptions: ").append(toIndentedString(getMetafileRenderingOptions())).append("\n");
+    sb.append("    numeralFormat: ").append(toIndentedString(getNumeralFormat())).append("\n");
+    sb.append("    optimizeOutput: ").append(toIndentedString(getOptimizeOutput())).append("\n");
+    sb.append("    pageCount: ").append(toIndentedString(getPageCount())).append("\n");
+    sb.append("    pageIndex: ").append(toIndentedString(getPageIndex())).append("\n");
+    sb.append("    horizontalResolution: ").append(toIndentedString(getHorizontalResolution())).append("\n");
+    sb.append("    imageBrightness: ").append(toIndentedString(getImageBrightness())).append("\n");
+    sb.append("    imageColorMode: ").append(toIndentedString(getImageColorMode())).append("\n");
+    sb.append("    imageContrast: ").append(toIndentedString(getImageContrast())).append("\n");
+    sb.append("    paperColor: ").append(toIndentedString(getPaperColor())).append("\n");
+    sb.append("    pixelFormat: ").append(toIndentedString(getPixelFormat())).append("\n");
+    sb.append("    resolution: ").append(toIndentedString(getResolution())).append("\n");
+    sb.append("    scale: ").append(toIndentedString(getScale())).append("\n");
+    sb.append("    useAntiAliasing: ").append(toIndentedString(getUseAntiAliasing())).append("\n");
+    sb.append("    useGdiEmfRenderer: ").append(toIndentedString(getUseGdiEmfRenderer())).append("\n");
+    sb.append("    useHighQualityRendering: ").append(toIndentedString(getUseHighQualityRendering())).append("\n");
+    sb.append("    verticalResolution: ").append(toIndentedString(getVerticalResolution())).append("\n");
+    sb.append("    saveFormat: ").append(toIndentedString(getSaveFormat())).append("\n");
     sb.append("}");
     return sb.toString();
   }