Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,12 +13,19 @@ 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.4
+
+- Added ExportShapesAsSvg to HtmlSaveOption.
+- Added new endpoint '~/styles/copy_from'.
+
+
 ## Enhancements in Version 22.3
 
 - Online methods returns the dictionary of files with included original filename as key instead of single file content in responses.
 - Parameters contained sensitive data should be passed in encrypted form. Names of the parameters have 'encrypted' prefix.
 - Added Encrypt method to encrypt data on the API public key. Use it to prepare values for parameters required encrypted data.
 - GetPublicKey method is not billable.
+- Changed type of enumerations for members of SaveOptionsData and other inherited classes from string to enum.
 
 
 ## Enhancements in Version 22.2
@@ -205,7 +212,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>22.3.0</version>
+        <version>22.4.0</version>
     </dependency>
 </dependencies>
 ```

TestData/DocumentElements/Styles/StyleTemplate.docx

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

pom.xml

@@ -58,7 +58,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.3";
+    private String clientVersion = "22.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/ApiClient.java

@@ -1375,6 +1375,79 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
         return call;
     }
 
+    @SuppressWarnings("rawtypes")
+    private com.squareup.okhttp.Call copyStylesFromTemplateValidateBeforeCall(CopyStylesFromTemplateRequest request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
+        return apiClient.buildCall(request.buildHttpRequest(apiClient, progressListener, progressRequestListener, true));
+    }
+
+    /**
+     * Copies styles from the origin document to the target document.
+     * @param request Request object
+     * @return WordsResponse
+     * @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 WordsResponse copyStylesFromTemplate(CopyStylesFromTemplateRequest request) throws ApiException, MessagingException, IOException {
+        try {
+            ApiResponse< WordsResponse > resp = copyStylesFromTemplateWithHttpInfo(request);
+            return resp.getData();
+        }
+        catch (ApiException ex) {
+            if (ex.getCode() == apiClient.getNotAuthCode()) {
+                apiClient.requestToken();
+                ApiResponse< WordsResponse > resp = copyStylesFromTemplateWithHttpInfo(request);
+                return resp.getData();
+            }
+            throw ex;
+        }
+    }
+
+    /**
+     * Copies styles from the origin document to the target document.
+     * @param request Request object
+     * @return ApiResponse< WordsResponse >;
+     * @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< WordsResponse > copyStylesFromTemplateWithHttpInfo(CopyStylesFromTemplateRequest request) throws ApiException, MessagingException, IOException {
+        com.squareup.okhttp.Call call = copyStylesFromTemplateValidateBeforeCall(request, null, null);
+        return apiClient.execute(call, request);
+    }
+
+    /**
+     * Copies styles from the origin document to the target document. (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 copyStylesFromTemplateAsync(CopyStylesFromTemplateRequest request, final ApiCallback< WordsResponse > 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 = copyStylesFromTemplateValidateBeforeCall(request, progressListener, progressRequestListener);
+        apiClient.executeAsync(call, request, callback);
+        return call;
+    }
+
     @SuppressWarnings("rawtypes")
     private com.squareup.okhttp.Call createDocumentValidateBeforeCall(CreateDocumentRequest 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/api/WordsApi.java

@@ -132,6 +132,7 @@ public String toString() {
     sb.append("    exportPageSetup: ").append(toIndentedString(getExportPageSetup())).append("\n");
     sb.append("    exportRelativeFontSize: ").append(toIndentedString(getExportRelativeFontSize())).append("\n");
     sb.append("    exportRoundtripInformation: ").append(toIndentedString(getExportRoundtripInformation())).append("\n");
+    sb.append("    exportShapesAsSvg: ").append(toIndentedString(getExportShapesAsSvg())).append("\n");
     sb.append("    exportTextBoxAsSvg: ").append(toIndentedString(getExportTextBoxAsSvg())).append("\n");
     sb.append("    exportTextInputFormFieldAsText: ").append(toIndentedString(getExportTextInputFormFieldAsText())).append("\n");
     sb.append("    exportTocPageNumbers: ").append(toIndentedString(getExportTocPageNumbers())).append("\n");

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

@@ -489,6 +489,9 @@ public TableWidthOutputModeEnum read(final JsonReader jsonReader) throws IOExcep
     @SerializedName("ExportRoundtripInformation")
     protected Boolean exportRoundtripInformation;
 
+    @SerializedName("ExportShapesAsSvg")
+    protected Boolean exportShapesAsSvg;
+
     @SerializedName("ExportTextBoxAsSvg")
     protected Boolean exportTextBoxAsSvg;
 
@@ -930,6 +933,25 @@ public void setExportRoundtripInformation(Boolean exportRoundtripInformation) {
     }
 
 
+    /**
+     * Gets or sets the flag, that controls whether Aspose.Words.Drawing.Shape nodes are converted to SVG images when saving to HTML, MHTML or EPUB. Default value is false.
+    * @return exportShapesAsSvg
+    **/
+    @ApiModelProperty(value = "Gets or sets the flag, that controls whether Aspose.Words.Drawing.Shape nodes are converted to SVG images when saving to HTML, MHTML or EPUB. Default value is false.")
+    public Boolean getExportShapesAsSvg() {
+        return exportShapesAsSvg;
+    }
+
+    public HtmlSaveOptionsData exportShapesAsSvg(Boolean exportShapesAsSvg) {
+        this.exportShapesAsSvg = exportShapesAsSvg;
+        return this;
+    }
+
+    public void setExportShapesAsSvg(Boolean exportShapesAsSvg) {
+        this.exportShapesAsSvg = exportShapesAsSvg;
+    }
+
+
     /**
      * Gets or sets the flag, that controls how textboxes represented by Aspose.Words.Drawing.Shape are saved to HTML, MHTML or EPUB. The default value is false.
      * When set to true, exports textboxes as inline "svg" elements. When false, exports as "image" elements.
@@ -1319,6 +1341,7 @@ public HtmlSaveOptionsData() {
         this.exportPageSetup = null;
         this.exportRelativeFontSize = null;
         this.exportRoundtripInformation = null;
+        this.exportShapesAsSvg = null;
         this.exportTextBoxAsSvg = null;
         this.exportTextInputFormFieldAsText = null;
         this.exportTocPageNumbers = null;
@@ -1372,6 +1395,7 @@ public boolean equals(java.lang.Object o) {
             Objects.equals(this.exportPageSetup, htmlSaveOptionsData.exportPageSetup) &&
             Objects.equals(this.exportRelativeFontSize, htmlSaveOptionsData.exportRelativeFontSize) &&
             Objects.equals(this.exportRoundtripInformation, htmlSaveOptionsData.exportRoundtripInformation) &&
+            Objects.equals(this.exportShapesAsSvg, htmlSaveOptionsData.exportShapesAsSvg) &&
             Objects.equals(this.exportTextBoxAsSvg, htmlSaveOptionsData.exportTextBoxAsSvg) &&
             Objects.equals(this.exportTextInputFormFieldAsText, htmlSaveOptionsData.exportTextInputFormFieldAsText) &&
             Objects.equals(this.exportTocPageNumbers, htmlSaveOptionsData.exportTocPageNumbers) &&
@@ -1396,7 +1420,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(allowNegativeIndent, cssClassNamePrefix, cssStyleSheetFileName, cssStyleSheetType, documentSplitCriteria, documentSplitHeadingLevel, encoding, exportDocumentProperties, exportDropDownFormFieldAsText, exportFontResources, exportFontsAsBase64, exportHeadersFootersMode, exportImagesAsBase64, exportLanguageInformation, exportListLabels, exportOriginalUrlForLinkedImages, exportPageMargins, exportPageSetup, exportRelativeFontSize, exportRoundtripInformation, exportTextBoxAsSvg, exportTextInputFormFieldAsText, exportTocPageNumbers, exportXhtmlTransitional, fontResourcesSubsettingSizeThreshold, fontsFolder, fontsFolderAlias, htmlVersion, imageResolution, imagesFolder, imagesFolderAlias, metafileFormat, officeMathOutputMode, prettyFormat, resolveFontNames, resourceFolder, resourceFolderAlias, scaleImageToShapeSize, tableWidthOutputMode, super.hashCode());
+    return Objects.hash(allowNegativeIndent, cssClassNamePrefix, cssStyleSheetFileName, cssStyleSheetType, documentSplitCriteria, documentSplitHeadingLevel, encoding, exportDocumentProperties, exportDropDownFormFieldAsText, exportFontResources, exportFontsAsBase64, exportHeadersFootersMode, exportImagesAsBase64, exportLanguageInformation, exportListLabels, exportOriginalUrlForLinkedImages, exportPageMargins, exportPageSetup, exportRelativeFontSize, exportRoundtripInformation, exportShapesAsSvg, exportTextBoxAsSvg, exportTextInputFormFieldAsText, exportTocPageNumbers, exportXhtmlTransitional, fontResourcesSubsettingSizeThreshold, fontsFolder, fontsFolderAlias, htmlVersion, imageResolution, imagesFolder, imagesFolderAlias, metafileFormat, officeMathOutputMode, prettyFormat, resolveFontNames, resourceFolder, resourceFolderAlias, scaleImageToShapeSize, tableWidthOutputMode, super.hashCode());
   }
 
   @Override
@@ -1437,6 +1461,7 @@ public String toString() {
     sb.append("    exportPageSetup: ").append(toIndentedString(getExportPageSetup())).append("\n");
     sb.append("    exportRelativeFontSize: ").append(toIndentedString(getExportRelativeFontSize())).append("\n");
     sb.append("    exportRoundtripInformation: ").append(toIndentedString(getExportRoundtripInformation())).append("\n");
+    sb.append("    exportShapesAsSvg: ").append(toIndentedString(getExportShapesAsSvg())).append("\n");
     sb.append("    exportTextBoxAsSvg: ").append(toIndentedString(getExportTextBoxAsSvg())).append("\n");
     sb.append("    exportTextInputFormFieldAsText: ").append(toIndentedString(getExportTextInputFormFieldAsText())).append("\n");
     sb.append("    exportTocPageNumbers: ").append(toIndentedString(getExportTocPageNumbers())).append("\n");

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

@@ -132,6 +132,7 @@ public String toString() {
     sb.append("    exportPageSetup: ").append(toIndentedString(getExportPageSetup())).append("\n");
     sb.append("    exportRelativeFontSize: ").append(toIndentedString(getExportRelativeFontSize())).append("\n");
     sb.append("    exportRoundtripInformation: ").append(toIndentedString(getExportRoundtripInformation())).append("\n");
+    sb.append("    exportShapesAsSvg: ").append(toIndentedString(getExportShapesAsSvg())).append("\n");
     sb.append("    exportTextBoxAsSvg: ").append(toIndentedString(getExportTextBoxAsSvg())).append("\n");
     sb.append("    exportTextInputFormFieldAsText: ").append(toIndentedString(getExportTextInputFormFieldAsText())).append("\n");
     sb.append("    exportTocPageNumbers: ").append(toIndentedString(getExportTocPageNumbers())).append("\n");

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

@@ -58,6 +58,7 @@ public enum ComplianceEnum {
         PDFA1B("PdfA1b"),
         PDFA2A("PdfA2a"),
         PDFA2U("PdfA2u"),
+        PDFA4("PdfA4"),
         PDFUA1("PdfUa1");
 
         private String value;