Merge pull request #3 from kaferi/master

Updated to 18.7

Author: evgeny-porodnov

.gitattributes

@@ -0,0 +1 @@
+*.mht -crlf -diff

.travis.yml

@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2018 Aspose.Pdf for Cloud
+#    Copyright (c) 2018 Aspose.PDF Cloud
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights

README.md

@@ -34,7 +34,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.aspose</groupId>
     <artifactId>aspose-cloud-pdf</artifactId>
-    <version>18.6.0</version>
+    <version>18.7.0</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -44,7 +44,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:18.6.0"
+compile "com.aspose:aspose-cloud-pdf:18.7.0"
 ```
 
 ### Others
@@ -55,7 +55,7 @@ At first generate the JAR by executing:
 
 Then manually install the following JARs:
 
-* target/aspose-cloud-pdf-18.6.0.jar
+* target/aspose-cloud-pdf-18.7.0.jar
 * target/lib/*.jar
 
 ## Getting Started

build.gradle

@@ -1,5 +1,5 @@
 /**
- *   Copyright (c) 2018 Aspose.Pdf for Cloud
+ *   Copyright (c) 2018 Aspose.PDF Cloud
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -20,7 +20,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.aspose'
-version = '18.6.0'
+version = '18.7.0'
 
 buildscript {
     repositories {
@@ -71,8 +71,8 @@ dependencies {
 publish {
     groupId = 'com.aspose'
     artifactId = 'aspose-cloud-pdf'
-    publishVersion = '18.6.0'
-    desc = 'Aspose.PDF for 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 for 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 for 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.'
+    publishVersion = '18.7.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'
     repository = 'https://github.com/aspose-pdf-cloud/aspose-pdf-cloud.git'

gradle.properties

@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2018 Aspose.Pdf for Cloud
+#    Copyright (c) 2018 Aspose.PDF Cloud
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights

gradlew

@@ -4,7 +4,7 @@
 ##
 ##  Gradle start up script for UN*X
 ##
-##    Copyright (c) 2018 Aspose.Pdf for Cloud
+##    Copyright (c) 2018 Aspose.PDF Cloud
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
 ## in the Software without restriction, including without limitation the rights

settings.gradle

@@ -1,5 +1,5 @@
 /**
- *   Copyright (c) 2018 Aspose.Pdf for Cloud
+ *   Copyright (c) 2018 Aspose.PDF Cloud
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights

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

@@ -1,6 +1,6 @@
 /**
  *
- *   Copyright (c) 2018 Aspose.Pdf for Cloud
+ *   Copyright (c) 2018 Aspose.PDF Cloud
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights

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

@@ -1,6 +1,6 @@
 /**
  *
- *   Copyright (c) 2018 Aspose.Pdf for Cloud
+ *   Copyright (c) 2018 Aspose.PDF Cloud
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -1010,48 +1010,60 @@ public String guessContentTypeFromFile(File file) {
      /**
      * Request OAuth token
      */
-    private void requestToken() throws IOException
+    private void requestToken() throws ApiException
     {
-        RequestBody requestBody = new FormEncodingBuilder()
-                .addEncoded("grant_type", "client_credentials")
-                .addEncoded("client_id", getAppSid())
-                .addEncoded("client_secret", getAppKey())
-                .build();
-
-        String url = basePath.replace("/v1.1", "") + "/oauth2/token";
-        Request request = new Request.Builder()
-                .url(url)
-                .post(requestBody)
-                .addHeader("Content-Type", " application/x-www-form-urlencoded")
-                .build();
-
-        Response response = httpClient.newCall(request).execute();
-        GetAccessTokenResult result = json.deserialize(response.body().string(), GetAccessTokenResult.class);
-        setAccessToken(result.access_token);
-        setRefreshToken(result.refresh_token);
+        try {
+            RequestBody requestBody = new FormEncodingBuilder()
+                    .addEncoded("grant_type", "client_credentials")
+                    .addEncoded("client_id", getAppSid())
+                    .addEncoded("client_secret", getAppKey())
+                    .build();
+
+            String url = basePath.replace("/v1.1", "") + "/oauth2/token";
+            Request request = new Request.Builder()
+                    .url(url)
+                    .post(requestBody)
+                    .addHeader("Content-Type", " application/x-www-form-urlencoded")
+                    .build();
+
+            Response response = httpClient.newCall(request).execute();
+            GetAccessTokenResult result = json.deserialize(response.body().string(), GetAccessTokenResult.class);
+            setAccessToken(result.access_token);
+            setRefreshToken(result.refresh_token);
+        }
+        catch (Exception ex)
+        {
+            throw new ApiException(ex);
+        }
     }
 
     /**
      * Refresh OAuth token
      */
-    private void refreshToken() throws IOException
+    public void refreshToken() throws ApiException
     {
-        RequestBody requestBody = new FormEncodingBuilder()
-                .addEncoded("grant_type", "refresh_token")
-                .addEncoded("refresh_token", this.refreshToken)
-                .build();
-
-        String url = basePath.replace("/v1.1", "") + "/oauth2/token";
-        Request request = new Request.Builder()
-                .url(url)
-                .post(requestBody)
-                .addHeader("Content-Type", " application/x-www-form-urlencoded")
-                .build();
-
-        Response response = httpClient.newCall(request).execute();
-        GetAccessTokenResult result = json.deserialize(response.body().string(), GetAccessTokenResult.class);
-        setAccessToken(result.access_token);
-        setRefreshToken(result.refresh_token);
+        try {
+            RequestBody requestBody = new FormEncodingBuilder()
+                    .addEncoded("grant_type", "refresh_token")
+                    .addEncoded("refresh_token", this.refreshToken)
+                    .build();
+
+            String url = basePath.replace("/v1.1", "") + "/oauth2/token";
+            Request request = new Request.Builder()
+                    .url(url)
+                    .post(requestBody)
+                    .addHeader("Content-Type", " application/x-www-form-urlencoded")
+                    .build();
+
+            Response response = httpClient.newCall(request).execute();
+            GetAccessTokenResult result = json.deserialize(response.body().string(), GetAccessTokenResult.class);
+            setAccessToken(result.access_token);
+            setRefreshToken(result.refresh_token);
+        }
+        catch (Exception ex)
+        {
+            throw new ApiException(ex);
+        }
     }
 
 
@@ -1062,16 +1074,10 @@ private void refreshToken() throws IOException
      */
     private void addOAuthAuthentication(Map<String, String> headerParams) throws ApiException
     {
-        try {
-            if (null == accessToken) {
-                requestToken();
-            }
-            headerParams.put("Authorization", "Bearer " + accessToken);
-        }
-        catch (IOException ex)
-        {
-            throw new ApiException(ex);
+        if (null == accessToken) {
+            requestToken();
         }
+        headerParams.put("Authorization", "Bearer " + accessToken);
     }
 
 

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

@@ -1,6 +1,6 @@
 /**
  *
- *   Copyright (c) 2018 Aspose.Pdf for Cloud
+ *   Copyright (c) 2018 Aspose.PDF Cloud
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights