Merge branch 'master' into release

Author: YaroslawEkimov

Jenkinsfile

@@ -1,7 +1,13 @@
-parameters {
-        string(name: 'branch', defaultValue: 'master', description: 'branch to test')		
-		string(name: 'testServerUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')		
-}
+properties([
+	gitLabConnection('gitlab'),
+	[$class: 'ParametersDefinitionProperty', 
+		parameterDefinitions: [
+			[$class: 'StringParameterDefinition', name: 'branch', defaultValue: 'master', description: 'the branch to build'],
+			[$class: 'StringParameterDefinition', name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'api url'],
+			[$class: 'BooleanParameterDefinition', name: 'debugMode', defaultValue: 'false', description: 'debug mode']
+		]
+	]
+])
 
 def runtests(directory)
 {
@@ -11,7 +17,7 @@ def runtests(directory)
                 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']]])
                 withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
 					sh 'mkdir -p Settings'
-                    sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
+                    sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$apiUrl\\", \\"Debug\\" : \\"$debugMode\\" }}" > Settings/servercreds.json'
                 }
             }
 

README.md

@@ -14,7 +14,7 @@ This repository contains Aspose.Words Cloud SDK for Java source code. This SDK a
 * Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
 
 ## How to use the SDK?
-The complete source code is available in this repository folder. You can either directly use it in your project via source code or get [Maven](https://mvnrepository.com/artifact/com.aspose/aspose-cloud-words) (recommended). For more details, please visit our [documentation website](https://docs.aspose.cloud/display/wordscloud/Available+SDKs).
+The complete source code is available in this repository folder. You can either directly use it in your project via source code or get [Maven](https://repository.aspose.cloud/webapp/#/artifacts/browse/tree/General/repo/com/aspose/aspose-words-cloud) (recommended). For more details, please visit our [documentation website](https://docs.aspose.cloud/display/wordscloud/Available+SDKs).
 
 ### Prerequisites
 
@@ -33,15 +33,10 @@ Add this dependency to your project's POM:
 </repositories>
 
 <dependencies>
-    <dependency>
-        <groupId>com.aspose</groupId>
-        <artifactId>aspose-cloud-storage</artifactId>
-        <version>1.0.1</version>
-    </dependency>
     <dependency>
         <groupId>com.aspose</groupId>
         <artifactId>aspose-words-cloud</artifactId>
-        <version>18.9.0</version>
+        <version>20.3.0</version>
     </dependency>
 </dependencies>
 ```
@@ -50,32 +45,30 @@ Add this dependency to your project's POM:
 
 ```java
 
-import com.aspose.words.*;
-import com.aspose.words.auth.*;
-import com.aspose.words.model.*;
-import com.aspose.words.api.WordsApi;
+import com.aspose.words.cloud.ApiException;
+import com.aspose.words.cloud.api.WordsApi;
+import com.aspose.words.cloud.model.DocumentResponse;
+import com.aspose.words.cloud.model.requests.DeleteWatermarkRequest;
 
-import java.io.File;
-import java.util.*;
+import java.io.IOException;
 
 public class WordsApiExample {
 
-    public static void main(String[] args) {
-        
-        WordsApi wordsApi = new WordsApi();
+    public static void main(String[] args) throws ApiException, IOException {
+	// write your code here
+        WordsApi wordsApi = new WordsApi("appSid", "appKey", null);
         String remoteName = "TestDeleteDocumentWatermark.docx";
-		String remoteFolder = "TestFolder"
-		DeleteDocumentWatermarkRequest request = new DeleteDocumentWatermarkRequest(remoteName,
+        String remoteFolder = "TestFolder";
+        DeleteWatermarkRequest request = new DeleteWatermarkRequest(remoteName,
                 remoteFolder, null, null, null, null, null, null);
 
-        DocumentResponse result = wordsApi.deleteDocumentWatermark(request);
+        DocumentResponse result = wordsApi.deleteWatermark(request);
     }
 }
 
 ```
 
-[Test](src/test/java/com/aspose/words) contain various examples of using the SDK.
-Please put your credentials into [ApiClient](src/main/java/com/aspose/words/ApiClient.java).
+[Test](src/test/java/com/aspose/words/cloud) contain various examples of using the SDK.
 
 ## Dependencies
 - Java 1.7+

pom.xml

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

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

@@ -27,8 +27,6 @@
 
 package com.aspose.words.cloud;
 
-import java.io.IOException;
-
 import java.util.Map;
 import java.util.List;
 

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

@@ -26,9 +26,6 @@
  */
 package com.aspose.words.cloud;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import com.squareup.okhttp.*;
 import com.squareup.okhttp.internal.http.HttpMethod;
 import com.squareup.okhttp.logging.HttpLoggingInterceptor;
@@ -37,29 +34,11 @@
 import okio.Okio;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.format.DateTimeFormatter;
-
-import javax.net.ssl.*;
-
-import java.io.Console;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
+
+import java.io.*;
 import java.lang.reflect.Type;
 import java.net.URLConnection;
 import java.net.URLEncoder;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.text.DateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
@@ -71,7 +50,7 @@ public class ApiClient {
     private String apiVersion = "v4.0";
     private String baseUrl = "https://api.aspose.cloud";
     private String basePath = baseUrl + "/" + apiVersion;
-    private String clientVersion = "19.10.0";
+    private String clientVersion = "20.3.0";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;
@@ -85,6 +64,15 @@ public class ApiClient {
     private String refreshToken;
     private String appKey;
     private String appSid;
+    
+    public ApiClient(String appSid, String appKey, String baseUrl) {
+        this();
+        this.appSid = appSid;
+        this.appKey = appKey;
+        if (baseUrl != null) {
+            this.setBaseUrl(baseUrl);
+        }
+    }
 
     /*
      * Constructor for ApiClient
@@ -194,7 +182,7 @@ public ApiClient setBaseUrl(String baseUrl) {
      */
     public ApiClient setBasePath(String basePath) {
         this.basePath = basePath;
-        this.baseUrl = basePath.replace("/v4.0", "");
+        this.baseUrl = basePath.replace("/v1.1", "").replace("/v1", "").replace("/v2", "").replace("/v3", "");
         return this;
     }
 
@@ -893,7 +881,7 @@ public <T> T handleResponse(Response response, Type returnType) throws ApiExcept
      * @return The HTTP call
      * @throws ApiException If fail to serialize the request body object
      */
-    public Call buildCall(String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    public Call buildCall(String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
         Request request = buildRequest(path, method, queryParams, collectionQueryParams, body, headerParams, formParams, authNames, progressRequestListener);
 
         return httpClient.newCall(request);
@@ -914,7 +902,7 @@ public Call buildCall(String path, String method, List<Pair> queryParams, List<P
      * @return The HTTP request 
      * @throws ApiException If fail to serialize the request body object
      */
-    public Request buildRequest(String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    public Request buildRequest(String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, Object> formParams, String[] authNames, ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
         addOAuthAuthentication(headerParams);
         final String url = buildUrl(path, queryParams, collectionQueryParams);
         final Request.Builder reqBuilder = new Request.Builder().url(url);
@@ -1052,12 +1040,12 @@ public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams)
      * @param formParams Form parameters in the form of Map
      * @return RequestBody
      */
-    public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
+    public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) throws IOException {
         MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
         for (Entry<String, Object> param : formParams.entrySet()) {
-            if (param.getValue() instanceof File) {
-                File file = (File) param.getValue();
-                Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + file.getName() + "\"");
+            if (param.getValue() instanceof byte[]) {
+                byte[] file = (byte[]) param.getValue();
+                Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"; filename=\"" + param.getKey() + "\"");
                 MediaType mediaType = MediaType.parse(guessContentTypeFromFile(file));
                 mpBuilder.addPart(partHeaders, RequestBody.create(mediaType, file));
             } 
@@ -1075,8 +1063,8 @@ public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
      * @param file The given file
      * @return The guessed Content-Type
      */
-    public String guessContentTypeFromFile(File file) {
-        String contentType = URLConnection.guessContentTypeFromName(file.getName());
+    public String guessContentTypeFromFile(byte[] file) throws IOException {
+        String contentType = URLConnection.guessContentTypeFromStream(new ByteArrayInputStream(file));
         if (contentType == null) {
             return "application/octet-stream";
         } 
@@ -1087,7 +1075,7 @@ public String guessContentTypeFromFile(File file) {
 
      /**
      * Request OAuth token
-     * @throws ApiException If fails to authorize
+     @throw ApiException If authorization is failed
      */
     public void requestToken() throws ApiException {
         try {
@@ -1131,6 +1119,5 @@ private void addOAuthAuthentication(Map<String, String> headerParams) throws Api
     */
     private class GetAccessTokenResult {
         public String access_token;
-        public String refresh_token;
     }
 }

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

@@ -85,12 +85,13 @@ public ApiException(int code, String message, Map<String, List<String>> response
     }
 
     private void setInnerError() {
-        if (!responseBody.startsWith("{")) return;
+        if (!responseBody.contains("Error") || !responseBody.startsWith("{")) return;
         JsonElement elem = new JsonParser().parse(responseBody);
         this.innerError = new JSON().deserialize(
-                        elem.getAsJsonObject().get("Error").toString(), 
-                        ApiError.class);
+                elem.getAsJsonObject().get("Error").toString(),
+                ApiError.class);
     }
+
     /**
      * Get the HTTP status code.
      *

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

@@ -36,7 +36,6 @@
 import com.google.gson.stream.JsonWriter;
 import com.google.gson.JsonElement;
 import io.gsonfire.GsonFireBuilder;
-import io.gsonfire.TypeSelector;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
 import org.threeten.bp.ZoneOffset;
@@ -51,12 +50,8 @@
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.Map;
-import java.util.HashMap;
 
 public class JSON {
     private Gson gson;