Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -13,6 +13,13 @@ 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.6
+
+- Implemented beta version of CompareDocumentOnline feature with both document sending in request
+- CompareDocument method now can handle PDF files
+- AcceptAllRevisionsBeforeComparison option introduced which is used to specify if accept all revisions before comparison
+
+
 ## Enhancements in Version 21.5
 
 - Update dependencies in sdk
@@ -141,7 +148,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>21.5.0</version>
+        <version>21.6.0</version>
     </dependency>
 </dependencies>
 ```

pom.xml

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

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

@@ -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.5";
+    private String clientVersion = "21.6";
     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/CompareOptions.java

@@ -93,6 +93,9 @@ public TargetEnum read(final JsonReader jsonReader) throws IOException {
         }
     }
 
+    @SerializedName("AcceptAllRevisionsBeforeComparison")
+    private Boolean acceptAllRevisionsBeforeComparison = null;
+
     @SerializedName("IgnoreCaseChanges")
     private Boolean ignoreCaseChanges = null;
 
@@ -119,6 +122,24 @@ public TargetEnum read(final JsonReader jsonReader) throws IOException {
 
     @SerializedName("Target")
     private TargetEnum target = null;
+    public CompareOptions acceptAllRevisionsBeforeComparison(Boolean acceptAllRevisionsBeforeComparison) {
+        this.acceptAllRevisionsBeforeComparison = acceptAllRevisionsBeforeComparison;
+        return this;
+    }
+
+    /**
+     * Gets or sets whether accept revisions before comparison or not.
+    * @return acceptAllRevisionsBeforeComparison
+    **/
+    @ApiModelProperty(value = "Gets or sets whether accept revisions before comparison or not.")
+    public Boolean getAcceptAllRevisionsBeforeComparison() {
+        return acceptAllRevisionsBeforeComparison;
+    }
+
+    public void setAcceptAllRevisionsBeforeComparison(Boolean acceptAllRevisionsBeforeComparison) {
+        this.acceptAllRevisionsBeforeComparison = acceptAllRevisionsBeforeComparison;
+    }
+
     public CompareOptions ignoreCaseChanges(Boolean ignoreCaseChanges) {
         this.ignoreCaseChanges = ignoreCaseChanges;
         return this;
@@ -292,6 +313,7 @@ public boolean equals(java.lang.Object o) {
 
         CompareOptions compareOptions = (CompareOptions) o;
         return
+            Objects.equals(this.acceptAllRevisionsBeforeComparison, compareOptions.acceptAllRevisionsBeforeComparison) &&
             Objects.equals(this.ignoreCaseChanges, compareOptions.ignoreCaseChanges) &&
             Objects.equals(this.ignoreComments, compareOptions.ignoreComments) &&
             Objects.equals(this.ignoreFields, compareOptions.ignoreFields) &&
@@ -305,13 +327,14 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(ignoreCaseChanges, ignoreComments, ignoreFields, ignoreFootnotes, ignoreFormatting, ignoreHeadersAndFooters, ignoreTables, ignoreTextboxes, target);
+    return Objects.hash(acceptAllRevisionsBeforeComparison, ignoreCaseChanges, ignoreComments, ignoreFields, ignoreFootnotes, ignoreFormatting, ignoreHeadersAndFooters, ignoreTables, ignoreTextboxes, target);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class CompareOptions {\n");
+    sb.append("    acceptAllRevisionsBeforeComparison: ").append(toIndentedString(acceptAllRevisionsBeforeComparison)).append("\n");
     sb.append("    ignoreCaseChanges: ").append(toIndentedString(ignoreCaseChanges)).append("\n");
     sb.append("    ignoreComments: ").append(toIndentedString(ignoreComments)).append("\n");
     sb.append("    ignoreFields: ").append(toIndentedString(ignoreFields)).append("\n");

src/main/java/com/aspose/words/cloud/model/requests/CompareDocumentOnlineRequest.java

@@ -51,6 +51,11 @@ public class CompareDocumentOnlineRequest implements RequestIfc {
      */
     private CompareData compareData;
 
+    /*
+     * The comparing document.
+     */
+    private byte[] comparingDocument;
+
     /*
      * Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
      */
@@ -71,13 +76,15 @@ public class CompareDocumentOnlineRequest implements RequestIfc {
      *
      * @param byte[] document The document.
      * @param CompareData compareData Compare data.
+     * @param byte[] comparingDocument The comparing document.
      * @param String loadEncoding Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
      * @param String password Password for opening an encrypted document.
      * @param String destFileName Result path of the document after the operation. If this parameter is omitted then result of the operation will be saved as the source document.
      */
-    public CompareDocumentOnlineRequest(byte[] document, CompareData compareData, String loadEncoding, String password, String destFileName) {
+    public CompareDocumentOnlineRequest(byte[] document, CompareData compareData, byte[] comparingDocument, String loadEncoding, String password, String destFileName) {
         this.document = document;
         this.compareData = compareData;
+        this.comparingDocument = comparingDocument;
         this.loadEncoding = loadEncoding;
         this.password = password;
         this.destFileName = destFileName;
@@ -111,6 +118,20 @@ public void setCompareData(CompareData value) {
         this.compareData = value;
     }
 
+    /*
+     * Gets The comparing document.
+     */
+    public byte[] getComparingDocument() {
+        return this.comparingDocument;
+    }
+
+    /*
+     * Sets The comparing document.
+     */
+    public void setComparingDocument(byte[] value) {
+        this.comparingDocument = value;
+    }
+
     /*
      * Gets Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
      */
@@ -193,6 +214,9 @@ public Request buildHttpRequest(ApiClient apiClient, final ProgressResponseBody.
         if (getCompareData() != null)
             localVarFormParams.put("CompareData", getCompareData());
 
+        if (getComparingDocument() != null)
+            localVarFormParams.put("ComparingDocument", getComparingDocument());
+
         final String[] localVarAccepts = {
             "application/xml", "application/json"
         };

src/test/java/com/aspose/words/cloud/api/document/TestCompareDocument.java

@@ -121,6 +121,40 @@ public void testCompareDocumentOnline() throws ApiException, MessagingException,
             requestCompareData,
             null,
             null,
+            null,
+            TestInitializer.RemoteTestOut + "/TestCompareDocumentOut.doc"
+        );
+
+        CompareDocumentOnlineResponse result = TestInitializer.wordsApi.compareDocumentOnline(request);
+        assertNotNull(result);
+    }
+
+    /*
+     * Test for document comparison online.
+     */
+    @Test
+    public void testCompareTwoDocumentOnline() throws ApiException, MessagingException, IOException
+    {
+        String localName1 = "compareTestDoc1.doc";
+        String localName2 = "compareTestDoc2.doc";
+        String remoteName2 = "TestCompareDocument2.doc";
+
+        TestInitializer.UploadFile(
+            PathUtil.get(TestInitializer.LocalTestFolder, localFolder + "/" + localName2),
+            remoteFolder + "/" + remoteName2
+        );
+
+        CompareData requestCompareData = new CompareData();
+        requestCompareData.setAuthor("author");
+        requestCompareData.setComparingWithDocument(remoteFolder + "/" + remoteName2);
+        requestCompareData.setDateTime(OffsetDateTime.of(2015, 10, 26, 0, 0, 0, 0, ZoneOffset.UTC));
+
+        CompareDocumentOnlineRequest request = new CompareDocumentOnlineRequest(
+            Files.readAllBytes(Paths.get(TestInitializer.LocalTestFolder, localFolder + "/" + localName1).toAbsolutePath()),
+            requestCompareData,
+            Files.readAllBytes(Paths.get(TestInitializer.LocalTestFolder, localFolder + "/" + localName2).toAbsolutePath()),
+            null,
+            null,
             TestInitializer.RemoteTestOut + "/TestCompareDocumentOut.doc"
         );