Merge branch 'master' into release

Author: YaroslawEkimov

ExamplesData/test_doc.docx

@@ -6,6 +6,7 @@ properties([
 			[$class: 'StringParameterDefinition', name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'api url'],
 			[$class: 'BooleanParameterDefinition', name: 'debugMode', defaultValue: 'false', description: 'debug mode'],
             [$class: 'BooleanParameterDefinition', name: 'ignoreCiSkip', defaultValue: false, description: 'ignore CI Skip'],
+            [$class: 'StringParameterDefinition', name: 'credentialsId', defaultValue: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', description: 'credentials id'],
 		]
 	]
 ])
@@ -17,7 +18,7 @@ def runtests(directory)
     dir(directory){
         try {
             stage('checkout'){
-                checkout([$class: 'GitSCM', branches: [[name: params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-java.git']]])
+                checkout([$class: 'GitSCM', branches: [[name: params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-java.git']]])
 
                 sh 'git show -s HEAD > gitMessage'
                 def commitMessage = readFile('gitMessage').trim()
@@ -26,7 +27,7 @@ def runtests(directory)
                 sh 'git clean -fdx'
 
                 if (needToBuild) {
-                    withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
+                    withCredentials([usernamePassword(credentialsId: params.credentialsId, passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
                         sh 'mkdir -p Settings'
                         sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\", \\"Debug\\" : \\"$debugMode\\" }}" > Settings/servercreds.json'
                     }

Jenkinsfile

@@ -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 21.3
+
+- Added 'UpdateCreatedTimeProperty' save option
+- Added Tables into HeaderFooter so it's possible to address paragraphs inside table which is located in headerfooter (sections/0/headersfooters/1/tables/0/rows/0/cells/0/paragraphs/0)
+
+
 ## Enhancements in Version 21.2
 
 - Added delete all comments method
@@ -122,7 +128,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>21.2.0</version>
+        <version>21.3.0</version>
     </dependency>
 </dependencies>
 ```

README.md

@@ -0,0 +1,20 @@
+import com.aspose.words.cloud.*;
+import com.aspose.words.cloud.api.*;
+import com.aspose.words.cloud.model.*;
+import com.aspose.words.cloud.model.requests.*;
+import com.aspose.words.cloud.model.responses.*;
+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 uploadFileRequest = new UploadFileRequest(Files.readAllBytes(Paths.get(documentsDir, fileName).toAbsolutePath()),fileName,null);
+wordsApi.uploadFile(uploadFileRequest);
+
+// Calls AcceptAllRevisions method for document in cloud.
+AcceptAllRevisionsRequest request = new AcceptAllRevisionsRequest(fileName,null,null,null,null,null);
+wordsApi.acceptAllRevisions(request);

examples/AcceptAllRevisions.java

@@ -0,0 +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 request = new AcceptAllRevisionsOnlineRequest(Files.readAllBytes(Paths.get(documentsDir, fileName).toAbsolutePath()),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.2.0</version>
+    <version>21.3.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.2";
+    private String clientVersion = "21.3";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;
@@ -202,7 +202,7 @@ public ApiClient setBaseUrl(String baseUrl) {
     /**
      * Set base path
      *
-     * @param basePath Base path of the URL (e.g https://api.aspose.cloud/v1.1
+     * @param basePath Base path of the URL (e.g https://api.aspose.cloud/v4.0
      * @return An instance of OkHttpClient
      */
     public ApiClient setBasePath(String basePath) {

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

@@ -111,6 +111,9 @@ public Dml3DEffectsRenderingModeEnum read(final JsonReader jsonReader) throws IO
     @SerializedName("SaveFormat")
     private String saveFormat = null;
 
+    @SerializedName("UpdateCreatedTimeProperty")
+    private Boolean updateCreatedTimeProperty = null;
+
     @SerializedName("UpdateFields")
     private Boolean updateFields = null;
 
@@ -234,6 +237,25 @@ public void setSaveFormat(String saveFormat) {
         this.saveFormat = saveFormat;
     }
 
+    public SaveOptionsData updateCreatedTimeProperty(Boolean updateCreatedTimeProperty) {
+        this.updateCreatedTimeProperty = updateCreatedTimeProperty;
+        return this;
+    }
+
+    /**
+     * Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving.
+     * Default value is false.
+    * @return updateCreatedTimeProperty
+    **/
+    @ApiModelProperty(value = "Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false.")
+    public Boolean getUpdateCreatedTimeProperty() {
+        return updateCreatedTimeProperty;
+    }
+
+    public void setUpdateCreatedTimeProperty(Boolean updateCreatedTimeProperty) {
+        this.updateCreatedTimeProperty = updateCreatedTimeProperty;
+    }
+
     public SaveOptionsData updateFields(Boolean updateFields) {
         this.updateFields = updateFields;
         return this;
@@ -342,6 +364,7 @@ public boolean equals(java.lang.Object o) {
             Objects.equals(this.dmlRenderingMode, saveOptionsData.dmlRenderingMode) &&
             Objects.equals(this.fileName, saveOptionsData.fileName) &&
             Objects.equals(this.saveFormat, saveOptionsData.saveFormat) &&
+            Objects.equals(this.updateCreatedTimeProperty, saveOptionsData.updateCreatedTimeProperty) &&
             Objects.equals(this.updateFields, saveOptionsData.updateFields) &&
             Objects.equals(this.updateLastPrintedProperty, saveOptionsData.updateLastPrintedProperty) &&
             Objects.equals(this.updateLastSavedTimeProperty, saveOptionsData.updateLastSavedTimeProperty) &&
@@ -351,7 +374,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(allowEmbeddingPostScriptFonts, dml3DEffectsRenderingMode, dmlEffectsRenderingMode, dmlRenderingMode, fileName, saveFormat, updateFields, updateLastPrintedProperty, updateLastSavedTimeProperty, updateSdtContent, zipOutput);
+    return Objects.hash(allowEmbeddingPostScriptFonts, dml3DEffectsRenderingMode, dmlEffectsRenderingMode, dmlRenderingMode, fileName, saveFormat, updateCreatedTimeProperty, updateFields, updateLastPrintedProperty, updateLastSavedTimeProperty, updateSdtContent, zipOutput);
   }
 
   @Override
@@ -364,6 +387,7 @@ public String toString() {
     sb.append("    dmlRenderingMode: ").append(toIndentedString(dmlRenderingMode)).append("\n");
     sb.append("    fileName: ").append(toIndentedString(fileName)).append("\n");
     sb.append("    saveFormat: ").append(toIndentedString(saveFormat)).append("\n");
+    sb.append("    updateCreatedTimeProperty: ").append(toIndentedString(updateCreatedTimeProperty)).append("\n");
     sb.append("    updateFields: ").append(toIndentedString(updateFields)).append("\n");
     sb.append("    updateLastPrintedProperty: ").append(toIndentedString(updateLastPrintedProperty)).append("\n");
     sb.append("    updateLastSavedTimeProperty: ").append(toIndentedString(updateLastSavedTimeProperty)).append("\n");

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

@@ -0,0 +1,84 @@
+/*
+ * --------------------------------------------------------------------------------
+ * <copyright company="Aspose" file="TestExamples.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;
+
+import com.aspose.words.cloud.*;
+import com.aspose.words.cloud.api.*;
+import com.aspose.words.cloud.model.*;
+import com.aspose.words.cloud.model.requests.*;
+import com.aspose.words.cloud.model.responses.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import junit.framework.TestCase;
+import org.junit.Test;
+
+public class TestExamples extends TestCase
+{
+    private ApiClient apiClient;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        TestInitializer.Initialize();
+        apiClient = TestInitializer.apiClient;
+        WordsApi api = new WordsApi(apiClient);
+        api.uploadFile(new UploadFileRequest(
+            Files.readAllBytes(Paths.get("ExamplesData", "test_doc.docx").toAbsolutePath()),
+            "test_doc.docx",
+            null
+        ));
+    }
+
+    @Test
+    public void testAcceptAllRevisions() throws Exception
+    {
+        String documentsDir = "ExamplesData";
+        WordsApi wordsApi = new WordsApi(apiClient);
+        String fileName  = "test_doc.docx";
+
+        // Upload original document to cloud storage.
+        UploadFileRequest uploadFileRequest = new UploadFileRequest(Files.readAllBytes(Paths.get(documentsDir, fileName).toAbsolutePath()),fileName,null);
+        wordsApi.uploadFile(uploadFileRequest);
+
+        // Calls AcceptAllRevisions method for document in cloud.
+        AcceptAllRevisionsRequest request = new AcceptAllRevisionsRequest(fileName,null,null,null,null,null);
+        wordsApi.acceptAllRevisions(request);
+    }
+
+    @Test
+    public void testAcceptAllRevisionsOnline() throws Exception
+    {
+        String documentsDir = "ExamplesData";
+        WordsApi wordsApi = new WordsApi(apiClient);
+        String fileName  = "test_doc.docx";
+
+        // Calls AcceptAllRevisionsOnline method for document in cloud.
+        AcceptAllRevisionsOnlineRequest request = new AcceptAllRevisionsOnlineRequest(Files.readAllBytes(Paths.get(documentsDir, fileName).toAbsolutePath()),null,null,null);
+        AcceptAllRevisionsOnlineResponse acceptAllRevisionsOnlineResult = wordsApi.acceptAllRevisionsOnline(request);
+        Files.write(Paths.get("test_result.docx"), acceptAllRevisionsOnlineResult.getDocument());
+    }
+}

src/test/java/com/aspose/words/cloud/TestExamples.java

@@ -41,6 +41,7 @@
 import java.util.Map;
 
 public final class TestInitializer {
+    public static ApiClient apiClient;
     public static WordsApi wordsApi;
     public static String LocalTestFolder = "TestData";
     public static String LocalCommonFolder = PathUtil.get(LocalTestFolder, "Common");
@@ -55,7 +56,8 @@ public static void Initialize() throws FileNotFoundException, ApiException {
 
     public static void Initialize(String credsPath) throws FileNotFoundException, ApiException {
         Map<String, String> creds = GetConfig(credsPath);
-        wordsApi = new WordsApi(creds.get("ClientId"), creds.get("ClientSecret"), creds.get("BaseUrl"));
+        apiClient = new ApiClient(creds.get("ClientId"), creds.get("ClientSecret"), creds.get("BaseUrl"));
+        wordsApi = new WordsApi(apiClient);
     }
 
     public static Map<String, String> GetConfig(String credsPath) throws FileNotFoundException {