Merge branch 'master' into release

Author: YaroslawEkimov

.gitattributes

@@ -0,0 +1,18 @@
+# default behavior
+* text=auto
+
+# code files
+*.java text eol=lf
+
+# test files
+*.xml text eol=lf
+*.json text eol=lf
+
+# scripts
+*.bat text eol=crlf
+*.ps1 text eol=crlf
+*.sh text eol=lf
+
+
+
+

.gitignore

@@ -21,9 +21,11 @@ target
 .gradle
 build
 .idea/
-.gitignore
 Settings/servercreds.json
 .classpath
 .project
 /aspose-words-cloud.iml
 /out.tmp
+
+# VS Code
+.vs/*

JenkinsfileRelease

@@ -46,7 +46,7 @@ node('words-linux') {
 								sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
 							}
 							sh 'cat wordsSettings.xml'
-							sh "mvn --settings wordsSettings.xml deploy -DcheckModificationExcludeList=wordsSettings.xml,Settings/servercreds.json"							
+							sh "mvn --settings wordsSettings.xml deploy -Dmaven.javadoc.skip=true -DcheckModificationExcludeList=wordsSettings.xml,Settings/servercreds.json"
 						}
 					}
 				}

TestData/DocumentActions/ConvertDocument/Test.docx

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

pom.xml

@@ -51,7 +51,7 @@ public class ApiClient {
     private String apiVersion = "v4.0";
     private String baseUrl = "https://api.aspose.cloud";
     private String basePath = baseUrl + "/" + apiVersion;
-    private String clientVersion = "20.6";
+    private String clientVersion = "20.7";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;
@@ -1047,16 +1047,22 @@ public RequestBody buildRequestBodyFormEncoding(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 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));
-            } 
-            else {
-                Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
-                mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
+        if (formParams.isEmpty()) {
+            Headers partHeaders = Headers.of("Content-Disposition", "form-data");
+            mpBuilder.addPart(partHeaders, RequestBody.create(MediaType.parse("none"), new byte[] {}));
+        }
+        else {
+            for (Entry<String, Object> param : formParams.entrySet()) {
+                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));
+                } 
+                else {
+                    Headers partHeaders = Headers.of("Content-Disposition", "form-data; name=\"" + param.getKey() + "\"");
+                    mpBuilder.addPart(partHeaders, RequestBody.create(null, parameterToString(param.getValue())));
+                }
             }
         }
         return mpBuilder.build();

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

@@ -27484,154 +27484,6 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
         return call;
     }
 
-    /**
-     * Build call for updateParagraphFormatWithoutNodePath
-     * @param progressListener Progress listener
-     * @param progressRequestListener Progress request listener
-     * @return Call to execute
-     * @throws ApiException If fail to serialize the request body object
-     * @throws IOException If fail to serialize the request body object
-     */
-    private com.squareup.okhttp.Call updateParagraphFormatWithoutNodePathCall(UpdateParagraphFormatWithoutNodePathRequest request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
-        Object localVarPostBody = request.getDto();
-
-        // create path and map variables
-        String localVarPath = "/words/{name}/paragraphs/{index}/format".replaceAll("\\{" + "name" + "\\}", request.getName().toString()).replaceAll("//", "/")
-    .replaceAll("\\{" + "index" + "\\}", request.getIndex().toString()).replaceAll("//", "/");
-
-        List<Pair> localVarQueryParams = new ArrayList<Pair>();
-        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
-        localVarPath = addParameterToQuery(localVarQueryParams, localVarPath, "folder", request.getFolder());
-        localVarPath = addParameterToQuery(localVarQueryParams, localVarPath, "storage", request.getStorage());
-        localVarPath = addParameterToQuery(localVarQueryParams, localVarPath, "loadEncoding", request.getLoadEncoding());
-        localVarPath = addParameterToQuery(localVarQueryParams, localVarPath, "password", request.getPassword());
-        localVarPath = addParameterToQuery(localVarQueryParams, localVarPath, "destFileName", request.getDestFileName());
-        localVarPath = addParameterToQuery(localVarQueryParams, localVarPath, "revisionAuthor", request.getRevisionAuthor());
-        localVarPath = addParameterToQuery(localVarQueryParams, localVarPath, "revisionDateTime", request.getRevisionDateTime());
-
-        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-
-        Map<String, Object> localVarFormParams = new LinkedHashMap<String, Object>();
-
-        final String[] localVarAccepts = {
-            "application/xml", "application/json"
-        };
-        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
-
-        final String[] localVarContentTypes = {
-            "application/xml", "application/json"
-        };
-        final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-        localVarHeaderParams.put("Content-Type", localVarContentType);
-
-        if (progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
-                @Override
-                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
-                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
-                    return originalResponse.newBuilder()
-                    .body(new ProgressResponseBody(originalResponse.body(), progressListener))
-                    .build();
-                }
-            });
-        }
-
-        String[] localVarAuthNames = new String[] { "JWT" };
-        return apiClient.buildCall(localVarPath, "PUT", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
-    }
-
-    @SuppressWarnings("rawtypes")
-    private com.squareup.okhttp.Call updateParagraphFormatWithoutNodePathValidateBeforeCall(UpdateParagraphFormatWithoutNodePathRequest request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException, IOException {
-        // verify the required parameter 'Name' is set
-        if (request.getName() == null) {
-            throw new ApiException(BadRequest, "Missing the required parameter 'Name' when calling updateParagraphFormatWithoutNodePath");
-        }
-
-        // verify the required parameter 'Dto' is set
-        if (request.getDto() == null) {
-            throw new ApiException(BadRequest, "Missing the required parameter 'Dto' when calling updateParagraphFormatWithoutNodePath");
-        }
-
-        // verify the required parameter 'Index' is set
-        if (request.getIndex() == null) {
-            throw new ApiException(BadRequest, "Missing the required parameter 'Index' when calling updateParagraphFormatWithoutNodePath");
-        }
-
-        com.squareup.okhttp.Call call = updateParagraphFormatWithoutNodePathCall(request, progressListener, progressRequestListener);
-        return call;
-    }
-
-    /**
-     * Updates paragraph format properties, returns updated format properties.
-     * @param request Request object
-     * @return ParagraphFormatResponse
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     * @throws IOException If fail to serialize the request body object
-     */
-    public ParagraphFormatResponse updateParagraphFormatWithoutNodePath(UpdateParagraphFormatWithoutNodePathRequest request) throws ApiException, IOException {
-        try {
-            ApiResponse< ParagraphFormatResponse > resp = updateParagraphFormatWithoutNodePathWithHttpInfo(request);
-            return resp.getData();
-        }
-        catch (ApiException ex) {
-            if (ex.getCode() == NotAuth) {
-                apiClient.requestToken();
-                ApiResponse< ParagraphFormatResponse > resp = updateParagraphFormatWithoutNodePathWithHttpInfo(request);
-                return resp.getData();
-            }
-            throw ex;
-        }
-    }
-
-    /**
-     * Updates paragraph format properties, returns updated format properties.
-     * @param request Request object
-     * @return ApiResponse< ParagraphFormatResponse >;
-     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
-     * @throws IOException If fail to serialize the request body object
-     */
-    private ApiResponse< ParagraphFormatResponse > updateParagraphFormatWithoutNodePathWithHttpInfo(UpdateParagraphFormatWithoutNodePathRequest request) throws ApiException, IOException {
-        com.squareup.okhttp.Call call = updateParagraphFormatWithoutNodePathValidateBeforeCall(request, null, null);
-        Type localVarReturnType = new TypeToken< ParagraphFormatResponse >() { }.getType();
-        return apiClient.execute(call, localVarReturnType);
-    }
-
-    /**
-     * Updates paragraph format properties, returns updated format properties. (asynchronously)
-     * @param request Request object
-     * @param callback The callback to be executed when the API call finishes
-     * @return The request call
-     * @throws ApiException If fail to process the API call, e.g. serializing the request body object
-     * @throws IOException If fail to serialize the request body object
-     */
-    public com.squareup.okhttp.Call updateParagraphFormatWithoutNodePathAsync(UpdateParagraphFormatWithoutNodePathRequest request, final ApiCallback< ParagraphFormatResponse > callback) throws ApiException, IOException {
-
-        ProgressResponseBody.ProgressListener progressListener = null;
-        ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
-
-        if (callback != null) {
-            progressListener = new ProgressResponseBody.ProgressListener() {
-                @Override
-                public void update(long bytesRead, long contentLength, boolean done) {
-                    callback.onDownloadProgress(bytesRead, contentLength, done);
-                }
-            };
-
-            progressRequestListener = new ProgressRequestBody.ProgressRequestListener() {
-                @Override
-                public void onRequestProgress(long bytesWritten, long contentLength, boolean done) {
-                    callback.onUploadProgress(bytesWritten, contentLength, done);
-                }
-            };
-        }
-
-        com.squareup.okhttp.Call call = updateParagraphFormatWithoutNodePathValidateBeforeCall(request, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken< ParagraphFormatResponse >() { }.getType();
-        apiClient.executeAsync(call, localVarReturnType, callback);
-        return call;
-    }
-
     /**
      * Build call for updateParagraphListFormat
      * @param progressListener Progress listener