Merge pull request #69 from aspose-pdf-cloud/develop

update to 24.5

Author: kaferi

README.md

@@ -30,11 +30,12 @@ XLS, XLSX, PPTX, DOC, DOCX, MobiXML, JPEG, EMF, PNG, BMP, GIF, TIFF, Text
 ## Read PDF Formats
 MHT, PCL, PS, XSLFO, MD
 
-## Enhancements in Version 24.4
-- Convert PDF to optimized Text.
-- Convert PDF to EXCEL without Cloud Storage.
+## Enhancements in Version 24.5
 - A new version of Aspose.PDF Cloud was prepared using the latest version of Aspose.PDF for .NET.
 
+## Bugs fixed in Version 24.5
+- Aspose.PDF Cloud Service Throws Bad Gateway Error intermittently.
+
 ## Installation
 To install the API client library to your local Maven repository, simply execute:
 
@@ -57,7 +58,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.aspose</groupId>
     <artifactId>aspose-cloud-pdf</artifactId>
-    <version>24.4.0</version>
+    <version>24.5.0</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -66,7 +67,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-compile "com.aspose:aspose-cloud-pdf:24.4.0"
+compile "com.aspose:aspose-cloud-pdf:24.5.0"
 ```
 
 ### Others
@@ -76,7 +77,7 @@ At first generate the JAR by executing:
 
 Then manually install the following JARs:
 
-* target/aspose-cloud-pdf-24.4.0.jar
+* target/aspose-cloud-pdf-24.5.0.jar
 * target/lib/*.jar
 
 ## Getting Started

build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.aspose'
-version = '24.4.0'
+version = '24.5.0'
 
 buildscript {
     repositories {
@@ -84,7 +84,7 @@ dependencies {
 publish {
     groupId = 'com.aspose'
     artifactId = 'aspose-pdf-cloud'
-    publishVersion = '24.4.0'
+    publishVersion = '24.5.0'
     desc = 'Aspose.PDF Cloud is a REST API for creating and editing PDF files. Most popular features proposed by Aspose.PDF Cloud: PDF to Word, Convert PDF to Image, Merge PDF, Split PDF, Add Images to PDF, Rotate PDF. It can also be used to convert PDF files to different formats like DOC, HTML, XPS, TIFF and many more. Aspose.PDF Cloud gives you control: create PDFs from scratch or from HTML, XML, template, database, XPS or an image. Render PDFs to image formats such as JPEG, PNG, GIF, BMP, TIFF and many others. Aspose.PDF Cloud helps you manipulate elements of a PDF file like text, annotations, watermarks, signatures, bookmarks, stamps and so on. Its REST API also allows you to manage PDF pages by using features like merging, splitting, and inserting. Add images to a PDF file or convert PDF pages to images.'
     licences = ['MIT']
     website = 'https://products.aspose.cloud/pdf/cloud'

docs/PdfApi.md

@@ -209,6 +209,7 @@ Method | HTTP request | Description
 [**postDocumentTextReplace**](PdfApi.md#postDocumentTextReplace) | **POST** /pdf/\{name}/text/replace | Document's replace text method.
 [**postEncryptDocumentInStorage**](PdfApi.md#postEncryptDocumentInStorage) | **POST** /pdf/\{name}/encrypt | Encrypt document in storage.
 [**postFlattenDocument**](PdfApi.md#postFlattenDocument) | **POST** /pdf/\{name}/flatten | Flatten the document.
+[**postHtmlToPdf**](PdfApi.md#postHtmlToPdf) | **POST** /pdf/create/html | Convert HTML file (zip archive in request content) to PDF format and return resulting file in response. 
 [**postImportFieldsFromFdf**](PdfApi.md#postImportFieldsFromFdf) | **POST** /pdf/\{name}/import/fdf | Update fields from FDF file in request.
 [**postImportFieldsFromXfdf**](PdfApi.md#postImportFieldsFromXfdf) | **POST** /pdf/\{name}/import/xfdf | Update fields from XFDF file in request.
 [**postImportFieldsFromXml**](PdfApi.md#postImportFieldsFromXml) | **POST** /pdf/\{name}/import/xml | Update fields from XML file in request.
@@ -5366,6 +5367,34 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+<a name="postHtmlToPdf"></a>
+# **postHtmlToPdf**
+> File postHtmlToPdf(htmlFileName, height, width, isLandscape, marginLeft, marginBottom, marginRight, marginTop)
+
+Convert HTML file (zip archive in request content) to PDF format and return resulting file in response. 
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **htmlFileName** | **String**| Name of HTML file in ZIP. | [optional]
+ **height** | **Double**| Page height | [optional]
+ **width** | **Double**| Page width | [optional]
+ **isLandscape** | **Boolean**| Is page landscaped | [optional]
+ **marginLeft** | **Double**| Page margin left | [optional]
+ **marginBottom** | **Double**| Page margin bottom | [optional]
+ **marginRight** | **Double**| Page margin right | [optional]
+ **marginTop** | **Double**| Page margin top | [optional]
+
+### Return type
+
+**File**
+
+### HTTP request headers
+
+ - **Content-Type**: application/octet-stream
+ - **Accept**: multipart/form-data
+
 <a name="postImportFieldsFromFdf"></a>
 # **postImportFieldsFromFdf**
 > AsposeResponse postImportFieldsFromFdf(name, storage, folder, fdfData)

pom.xml

@@ -6,7 +6,7 @@
     <artifactId>aspose-pdf-cloud</artifactId>
     <packaging>jar</packaging>
     <name>aspose-pdf-cloud</name>
-    <version>24.4.0</version>
+    <version>24.5.0</version>
     <url>https://www.aspose.cloud/</url>
     <description>Aspose.PDF Cloud is a REST API for creating and editing PDF files.
  Most popular features proposed by Aspose.PDF Cloud: PDF to Word, Convert PDF to Image, Merge PDF, Split PDF, Add Images to PDF, Rotate PDF.

src/main/java/com/aspose/asposecloudpdf/ApiClient.java

@@ -93,7 +93,7 @@ public ApiClient() {
 
         // Add custom headers
         addDefaultHeader("x-aspose-client", "java sdk");
-        addDefaultHeader("x-aspose-client-version", "24.4.0");
+        addDefaultHeader("x-aspose-client-version", "24.5.0");
 
         // PDFCLOUD-418 Set default Connect Timeout
         setConnectTimeout(5 * 60 * 1000);

src/main/java/com/aspose/asposecloudpdf/api/PdfApi.java

@@ -32781,6 +32781,180 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
+    /**
+     * Build call for postHtmlToPdf
+     * @param htmlFileName Name of HTML file in ZIP. (optional)
+     * @param height Page height (optional)
+     * @param width Page width (optional)
+     * @param isLandscape Is page landscaped (optional)
+     * @param marginLeft Page margin left (optional)
+     * @param marginBottom Page margin bottom (optional)
+     * @param marginRight Page margin right (optional)
+     * @param marginTop Page margin top (optional)
+     * @param progressListener Progress listener
+     * @param progressRequestListener Progress request listener
+     * @return Call to execute
+     * @throws ApiException If fail to serialize the request body object
+     */
+    public com.squareup.okhttp.Call postHtmlToPdfCall(String htmlFileName, Double height, Double width, Boolean isLandscape, Double marginLeft, Double marginBottom, Double marginRight, Double marginTop, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        Object localVarPostBody = null;
+
+        // create path and map variables
+        String localVarPath = "/pdf/create/html";
+
+        List<Pair> localVarQueryParams = new ArrayList<Pair>();
+        List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
+        if (htmlFileName != null)
+        localVarQueryParams.addAll(apiClient.parameterToPair("htmlFileName", htmlFileName));
+        if (height != null)
+        localVarQueryParams.addAll(apiClient.parameterToPair("height", height));
+        if (width != null)
+        localVarQueryParams.addAll(apiClient.parameterToPair("width", width));
+        if (isLandscape != null)
+        localVarQueryParams.addAll(apiClient.parameterToPair("isLandscape", isLandscape));
+        if (marginLeft != null)
+        localVarQueryParams.addAll(apiClient.parameterToPair("marginLeft", marginLeft));
+        if (marginBottom != null)
+        localVarQueryParams.addAll(apiClient.parameterToPair("marginBottom", marginBottom));
+        if (marginRight != null)
+        localVarQueryParams.addAll(apiClient.parameterToPair("marginRight", marginRight));
+        if (marginTop != null)
+        localVarQueryParams.addAll(apiClient.parameterToPair("marginTop", marginTop));
+
+        Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+        Map<String, Object> localVarFormParams = new HashMap<String, Object>();
+
+        final String[] localVarAccepts = {
+            "multipart/form-data"
+        };
+        final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
+        if (localVarAccept != null) localVarHeaderParams.put("Accept", localVarAccept);
+
+        final String[] localVarContentTypes = {
+            "application/octet-stream"
+        };
+        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, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarAuthNames, progressRequestListener);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private com.squareup.okhttp.Call postHtmlToPdfValidateBeforeCall(String htmlFileName, Double height, Double width, Boolean isLandscape, Double marginLeft, Double marginBottom, Double marginRight, Double marginTop, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+        
+
+        com.squareup.okhttp.Call call = postHtmlToPdfCall(htmlFileName, height, width, isLandscape, marginLeft, marginBottom, marginRight, marginTop, progressListener, progressRequestListener);
+        return call;
+
+    }
+
+    /**
+     * Convert HTML file (zip archive in request content) to PDF format and return resulting file in response. 
+     * 
+     * @param htmlFileName Name of HTML file in ZIP. (optional)
+     * @param height Page height (optional)
+     * @param width Page width (optional)
+     * @param isLandscape Is page landscaped (optional)
+     * @param marginLeft Page margin left (optional)
+     * @param marginBottom Page margin bottom (optional)
+     * @param marginRight Page margin right (optional)
+     * @param marginTop Page margin top (optional)
+     * @return File
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public File postHtmlToPdf(String htmlFileName, Double height, Double width, Boolean isLandscape, Double marginLeft, Double marginBottom, Double marginRight, Double marginTop) throws ApiException {
+        try
+        {
+            ApiResponse<File> resp = postHtmlToPdfWithHttpInfo(htmlFileName, height, width, isLandscape, marginLeft, marginBottom, marginRight, marginTop);
+            return resp.getData();
+        }
+        catch (ApiException ex)
+        {
+            if (ex.getCode() == 401)
+            {
+                apiClient.requestToken();
+                ApiResponse<File> resp = postHtmlToPdfWithHttpInfo(htmlFileName, height, width, isLandscape, marginLeft, marginBottom, marginRight, marginTop);
+                return resp.getData();
+            }
+            throw ex;
+        }
+    }
+
+    /**
+     * Convert HTML file (zip archive in request content) to PDF format and return resulting file in response. 
+     * 
+     * @param htmlFileName Name of HTML file in ZIP. (optional)
+     * @param height Page height (optional)
+     * @param width Page width (optional)
+     * @param isLandscape Is page landscaped (optional)
+     * @param marginLeft Page margin left (optional)
+     * @param marginBottom Page margin bottom (optional)
+     * @param marginRight Page margin right (optional)
+     * @param marginTop Page margin top (optional)
+     * @return ApiResponse&lt;File&gt;
+     * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
+     */
+    public ApiResponse<File> postHtmlToPdfWithHttpInfo(String htmlFileName, Double height, Double width, Boolean isLandscape, Double marginLeft, Double marginBottom, Double marginRight, Double marginTop) throws ApiException {
+        com.squareup.okhttp.Call call = postHtmlToPdfValidateBeforeCall(htmlFileName, height, width, isLandscape, marginLeft, marginBottom, marginRight, marginTop, null, null);
+        Type localVarReturnType = new TypeToken<File>(){}.getType();
+        return apiClient.execute(call, localVarReturnType);
+    }
+
+    /**
+     * Convert HTML file (zip archive in request content) to PDF format and return resulting file in response.  (asynchronously)
+     * 
+     * @param htmlFileName Name of HTML file in ZIP. (optional)
+     * @param height Page height (optional)
+     * @param width Page width (optional)
+     * @param isLandscape Is page landscaped (optional)
+     * @param marginLeft Page margin left (optional)
+     * @param marginBottom Page margin bottom (optional)
+     * @param marginRight Page margin right (optional)
+     * @param marginTop Page margin top (optional)
+     * @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
+     */
+    public com.squareup.okhttp.Call postHtmlToPdfAsync(String htmlFileName, Double height, Double width, Boolean isLandscape, Double marginLeft, Double marginBottom, Double marginRight, Double marginTop, final ApiCallback<File> callback) throws ApiException {
+
+        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 = postHtmlToPdfValidateBeforeCall(htmlFileName, height, width, isLandscape, marginLeft, marginBottom, marginRight, marginTop, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<File>(){}.getType();
+        apiClient.executeAsync(call, localVarReturnType, callback);
+        return call;
+    }
     /**
      * Build call for postImportFieldsFromFdf
      * @param name The document name. (required)