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

update to 24.3

Author: kaferi

README.md

@@ -29,8 +29,7 @@ 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.2
-- Memory leak when converting PDF to DOCX.
+## Enhancements in Version 24.3
 - A new version of Aspose.PDF Cloud was prepared using the latest version of Aspose.PDF for .NET.
 
 ## Requirements
@@ -96,6 +95,12 @@ Please follow the [installation](#installation) instruction and execute the foll
 	com.squareup.okhttp.Call result = pdfApi.deleteField(name, fieldName, storage, folder);
 ```
 
+## SelfHost Aspose.PDF Cloud
+Create **PdfApi** object with one *host* parameter:
+```java
+        PdfApi pdfApi = new PdfApi("MY_SELFHOST_URL");
+```
+
 ## Unit Tests
 Aspose PDF Cloud SDK includes a suite of unit tests within the "test" subdirectory. These Unit Tests also serves as examples of how to use the Aspose PDF Cloud SDK.
 

sdk/build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.aspose'
-version = '24.2.0'
+version = '24.3.0'
 
 buildscript {
     repositories {
@@ -100,7 +100,7 @@ dependencies {
 publish {
     groupId = 'com.aspose'
     artifactId = 'aspose-cloud-pdf-android'
-    publishVersion = '24.2.0'
+    publishVersion = '24.3.0'
     desc = 'Aspose.PDF Cloud is a REST API for creating and editing PDF files. 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'

sdk/src/main/java/com/aspose/asposecloudpdfandroid/ApiClient.java

@@ -62,6 +62,7 @@
 
 public class ApiClient {
 
+    private Boolean selfHost = false;
     private String basePath = "https://api.aspose.cloud/v3.0";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
@@ -92,13 +93,23 @@ public ApiClient() {
 
         // Add custom headers
         addDefaultHeader("x-aspose-client", "android sdk");
-        addDefaultHeader("x-aspose-client-version", "24.2.0");
+        addDefaultHeader("x-aspose-client-version", "24.3.0");
 
         // PDFCLOUD-418 Set default Connect Timeout
         setConnectTimeout(5 * 60 * 1000);
         setReadTimeout(5 * 60 * 1000);
     }
 
+    /**
+     * Set SelfHost
+     *
+     * @param selfHost SelfHost
+     */
+    public void setSelfHost(Boolean selfHost)
+    {
+        this.selfHost = selfHost;
+    }
+
      /**
      * Get App Key
      *
@@ -856,7 +867,9 @@ public Call buildCall(String path, String method, List<Pair> queryParams, List<P
      * @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 {
-        addOAuthAuthentication(headerParams);
+        if (!selfHost) {
+            addOAuthAuthentication(headerParams);
+        }
         final String url = buildUrl(path, queryParams, collectionQueryParams);
         final Request.Builder reqBuilder = new Request.Builder().url(url);
         processHeaderParams(headerParams, reqBuilder);

sdk/src/main/java/com/aspose/asposecloudpdfandroid/api/PdfApi.java

@@ -187,10 +187,17 @@ public class PdfApi {
 
     public PdfApi(String appKey, String appSid) {
         this(Configuration.getDefaultApiClient());
+        apiClient.setSelfHost(false);
         apiClient.setAppKey(appKey);
         apiClient.setAppSid(appSid);
     }
 
+    public PdfApi(String host) {
+        this(Configuration.getDefaultApiClient());
+        apiClient.setSelfHost(true);
+        apiClient.setBasePath(host);
+    }
+
     public PdfApi(ApiClient apiClient) {
         this.apiClient = apiClient;
     }

sdk/src/test/java/com/aspose/asposecloudpdfandroid/api/TestHelper.java

@@ -18,6 +18,7 @@ public class TestHelper {
     public static String setupFile = "..\\..\\..\\Settings\\servercreds.json";
 
     class ApiCreds{
+        public Boolean SelfHost = false;
         public String AppKey;
         public String AppSID;
         public String ProductUri;
@@ -36,16 +37,23 @@ public static TestHelper getInstance() throws ApiException
     private TestHelper() throws ApiException
     {
         TestHelper.ApiCreds apiCreds = getApiCreds();
-        pdfApi = new PdfApi(apiCreds.AppKey, apiCreds.AppSID);
-        pdfApi.getApiClient().setBasePath(apiCreds.ProductUri);
+        if (apiCreds.SelfHost) {
+            pdfApi = new PdfApi(apiCreds.ProductUri);
+        } else {
+            pdfApi = new PdfApi(apiCreds.AppKey, apiCreds.AppSID);
+        }
     }
 
     private TestHelper.ApiCreds getApiCreds() throws ApiException
     {
         Gson gson = new Gson();
         try {
             JsonReader reader = new JsonReader(new FileReader(setupFile));
-            return gson.fromJson(reader, TestHelper.ApiCreds.class);
+            TestHelper.ApiCreds creds = gson.fromJson(reader, TestHelper.ApiCreds.class);
+            if (creds.SelfHost == null) {
+                creds.SelfHost = false;
+            }
+            return creds;
         }
         catch (FileNotFoundException ex){
             throw new ApiException(ex.getMessage());