Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,14 @@ 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 21.8
+
+- Added new api methods to get, insert, update or delete custom xml parts from documents.
+- Added parameter 'ResultDocumentFormat' to Compare API
+- Added 'ExportLanguageToSpanTag' pdf save option
+- Added 'FlatOpcXmlMappingOnly' save option
+
+
 ## Enhancements in Version 21.7
 
 - ImlRenderingMode option introduced witch is used to determine how ink (InkML) objects are rendered
@@ -156,7 +164,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>21.7.0</version>
+        <version>21.8.0</version>
     </dependency>
 </dependencies>
 ```

TestData/DocumentElements/CustomXmlParts/MultipleCustomXmlParts.docx

@@ -6,15 +6,17 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-String documentsDir = "...";
 ApiClient apiClient = new ApiClient(/*clientId*/ "####-####-####-####-####", /*clientSecret*/ "##################", null);
 WordsApi wordsApi = new WordsApi(apiClient);
 String fileName  = "test_doc.docx";
 
 // Upload original document to cloud storage.
-UploadFileRequest uploadFileRequestRequest = new UploadFileRequest(Files.readAllBytes(Paths.get(documentsDir, fileName).toAbsolutePath()),fileName,null);
-wordsApi.uploadFile(uploadFileRequestRequest);
+byte[] myVar1 = Files.readAllBytes(Paths.get(fileName).toAbsolutePath());
+String myVar2 = fileName;
+UploadFileRequest uploadFileRequest = new UploadFileRequest(myVar1, myVar2, null);
+wordsApi.uploadFile(uploadFileRequest);
 
 // Calls AcceptAllRevisions method for document in cloud.
-AcceptAllRevisionsRequest requestRequest = new AcceptAllRevisionsRequest(fileName,null,null,null,null,null);
-wordsApi.acceptAllRevisions(requestRequest);
+String myVar3 = fileName;
+AcceptAllRevisionsRequest request = new AcceptAllRevisionsRequest(myVar3, null, null, null, null, null);
+wordsApi.acceptAllRevisions(request);

examples/AcceptAllRevisions.java

@@ -1,9 +1,9 @@
-String documentsDir = "...";
 ApiClient apiClient = new ApiClient(/*clientId*/ "####-####-####-####-####", /*clientSecret*/ "##################", null);
 WordsApi wordsApi = new WordsApi(apiClient);
 String fileName  = "test_doc.docx";
 
 // Calls AcceptAllRevisionsOnline method for document in cloud.
-AcceptAllRevisionsOnlineRequest requestRequest = new AcceptAllRevisionsOnlineRequest(Files.readAllBytes(Paths.get(documentsDir, fileName).toAbsolutePath()),null,null,null);
-AcceptAllRevisionsOnlineResponse acceptAllRevisionsOnlineResult = wordsApi.acceptAllRevisionsOnline(requestRequest);
+byte[] requestDocument = Files.readAllBytes(Paths.get(fileName).toAbsolutePath());
+AcceptAllRevisionsOnlineRequest request = new AcceptAllRevisionsOnlineRequest(requestDocument, null, null, null);
+AcceptAllRevisionsOnlineResponse acceptAllRevisionsOnlineResult = wordsApi.acceptAllRevisionsOnline(request);
 Files.write(Paths.get("test_result.docx"), acceptAllRevisionsOnlineResult.getDocument());

examples/AcceptAllRevisionsOnline.java

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

pom.xml

@@ -56,7 +56,7 @@ public class ApiClient {
     private String apiVersion = "v4.0";
     private String baseUrl = "https://api.aspose.cloud";
     private String basePath = baseUrl + "/" + apiVersion;
-    private String clientVersion = "21.7";
+    private String clientVersion = "21.8";
     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

@@ -58,6 +58,9 @@ public class CompareData {
 
     @SerializedName("DateTime")
     private OffsetDateTime dateTime = null;
+
+    @SerializedName("ResultDocumentFormat")
+    private String resultDocumentFormat = null;
     public CompareData author(String author) {
         this.author = author;
         return this;
@@ -130,6 +133,24 @@ public void setDateTime(OffsetDateTime dateTime) {
         this.dateTime = dateTime;
     }
 
+    public CompareData resultDocumentFormat(String resultDocumentFormat) {
+        this.resultDocumentFormat = resultDocumentFormat;
+        return this;
+    }
+
+    /**
+     * Gets or sets the result document format.
+    * @return resultDocumentFormat
+    **/
+    @ApiModelProperty(value = "Gets or sets the result document format.")
+    public String getResultDocumentFormat() {
+        return resultDocumentFormat;
+    }
+
+    public void setResultDocumentFormat(String resultDocumentFormat) {
+        this.resultDocumentFormat = resultDocumentFormat;
+    }
+
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -144,12 +165,13 @@ public boolean equals(java.lang.Object o) {
             Objects.equals(this.author, compareData.author) &&
             Objects.equals(this.compareOptions, compareData.compareOptions) &&
             Objects.equals(this.comparingWithDocument, compareData.comparingWithDocument) &&
-            Objects.equals(this.dateTime, compareData.dateTime);
+            Objects.equals(this.dateTime, compareData.dateTime) &&
+            Objects.equals(this.resultDocumentFormat, compareData.resultDocumentFormat);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(author, compareOptions, comparingWithDocument, dateTime);
+    return Objects.hash(author, compareOptions, comparingWithDocument, dateTime, resultDocumentFormat);
   }
 
   @Override
@@ -160,6 +182,7 @@ public String toString() {
     sb.append("    compareOptions: ").append(toIndentedString(compareOptions)).append("\n");
     sb.append("    comparingWithDocument: ").append(toIndentedString(comparingWithDocument)).append("\n");
     sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    resultDocumentFormat: ").append(toIndentedString(resultDocumentFormat)).append("\n");
     sb.append("}");
     return sb.toString();
   }

src/main/java/com/aspose/words/cloud/api/WordsApi.java

@@ -0,0 +1,133 @@
+/*
+ * --------------------------------------------------------------------------------
+ * <copyright company="Aspose" file="CustomXmlPart.java">
+ *   Copyright (c) 2021 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 CustomXmlPart.
+ */
+@ApiModel(description = "DTO container with a CustomXmlPart.")
+public class CustomXmlPart extends CustomXmlPartLink {
+    @SerializedName("Data")
+    private String data = null;
+
+    @SerializedName("Id")
+    private String id = null;
+    public CustomXmlPart data(String data) {
+        this.data = data;
+        return this;
+    }
+
+    /**
+     * Gets or sets the custom xml part data.
+    * @return data
+    **/
+    @ApiModelProperty(value = "Gets or sets the custom xml part data.")
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public CustomXmlPart id(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Gets or sets the custom xml part id.
+    * @return id
+    **/
+    @ApiModelProperty(value = "Gets or sets the custom xml part id.")
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        CustomXmlPart customXmlPart = (CustomXmlPart) o;
+        return
+            Objects.equals(this.data, customXmlPart.data) &&
+            Objects.equals(this.id, customXmlPart.id) &&
+            super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, id, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CustomXmlPart {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).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/CompareData.java

@@ -0,0 +1,87 @@
+/*
+ * --------------------------------------------------------------------------------
+ * <copyright company="Aspose" file="CustomXmlPartInsert.java">
+ *   Copyright (c) 2021 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;
+
+/**
+ * Custom xml part insert.
+ */
+@ApiModel(description = "Custom xml part insert.")
+public class CustomXmlPartInsert extends CustomXmlPart {
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CustomXmlPartInsert {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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    ");
+  }
+}