Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,11 @@ 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.4
+
+- Added new type of RangeEndIdentifier for RangeApi: document:end
+
+
 ## Enhancements in Version 23.3
 
 - Fix compatibility between CreateDocument API and Dropbox storage.
@@ -276,7 +281,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>23.3.0</version>
+        <version>23.4.0</version>
     </dependency>
 </dependencies>
 ```

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>aspose-words-cloud</artifactId>
     <packaging>jar</packaging>
     <name>AsposeWordsCloud</name>
-    <version>23.3.0</version>
+    <version>23.4.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.3";
+    private String clientVersion = "23.4";
     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/BookmarkInsert.java

@@ -48,25 +48,25 @@
 @ApiModel(description = "Represents a bookmark to insert.")
 public class BookmarkInsert extends BookmarkData {
     @SerializedName("EndRange")
-    protected DocumentPosition endRange;
+    protected NewDocumentPosition endRange;
 
     @SerializedName("StartRange")
-    protected DocumentPosition startRange;
+    protected NewDocumentPosition startRange;
     /**
      * Gets or sets the link to end bookmark node.
     * @return endRange
     **/
     @ApiModelProperty(value = "Gets or sets the link to end bookmark node.")
-    public DocumentPosition getEndRange() {
+    public NewDocumentPosition getEndRange() {
         return endRange;
     }
 
-    public BookmarkInsert endRange(DocumentPosition endRange) {
+    public BookmarkInsert endRange(NewDocumentPosition endRange) {
         this.endRange = endRange;
         return this;
     }
 
-    public void setEndRange(DocumentPosition endRange) {
+    public void setEndRange(NewDocumentPosition endRange) {
         this.endRange = endRange;
     }
 
@@ -76,16 +76,16 @@ public void setEndRange(DocumentPosition endRange) {
     * @return startRange
     **/
     @ApiModelProperty(value = "Gets or sets the link to start bookmark node.")
-    public DocumentPosition getStartRange() {
+    public NewDocumentPosition getStartRange() {
         return startRange;
     }
 
-    public BookmarkInsert startRange(DocumentPosition startRange) {
+    public BookmarkInsert startRange(NewDocumentPosition startRange) {
         this.startRange = startRange;
         return this;
     }
 
-    public void setStartRange(DocumentPosition startRange) {
+    public void setStartRange(NewDocumentPosition startRange) {
         this.startRange = startRange;
     }
 

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

@@ -57,10 +57,10 @@ public abstract class CommentBase implements ModelIfc {
     protected String initial;
 
     @SerializedName("RangeEnd")
-    protected DocumentPosition rangeEnd;
+    protected NewDocumentPosition rangeEnd;
 
     @SerializedName("RangeStart")
-    protected DocumentPosition rangeStart;
+    protected NewDocumentPosition rangeStart;
 
     @SerializedName("Text")
     protected String text;
@@ -126,16 +126,16 @@ public void setInitial(String initial) {
     * @return rangeEnd
     **/
     @ApiModelProperty(value = "Gets or sets the link to comment range end node.")
-    public DocumentPosition getRangeEnd() {
+    public NewDocumentPosition getRangeEnd() {
         return rangeEnd;
     }
 
-    public CommentBase rangeEnd(DocumentPosition rangeEnd) {
+    public CommentBase rangeEnd(NewDocumentPosition rangeEnd) {
         this.rangeEnd = rangeEnd;
         return this;
     }
 
-    public void setRangeEnd(DocumentPosition rangeEnd) {
+    public void setRangeEnd(NewDocumentPosition rangeEnd) {
         this.rangeEnd = rangeEnd;
     }
 
@@ -145,16 +145,16 @@ public void setRangeEnd(DocumentPosition rangeEnd) {
     * @return rangeStart
     **/
     @ApiModelProperty(value = "Gets or sets the link to comment range start node.")
-    public DocumentPosition getRangeStart() {
+    public NewDocumentPosition getRangeStart() {
         return rangeStart;
     }
 
-    public CommentBase rangeStart(DocumentPosition rangeStart) {
+    public CommentBase rangeStart(NewDocumentPosition rangeStart) {
         this.rangeStart = rangeStart;
         return this;
     }
 
-    public void setRangeStart(DocumentPosition rangeStart) {
+    public void setRangeStart(NewDocumentPosition rangeStart) {
         this.rangeStart = rangeStart;
     }
 

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

@@ -211,7 +211,7 @@ public WrapTypeEnum read(final JsonReader jsonReader) throws IOException {
     protected Double left;
 
     @SerializedName("Position")
-    protected DocumentPosition position;
+    protected NewDocumentPosition position;
 
     @SerializedName("RelativeHorizontalPosition")
     protected RelativeHorizontalPositionEnum relativeHorizontalPosition;
@@ -270,16 +270,16 @@ public void setLeft(Double left) {
     * @return position
     **/
     @ApiModelProperty(value = "Gets or sets the position, before which the DrawingObject will be inserted.")
-    public DocumentPosition getPosition() {
+    public NewDocumentPosition getPosition() {
         return position;
     }
 
-    public DrawingObjectInsert position(DocumentPosition position) {
+    public DrawingObjectInsert position(NewDocumentPosition position) {
         this.position = position;
         return this;
     }
 
-    public void setPosition(DocumentPosition position) {
+    public void setPosition(NewDocumentPosition position) {
         this.position = position;
     }
 

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

@@ -97,7 +97,7 @@ public FootnoteTypeEnum read(final JsonReader jsonReader) throws IOException {
     protected FootnoteTypeEnum footnoteType;
 
     @SerializedName("Position")
-    protected DocumentPosition position;
+    protected NewDocumentPosition position;
 
     @SerializedName("ReferenceMark")
     protected String referenceMark;
@@ -128,16 +128,16 @@ public void setFootnoteType(FootnoteTypeEnum footnoteType) {
     * @return position
     **/
     @ApiModelProperty(value = "Gets or sets the link to comment range start node.")
-    public DocumentPosition getPosition() {
+    public NewDocumentPosition getPosition() {
         return position;
     }
 
-    public FootnoteBase position(DocumentPosition position) {
+    public FootnoteBase position(NewDocumentPosition position) {
         this.position = position;
         return this;
     }
 
-    public void setPosition(DocumentPosition position) {
+    public void setPosition(NewDocumentPosition position) {
         this.position = position;
     }
 

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

@@ -0,0 +1,147 @@
+/*
+ * --------------------------------------------------------------------------------
+ * <copyright company="Aspose" file="NewDocumentPosition.java">
+ *   Copyright (c) 2023 Aspose.Words for Cloud
+ * </copyright>
+ * <summary>
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ * 
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ * </summary>
+ * --------------------------------------------------------------------------------
+ */
+
+package com.aspose.words.cloud.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
+import java.io.IOException;
+import org.threeten.bp.OffsetDateTime;
+import com.aspose.words.cloud.model.*;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * DTO container with a new position in the document tree.
+ */
+@ApiModel(description = "DTO container with a new position in the document tree.")
+public class NewDocumentPosition implements ModelIfc {
+    @SerializedName("NodeId")
+    protected String nodeId;
+
+    @SerializedName("Offset")
+    protected Integer offset;
+    /**
+     * Gets or sets the node id.
+    * @return nodeId
+    **/
+    @ApiModelProperty(value = "Gets or sets the node id.")
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public NewDocumentPosition nodeId(String nodeId) {
+        this.nodeId = nodeId;
+        return this;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+
+    /**
+     * Gets or sets the offset in the node.
+    * @return offset
+    **/
+    @ApiModelProperty(value = "Gets or sets the offset in the node.")
+    public Integer getOffset() {
+        return offset;
+    }
+
+    public NewDocumentPosition offset(Integer offset) {
+        this.offset = offset;
+        return this;
+    }
+
+    public void setOffset(Integer offset) {
+        this.offset = offset;
+    }
+
+
+    public NewDocumentPosition() {
+        this.nodeId = null;
+        this.offset = null;
+    }
+
+    /*
+     * Gets files content.
+     *
+     * @param resultFilesContent List<FileReference> instance.
+     */
+    @Override
+    public void getFilesContent(List<FileReference> resultFilesContent) {
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        NewDocumentPosition newDocumentPosition = (NewDocumentPosition) o;
+        return
+            Objects.equals(this.nodeId, newDocumentPosition.nodeId) &&
+            Objects.equals(this.offset, newDocumentPosition.offset);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(nodeId, offset);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class NewDocumentPosition {\n");
+    sb.append("    nodeId: ").append(toIndentedString(getNodeId())).append("\n");
+    sb.append("    offset: ").append(toIndentedString(getOffset())).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}

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

@@ -51,7 +51,7 @@ public class TableInsert implements ModelIfc {
     protected Integer columnsCount;
 
     @SerializedName("Position")
-    protected DocumentPosition position;
+    protected NewDocumentPosition position;
 
     @SerializedName("RowsCount")
     protected Integer rowsCount;
@@ -79,16 +79,16 @@ public void setColumnsCount(Integer columnsCount) {
     * @return position
     **/
     @ApiModelProperty(value = "Gets or sets the position to insert the table. The table will be inserted before the specified position.")
-    public DocumentPosition getPosition() {
+    public NewDocumentPosition getPosition() {
         return position;
     }
 
-    public TableInsert position(DocumentPosition position) {
+    public TableInsert position(NewDocumentPosition position) {
         this.position = position;
         return this;
     }
 
-    public void setPosition(DocumentPosition position) {
+    public void setPosition(NewDocumentPosition position) {
         this.position = position;
     }