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.12
+
+- Added dependsOn and resultOf features for batch requests
+- Added query parameter 'displayIntermediateResults' for batch requests. If 'false', the last response in batch will be returned only. Default is 'true'
+- Added 'timeout' in seconds
+- Support encryption of 'CommonRequest.Password'. Automatic encryption of all passwords sent to the API server as request parameters.
+
 ## Enhancements in Version 21.11
 
 
@@ -175,7 +182,7 @@ Add this dependency to your project's POM:
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>21.11.0</version>
+        <version>21.12.0</version>
     </dependency>
 </dependencies>
 ```

TestData/DocumentActions/MailMerge/TestMailMergeData.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone="yes"?>
+<NewDataSet>
+  <info>
+    <FirstName>Alexey</FirstName>
+    <LastName>Noskov</LastName>
+    <City>Kharkov</City>
+    <Company>Aspose</Company>
+  </info>
+</NewDataSet>

TestData/DocumentActions/MailMerge/TestMailMergeWithOptions.docx

@@ -8,7 +8,7 @@
 
 ApiClient apiClient = new ApiClient(/*clientId*/ "####-####-####-####-####", /*clientSecret*/ "##################", null);
 WordsApi wordsApi = new WordsApi(apiClient);
-String fileName  = "test_doc.docx";
+String fileName = "test_doc.docx";
 
 // Upload original document to cloud storage.
 byte[] myVar1 = Files.readAllBytes(Paths.get(fileName).toAbsolutePath());

examples/AcceptAllRevisions.java

@@ -1,6 +1,6 @@
 ApiClient apiClient = new ApiClient(/*clientId*/ "####-####-####-####-####", /*clientSecret*/ "##################", null);
 WordsApi wordsApi = new WordsApi(apiClient);
-String fileName  = "test_doc.docx";
+String fileName = "test_doc.docx";
 
 // Calls AcceptAllRevisionsOnline method for document in cloud.
 byte[] requestDocument = Files.readAllBytes(Paths.get(fileName).toAbsolutePath());

examples/AcceptAllRevisionsOnline.java

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

pom.xml

@@ -27,7 +27,7 @@
 
 package com.aspose.words.cloud;
 
-import com.aspose.words.cloud.model.requests.RequestIfc;
+import com.aspose.words.cloud.model.requests.*;
 import com.squareup.okhttp.*;
 import com.squareup.okhttp.internal.http.HttpMethod;
 import com.squareup.okhttp.logging.HttpLoggingInterceptor;
@@ -37,14 +37,26 @@
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
 
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
 import javax.mail.BodyPart;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMultipart;
 import javax.mail.util.ByteArrayDataSource;
 import java.io.*;
 import java.lang.reflect.Type;
+import java.math.BigInteger;
 import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.RSAPublicKeySpec;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
@@ -56,7 +68,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.11";
+    private String clientVersion = "21.12";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;
@@ -72,6 +84,7 @@ public class ApiClient {
     private String refreshToken;
     private String ClientSecret;
     private String clientId;
+    private Cipher key;
 
     public ApiClient(String clientId, String clientSecret, String baseUrl) {
         this();
@@ -92,11 +105,29 @@ public ApiClient() {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("Swagger-Codegen/1.0.0/java");
         addDefaultHeader("x-aspose-client", "java sdk");
         addDefaultHeader("x-aspose-client-version", clientVersion);
-        setConnectTimeout(5 * 60 * 1000);
-        setReadTimeout(5 * 60 * 1000);
+        setConnectTimeout(180);
+        setReadTimeout(180);
+    }
+
+
+    /**
+     * Gets a public key
+     * @return public key
+     */
+    public Cipher getKey() {
+        return key;
+    }
+
+    /**
+     * Sets a public key
+     * @param key
+     * @return api client
+     */
+    public ApiClient setKey(Cipher key) {
+        this.key = key;
+        return this;
     }
 
      /**
@@ -355,68 +386,68 @@ public ApiClient setTempFolderPath(String tempFolderPath) {
     }
 
     /**
-     * Get connection timeout (in milliseconds).
+     * Get connection timeout (in seconds).
      *
-     * @return Timeout in milliseconds
+     * @return Timeout in seconds
      */
     public int getConnectTimeout() {
         return httpClient.getConnectTimeout();
     }
 
     /**
-     * Sets the connect timeout (in milliseconds).
+     * Sets the connect timeout (in seconds).
      * A value of 0 means no timeout, otherwise values must be between 1 and
      * {@link Integer#MAX_VALUE}.
      *
-     * @param connectionTimeout connection timeout in milliseconds
+     * @param connectionTimeout connection timeout in seconds
      * @return Api client
      */
     public ApiClient setConnectTimeout(int connectionTimeout) {
-        httpClient.setConnectTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
+        httpClient.setConnectTimeout(connectionTimeout, TimeUnit.SECONDS);
         return this;
     }
 
     /**
-     * Get read timeout (in milliseconds).
+     * Get read timeout (in seconds).
      *
-     * @return Timeout in milliseconds
+     * @return Timeout in seconds
      */
     public int getReadTimeout() {
         return httpClient.getReadTimeout();
     }
 
     /**
-     * Sets the read timeout (in milliseconds).
+     * Sets the read timeout (in seconds).
      * A value of 0 means no timeout, otherwise values must be between 1 and
      * {@link Integer#MAX_VALUE}.
      *
-     * @param readTimeout read timeout in milliseconds
+     * @param readTimeout read timeout in seconds
      * @return Api client
      */
     public ApiClient setReadTimeout(int readTimeout) {
-        httpClient.setReadTimeout(readTimeout, TimeUnit.MILLISECONDS);
+        httpClient.setReadTimeout(readTimeout, TimeUnit.SECONDS);
         return this;
     }
 
     /**
-     * Get write timeout (in milliseconds).
+     * Get write timeout (in seconds).
      *
-     * @return Timeout in milliseconds
+     * @return Timeout in seconds
      */
     public int getWriteTimeout() {
         return httpClient.getWriteTimeout();
     }
 
     /**
-     * Sets the write timeout (in milliseconds).
+     * Sets the write timeout (in seconds).
      * A value of 0 means no timeout, otherwise values must be between 1 and
      * {@link Integer#MAX_VALUE}.
      *
-     * @param writeTimeout connection timeout in milliseconds
+     * @param writeTimeout connection timeout in seconds
      * @return Api client
      */
     public ApiClient setWriteTimeout(int writeTimeout) {
-        httpClient.setWriteTimeout(writeTimeout, TimeUnit.MILLISECONDS);
+        httpClient.setWriteTimeout(writeTimeout, TimeUnit.SECONDS);
         return this;
     }
 
@@ -1145,11 +1176,34 @@ public void requestToken() throws ApiException {
         }
     }
 
+    public void setRsaKey(String modulus, String exponent) throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchPaddingException, InvalidKeyException {
+        byte[] modulusByte = Base64.getDecoder().decode(modulus);
+        BigInteger modulusInt = new BigInteger(1, modulusByte);
+        byte[] exponentByte = Base64.getDecoder().decode(exponent);
+        BigInteger exponentInt = new BigInteger(1, exponentByte);
+        RSAPublicKeySpec spec = new RSAPublicKeySpec(modulusInt, exponentInt);
+        KeyFactory factory = KeyFactory.getInstance("RSA");
+        PublicKey key = factory.generatePublic(spec);
+        this.key = Cipher.getInstance("RSA");
+        this.key.init(Cipher.ENCRYPT_MODE, key);
+    }
+
     /**
     * AddParameterToQuery
     */
     public void addParameterToQuery(List<Pair> queryParams, String paramName, Object paramValue) {
-        queryParams.addAll(parameterToPair(paramName, paramValue));
+        if (paramName.equals("password") && paramValue != null && !paramValue.toString().isEmpty()) {
+            try {
+                queryParams.addAll(parameterToPair("encryptedPassword", Base64.getEncoder().encode(this.key.doFinal(paramValue.toString().getBytes(StandardCharsets.UTF_8)))));
+            }
+            catch (IllegalBlockSizeException e) {
+            }
+            catch (BadPaddingException e) {
+            }
+        }
+        else {
+            queryParams.addAll(parameterToPair(paramName, paramValue));
+        }
     }
 
     /**
@@ -1171,18 +1225,23 @@ public String addParameterToPath(String path, String paramName, Object paramValu
     /**
      * Build batch request
      */
-    public Request buildBatchRequest(RequestIfc[] requests) throws ApiException, IOException {
+    public Request buildBatchRequest(BatchPartRequest[] requests, Boolean displayIntermediateResults) throws ApiException, IOException {
         Headers multipartHeaders = Headers.of("Content-Disposition", "form-data");
         MultipartBuilder builder = new MultipartBuilder().type(MultipartBuilder.FORM);
-        for (RequestIfc request : requests) {
-            Request httpRequest = request.buildHttpRequest(this, null, null, false);
-            builder.addPart(multipartHeaders, new ChildRequestContent(httpRequest, basePath + "/words/"));
+        for (BatchPartRequest request : requests) {
+            builder.addPart(multipartHeaders, new ChildRequestContent(this, request, basePath + "/words/"));
         }
 
         RequestBody requestBody = builder.build();
         Map<String, String> headers = new HashMap<>();
         headers.put("Content-Type", requestBody.contentType().toString());
-        return buildRequest("/words/batch", "PUT", new ArrayList<>(), new ArrayList<>(), requestBody, headers, new HashMap<>(), true, null);
+
+        String url = "/words/batch";
+        if (!displayIntermediateResults) {
+            url += "?displayIntermediateResults=false";
+        }
+
+        return buildRequest(url, "PUT", new ArrayList<>(), new ArrayList<>(), requestBody, headers, new HashMap<>(), true, null);
     }
 
     /**
@@ -1279,7 +1338,8 @@ public Object parseBatchPart(Request masterRequest, BodyPart bodyPart, Type retu
             Headers headers = headersBuilder.build();
             byte[] rawBody = buffer.toByteArray();
             if (rawBody.length != lastSplitIndex + 2) {
-                byte[] responseBytes = Arrays.copyOfRange(rawBody, lastSplitIndex + 2, rawBody.length);
+                byte[] responseBytes = new byte[rawBody.length - (lastSplitIndex + 2)];
+                System.arraycopy(rawBody, lastSplitIndex + 2, responseBytes, 0, responseBytes.length);
                 responseBody = ResponseBody.create(MediaType.parse(headers.get("Content-Type")), responseBytes);
             }
 

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

@@ -27,6 +27,7 @@
 
 package com.aspose.words.cloud;
 
+import com.aspose.words.cloud.model.requests.*;
 import com.squareup.okhttp.MediaType;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.RequestBody;
@@ -37,10 +38,12 @@
 
 public class ChildRequestContent extends RequestBody {
     private static final String CRLF = "\r\n";
-    private Request request;
+    private ApiClient apiClient;
+    private BatchPartRequest request;
     private URI baseUri;
 
-    public ChildRequestContent(Request request, String rootUrl) {
+    public ChildRequestContent(ApiClient apiClient, BatchPartRequest request, String rootUrl) {
+        this.apiClient = apiClient;
         this.request = request;
         this.baseUri = URI.create(rootUrl);
     }
@@ -52,22 +55,40 @@ public MediaType contentType() {
 
     @Override
     public void writeTo(BufferedSink bufferedSink) throws IOException {
-        bufferedSink.writeUtf8(request.method());
+        Request httpRequest;
+        try {
+            httpRequest = request.getRequest().buildHttpRequest(this.apiClient, null, null, false);
+        }
+        catch (ApiException ex) {
+            throw new IOException(ex.getMessage());
+        }
+
+        bufferedSink.writeUtf8(httpRequest.method());
         bufferedSink.writeUtf8(" ");
-        bufferedSink.writeUtf8(baseUri.relativize(request.uri()).toString());
+        bufferedSink.writeUtf8(baseUri.relativize(httpRequest.uri()).toString());
         bufferedSink.writeUtf8(" ");
         bufferedSink.writeUtf8(CRLF);
 
-        for (String key : request.headers().names()) {
+        bufferedSink.writeUtf8("RequestId: ");
+        bufferedSink.writeUtf8(request.getRequestId());
+        bufferedSink.writeUtf8(CRLF);
+
+        if (request.getParentRequestId() != null) {
+            bufferedSink.writeUtf8("DependsOn: ");
+            bufferedSink.writeUtf8(request.getParentRequestId());
+            bufferedSink.writeUtf8(CRLF);
+        }
+
+        for (String key : httpRequest.headers().names()) {
             bufferedSink.writeUtf8(key);
             bufferedSink.writeUtf8(": ");
-            bufferedSink.writeUtf8(request.headers().get(key));
+            bufferedSink.writeUtf8(httpRequest.headers().get(key));
             bufferedSink.writeUtf8(CRLF);
         }
 
         bufferedSink.writeUtf8(CRLF);
-        if (request.body() != null) {
-            request.body().writeTo(bufferedSink);
+        if (httpRequest.body() != null) {
+            httpRequest.body().writeTo(bufferedSink);
         }
     }
 }