Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,12 @@ 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 24.4
+
+- Added the 'MergeWithNext' method to merge a section with the next one.
+- Added the 'LockAspectRatio' propperty for DrawingObjectInsert and DrawingObjectUpdate methods.
+
+
 ## Enhancements in Version 24.3
 
 - Added support for 'RemoveEmptyCells' option for the 'Cleanup' parameter in the insert 'MailMerge' API method.
@@ -333,7 +339,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>24.3.0</version>
+        <version>24.4.0</version>
     </dependency>
 </dependencies>
 ```

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>aspose-words-cloud</artifactId>
     <packaging>jar</packaging>
     <name>AsposeWordsCloud</name>
-    <version>24.3.0</version>
+    <version>24.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 = "24.3";
+    private String clientVersion = "24.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/api/WordsApi.java

@@ -18551,6 +18551,149 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
         return call;
     }
 
+    @SuppressWarnings("rawtypes")
+    private com.squareup.okhttp.Call mergeWithNextValidateBeforeCall(MergeWithNextRequest request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
+        return apiClient.buildCall(request.buildHttpRequest(apiClient, progressListener, progressRequestListener, true));
+    }
+
+    /**
+     * Merge the section with the next one.
+     * @param request Request object
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     * @throws IOException If fail to serialize the request body object
+     */
+    public void mergeWithNext(MergeWithNextRequest request) throws ApiException, MessagingException, IOException {
+        try {
+    mergeWithNextWithHttpInfo(request);
+        }
+        catch (ApiException ex) {
+            if (ex.getCode() == apiClient.getNotAuthCode()) {
+                apiClient.requestToken();
+    mergeWithNextWithHttpInfo(request);
+            }
+            throw ex;
+        }
+    }
+
+    /**
+     * Merge the section with the next one.
+     * @param request Request object
+     * @return ApiResponse< void >;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     * @throws IOException If fail to serialize the request body object
+     */
+    private ApiResponse< Void > mergeWithNextWithHttpInfo(MergeWithNextRequest request) throws ApiException, MessagingException, IOException {
+        com.squareup.okhttp.Call call = mergeWithNextValidateBeforeCall(request, null, null);
+        return apiClient.execute(call, request);
+    }
+
+    /**
+     * Merge the section with the next one. (asynchronously)
+     * @param request Request object
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     * @throws IOException If fail to serialize the request body object
+     */
+    public com.squareup.okhttp.Call mergeWithNextAsync(MergeWithNextRequest request, final ApiCallback< Void > callback) throws ApiException, MessagingException, IOException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        com.squareup.okhttp.Call call = mergeWithNextValidateBeforeCall(request, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, request, callback);
+        return call;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private com.squareup.okhttp.Call mergeWithNextOnlineValidateBeforeCall(MergeWithNextOnlineRequest request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
+        return apiClient.buildCall(request.buildHttpRequest(apiClient, progressListener, progressRequestListener, true));
+    }
+
+    /**
+     * Merge the section with the next one.
+     * @param request Request object
+     * @return Map<String, byte[]>
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     * @throws IOException If fail to serialize the request body object
+     */
+    public Map<String, byte[]> mergeWithNextOnline(MergeWithNextOnlineRequest request) throws ApiException, MessagingException, IOException {
+        try {
+            ApiResponse< Map<String, byte[]> > resp = mergeWithNextOnlineWithHttpInfo(request);
+            return resp.getData();
+        }
+        catch (ApiException ex) {
+            if (ex.getCode() == apiClient.getNotAuthCode()) {
+                apiClient.requestToken();
+                ApiResponse< Map<String, byte[]> > resp = mergeWithNextOnlineWithHttpInfo(request);
+                return resp.getData();
+            }
+            throw ex;
+        }
+    }
+
+    /**
+     * Merge the section with the next one.
+     * @param request Request object
+     * @return ApiResponse< Map<String, byte[]> >;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     * @throws IOException If fail to serialize the request body object
+     */
+    private ApiResponse< Map<String, byte[]> > mergeWithNextOnlineWithHttpInfo(MergeWithNextOnlineRequest request) throws ApiException, MessagingException, IOException {
+        com.squareup.okhttp.Call call = mergeWithNextOnlineValidateBeforeCall(request, null, null);
+        return apiClient.execute(call, request);
+    }
+
+    /**
+     * Merge the section with the next one. (asynchronously)
+     * @param request Request object
+     * @param callback The callback to be executed when the API call finishes
+     * @return The request call
+     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
+     * @throws IOException If fail to serialize the request body object
+     */
+    public com.squareup.okhttp.Call mergeWithNextOnlineAsync(MergeWithNextOnlineRequest request, final ApiCallback< Map<String, byte[]> > callback) throws ApiException, MessagingException, IOException {
+
+        ProgressResponseBody.ProgressListener progressListener = null;
+        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
+
+        if (callback != null) {
+            progressListener = new ProgressResponseBody.ProgressListener() {
+                @Override
+                public void update(long bytesRead, long contentLength, boolean done) {
+                    callback.onDownloadProgress(bytesRead, contentLength, done);
+                }
+            };
+
+            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
+                @Override
+                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
+                    callback.onUploadProgress(bytesWritten, contentLength, done);
+                }
+            };
+        }
+
+        com.squareup.okhttp.Call call = mergeWithNextOnlineValidateBeforeCall(request, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, request, callback);
+        return call;
+    }
+
     @SuppressWarnings("rawtypes")
     private com.squareup.okhttp.Call moveFileValidateBeforeCall(MoveFileRequest request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
         return apiClient.buildCall(request.buildHttpRequest(apiClient, progressListener, progressRequestListener, true));

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

@@ -228,6 +228,9 @@ public WrapTypeEnum read(final JsonReader jsonReader) throws IOException {
 
     @SerializedName("WrapType")
     protected WrapTypeEnum wrapType;
+
+    @SerializedName("AspectRatioLocked")
+    protected Boolean aspectRatioLocked;
     /**
      * Gets or sets the position, where the DrawingObject will be inserted.
     * @return position
@@ -380,6 +383,25 @@ public void setWrapType(WrapTypeEnum wrapType) {
     }
 
 
+    /**
+     * Gets or sets a value indicating whether AspectRatioLocked option on or off.
+    * @return aspectRatioLocked
+    **/
+    @ApiModelProperty(value = "Gets or sets a value indicating whether AspectRatioLocked option on or off.")
+    public Boolean getAspectRatioLocked() {
+        return aspectRatioLocked;
+    }
+
+    public DrawingObjectInsert aspectRatioLocked(Boolean aspectRatioLocked) {
+        this.aspectRatioLocked = aspectRatioLocked;
+        return this;
+    }
+
+    public void setAspectRatioLocked(Boolean aspectRatioLocked) {
+        this.aspectRatioLocked = aspectRatioLocked;
+    }
+
+
     public DrawingObjectInsert() {
         this.position = null;
         this.relativeHorizontalPosition = null;
@@ -389,6 +411,7 @@ public DrawingObjectInsert() {
         this.width = null;
         this.height = null;
         this.wrapType = null;
+        this.aspectRatioLocked = null;
     }
 
     /*
@@ -440,6 +463,7 @@ public void validate() throws ApiException {
 
 
 
+
     }
 
     @Override
@@ -460,12 +484,13 @@ public boolean equals(java.lang.Object o) {
             Objects.equals(this.top, drawingObjectInsert.top) &&
             Objects.equals(this.width, drawingObjectInsert.width) &&
             Objects.equals(this.height, drawingObjectInsert.height) &&
-            Objects.equals(this.wrapType, drawingObjectInsert.wrapType);
+            Objects.equals(this.wrapType, drawingObjectInsert.wrapType) &&
+            Objects.equals(this.aspectRatioLocked, drawingObjectInsert.aspectRatioLocked);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(position, relativeHorizontalPosition, left, relativeVerticalPosition, top, width, height, wrapType);
+    return Objects.hash(position, relativeHorizontalPosition, left, relativeVerticalPosition, top, width, height, wrapType, aspectRatioLocked);
   }
 
   @Override
@@ -480,6 +505,7 @@ public String toString() {
     sb.append("    width: ").append(toIndentedString(getWidth())).append("\n");
     sb.append("    height: ").append(toIndentedString(getHeight())).append("\n");
     sb.append("    wrapType: ").append(toIndentedString(getWrapType())).append("\n");
+    sb.append("    aspectRatioLocked: ").append(toIndentedString(getAspectRatioLocked())).append("\n");
     sb.append("}");
     return sb.toString();
   }

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

@@ -225,6 +225,9 @@ public WrapTypeEnum read(final JsonReader jsonReader) throws IOException {
 
     @SerializedName("WrapType")
     protected WrapTypeEnum wrapType;
+
+    @SerializedName("AspectRatioLocked")
+    protected Boolean aspectRatioLocked;
     /**
      * Gets or sets the relative horizontal position, from which the distance to the image is measured.
     * @return relativeHorizontalPosition
@@ -358,6 +361,25 @@ public void setWrapType(WrapTypeEnum wrapType) {
     }
 
 
+    /**
+     * Gets or sets a value indicating whether AspectRatioLocked option on or off.
+    * @return aspectRatioLocked
+    **/
+    @ApiModelProperty(value = "Gets or sets a value indicating whether AspectRatioLocked option on or off.")
+    public Boolean getAspectRatioLocked() {
+        return aspectRatioLocked;
+    }
+
+    public DrawingObjectUpdate aspectRatioLocked(Boolean aspectRatioLocked) {
+        this.aspectRatioLocked = aspectRatioLocked;
+        return this;
+    }
+
+    public void setAspectRatioLocked(Boolean aspectRatioLocked) {
+        this.aspectRatioLocked = aspectRatioLocked;
+    }
+
+
     public DrawingObjectUpdate() {
         this.relativeHorizontalPosition = null;
         this.left = null;
@@ -366,6 +388,7 @@ public DrawingObjectUpdate() {
         this.width = null;
         this.height = null;
         this.wrapType = null;
+        this.aspectRatioLocked = null;
     }
 
     /*
@@ -403,12 +426,13 @@ public boolean equals(java.lang.Object o) {
             Objects.equals(this.top, drawingObjectUpdate.top) &&
             Objects.equals(this.width, drawingObjectUpdate.width) &&
             Objects.equals(this.height, drawingObjectUpdate.height) &&
-            Objects.equals(this.wrapType, drawingObjectUpdate.wrapType);
+            Objects.equals(this.wrapType, drawingObjectUpdate.wrapType) &&
+            Objects.equals(this.aspectRatioLocked, drawingObjectUpdate.aspectRatioLocked);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(relativeHorizontalPosition, left, relativeVerticalPosition, top, width, height, wrapType);
+    return Objects.hash(relativeHorizontalPosition, left, relativeVerticalPosition, top, width, height, wrapType, aspectRatioLocked);
   }
 
   @Override
@@ -422,6 +446,7 @@ public String toString() {
     sb.append("    width: ").append(toIndentedString(getWidth())).append("\n");
     sb.append("    height: ").append(toIndentedString(getHeight())).append("\n");
     sb.append("    wrapType: ").append(toIndentedString(getWrapType())).append("\n");
+    sb.append("    aspectRatioLocked: ").append(toIndentedString(getAspectRatioLocked())).append("\n");
     sb.append("}");
     return sb.toString();
   }

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

@@ -53,8 +53,8 @@ public abstract class StructuredDocumentTagBase extends NodeLink {
      */
     @JsonAdapter(AppearanceEnum.Adapter.class)
     public enum AppearanceEnum {
-        DEFAULT("Default"),
         BOUNDINGBOX("BoundingBox"),
+        DEFAULT("Default"),
         TAGS("Tags"),
         HIDDEN("Hidden");
 

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

@@ -576,8 +576,8 @@ public StyleOptionsEnum read(final JsonReader jsonReader) throws IOException {
      */
     @JsonAdapter(TextWrappingEnum.Adapter.class)
     public enum TextWrappingEnum {
-        DEFAULT("Default"),
         NONE("None"),
+        DEFAULT("Default"),
         AROUND("Around");
 
         private String value;