Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,16 @@ 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 23.9
+
+- Support for class inheritance in responses from the server.
+
+
+## Enhancements in Version 23.6
+
+- Fix XMLHttpRequest in web applications.
+
+
 ## Enhancements in Version 23.5
 
 - Added InsertSection method.
@@ -286,7 +296,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>23.5.0</version>
+        <version>23.8.0</version>
     </dependency>
 </dependencies>
 ```

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>aspose-words-cloud</artifactId>
     <packaging>jar</packaging>
     <name>AsposeWordsCloud</name>
-    <version>23.5.0</version>
+    <version>23.8.0</version>
     <url>https://www.aspose.cloud/</url>
     <description>Aspose Words Java SDK</description>
     <scm>

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

@@ -59,7 +59,7 @@ public class ApiClient {
     private String apiVersion = "v4.0";
     private String baseUrl = "https://api.aspose.cloud";
     private String basePath = baseUrl + "/" + apiVersion;
-    private String clientVersion = "23.5";
+    private String clientVersion = "23.8";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;
@@ -1011,7 +1011,7 @@ public void requestToken() throws ApiException {
                     .addEncoded("client_secret", getClientSecret())
                     .build();
 
-            String url = baseUrl + "/connect/token";
+            String url = baseUrl + "/v4.0/words/connect/token";
             Request request = new Request.Builder()
                     .url(url)
                     .post(requestBody)

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

@@ -94,7 +94,6 @@ public String toString() {
     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");
@@ -112,9 +111,9 @@ public String toString() {
     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("    useGdiEmfRenderer: ").append(toIndentedString(getUseGdiEmfRenderer())).append("\n");
     sb.append("    saveFormat: ").append(toIndentedString(getSaveFormat())).append("\n");
     sb.append("}");
     return sb.toString();

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

@@ -47,80 +47,80 @@
  */
 @ApiModel(description = "DTO container with a comment.")
 public class Comment extends CommentLink {
-    @SerializedName("Author")
-    protected String author;
+    @SerializedName("RangeStart")
+    protected DocumentPosition rangeStart;
 
-    @SerializedName("Content")
-    protected StoryChildNodes content;
+    @SerializedName("RangeEnd")
+    protected DocumentPosition rangeEnd;
 
-    @SerializedName("DateTime")
-    protected OffsetDateTime dateTime;
+    @SerializedName("Author")
+    protected String author;
 
     @SerializedName("Initial")
     protected String initial;
 
-    @SerializedName("RangeEnd")
-    protected DocumentPosition rangeEnd;
-
-    @SerializedName("RangeStart")
-    protected DocumentPosition rangeStart;
+    @SerializedName("DateTime")
+    protected OffsetDateTime dateTime;
 
     @SerializedName("Text")
     protected String text;
+
+    @SerializedName("Content")
+    protected StoryChildNodes content;
     /**
-     * Gets or sets the author name for a comment.
-    * @return author
+     * Gets or sets the link to comment range start node.
+    * @return rangeStart
     **/
-    @ApiModelProperty(value = "Gets or sets the author name for a comment.")
-    public String getAuthor() {
-        return author;
+    @ApiModelProperty(value = "Gets or sets the link to comment range start node.")
+    public DocumentPosition getRangeStart() {
+        return rangeStart;
     }
 
-    public Comment author(String author) {
-        this.author = author;
+    public Comment rangeStart(DocumentPosition rangeStart) {
+        this.rangeStart = rangeStart;
         return this;
     }
 
-    public void setAuthor(String author) {
-        this.author = author;
+    public void setRangeStart(DocumentPosition rangeStart) {
+        this.rangeStart = rangeStart;
     }
 
 
     /**
-     * Gets or sets the content of the comment.
-    * @return content
+     * Gets or sets the link to comment range end node.
+    * @return rangeEnd
     **/
-    @ApiModelProperty(value = "Gets or sets the content of the comment.")
-    public StoryChildNodes getContent() {
-        return content;
+    @ApiModelProperty(value = "Gets or sets the link to comment range end node.")
+    public DocumentPosition getRangeEnd() {
+        return rangeEnd;
     }
 
-    public Comment content(StoryChildNodes content) {
-        this.content = content;
+    public Comment rangeEnd(DocumentPosition rangeEnd) {
+        this.rangeEnd = rangeEnd;
         return this;
     }
 
-    public void setContent(StoryChildNodes content) {
-        this.content = content;
+    public void setRangeEnd(DocumentPosition rangeEnd) {
+        this.rangeEnd = rangeEnd;
     }
 
 
     /**
-     * Gets or sets the date and time that the comment was made.
-    * @return dateTime
+     * Gets or sets the author name for a comment.
+    * @return author
     **/
-    @ApiModelProperty(value = "Gets or sets the date and time that the comment was made.")
-    public OffsetDateTime getDateTime() {
-        return dateTime;
+    @ApiModelProperty(value = "Gets or sets the author name for a comment.")
+    public String getAuthor() {
+        return author;
     }
 
-    public Comment dateTime(OffsetDateTime dateTime) {
-        this.dateTime = dateTime;
+    public Comment author(String author) {
+        this.author = author;
         return this;
     }
 
-    public void setDateTime(OffsetDateTime dateTime) {
-        this.dateTime = dateTime;
+    public void setAuthor(String author) {
+        this.author = author;
     }
 
 
@@ -144,71 +144,71 @@ public void setInitial(String initial) {
 
 
     /**
-     * Gets or sets the link to comment range end node.
-    * @return rangeEnd
+     * Gets or sets the date and time that the comment was made.
+    * @return dateTime
     **/
-    @ApiModelProperty(value = "Gets or sets the link to comment range end node.")
-    public DocumentPosition getRangeEnd() {
-        return rangeEnd;
+    @ApiModelProperty(value = "Gets or sets the date and time that the comment was made.")
+    public OffsetDateTime getDateTime() {
+        return dateTime;
     }
 
-    public Comment rangeEnd(DocumentPosition rangeEnd) {
-        this.rangeEnd = rangeEnd;
+    public Comment dateTime(OffsetDateTime dateTime) {
+        this.dateTime = dateTime;
         return this;
     }
 
-    public void setRangeEnd(DocumentPosition rangeEnd) {
-        this.rangeEnd = rangeEnd;
+    public void setDateTime(OffsetDateTime dateTime) {
+        this.dateTime = dateTime;
     }
 
 
     /**
-     * Gets or sets the link to comment range start node.
-    * @return rangeStart
+     * Gets or sets text of the comment.
+    * @return text
     **/
-    @ApiModelProperty(value = "Gets or sets the link to comment range start node.")
-    public DocumentPosition getRangeStart() {
-        return rangeStart;
+    @ApiModelProperty(value = "Gets or sets text of the comment.")
+    public String getText() {
+        return text;
     }
 
-    public Comment rangeStart(DocumentPosition rangeStart) {
-        this.rangeStart = rangeStart;
+    public Comment text(String text) {
+        this.text = text;
         return this;
     }
 
-    public void setRangeStart(DocumentPosition rangeStart) {
-        this.rangeStart = rangeStart;
+    public void setText(String text) {
+        this.text = text;
     }
 
 
     /**
-     * Gets or sets text of the comment.
-    * @return text
+     * Gets or sets the content of the comment.
+    * @return content
     **/
-    @ApiModelProperty(value = "Gets or sets text of the comment.")
-    public String getText() {
-        return text;
+    @ApiModelProperty(value = "Gets or sets the content of the comment.")
+    public StoryChildNodes getContent() {
+        return content;
     }
 
-    public Comment text(String text) {
-        this.text = text;
+    public Comment content(StoryChildNodes content) {
+        this.content = content;
         return this;
     }
 
-    public void setText(String text) {
-        this.text = text;
+    public void setContent(StoryChildNodes content) {
+        this.content = content;
     }
 
 
     public Comment() {
         super();
+        this.rangeStart = null;
+        this.rangeEnd = null;
         this.author = null;
-        this.content = null;
-        this.dateTime = null;
         this.initial = null;
-        this.rangeEnd = null;
-        this.rangeStart = null;
+        this.dateTime = null;
         this.text = null;
+        this.content = null;
     }
 
     /*
@@ -231,33 +231,33 @@ public boolean equals(java.lang.Object o) {
 
         Comment comment = (Comment) o;
         return
+            Objects.equals(this.rangeStart, comment.rangeStart) &&
+            Objects.equals(this.rangeEnd, comment.rangeEnd) &&
             Objects.equals(this.author, comment.author) &&
-            Objects.equals(this.content, comment.content) &&
-            Objects.equals(this.dateTime, comment.dateTime) &&
             Objects.equals(this.initial, comment.initial) &&
-            Objects.equals(this.rangeEnd, comment.rangeEnd) &&
-            Objects.equals(this.rangeStart, comment.rangeStart) &&
+            Objects.equals(this.dateTime, comment.dateTime) &&
             Objects.equals(this.text, comment.text) &&
+            Objects.equals(this.content, comment.content) &&
             super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(author, content, dateTime, initial, rangeEnd, rangeStart, text, super.hashCode());
+    return Objects.hash(rangeStart, rangeEnd, author, initial, dateTime, text, content, super.hashCode());
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class Comment {\n");
     sb.append("    link: ").append(toIndentedString(getLink())).append("\n");
+    sb.append("    rangeStart: ").append(toIndentedString(getRangeStart())).append("\n");
+    sb.append("    rangeEnd: ").append(toIndentedString(getRangeEnd())).append("\n");
     sb.append("    author: ").append(toIndentedString(getAuthor())).append("\n");
-    sb.append("    content: ").append(toIndentedString(getContent())).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(getDateTime())).append("\n");
     sb.append("    initial: ").append(toIndentedString(getInitial())).append("\n");
-    sb.append("    rangeEnd: ").append(toIndentedString(getRangeEnd())).append("\n");
-    sb.append("    rangeStart: ").append(toIndentedString(getRangeStart())).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(getDateTime())).append("\n");
     sb.append("    text: ").append(toIndentedString(getText())).append("\n");
+    sb.append("    content: ").append(toIndentedString(getContent())).append("\n");
     sb.append("}");
     return sb.toString();
   }