Merge pull request #4 from kaferi/master

Updated to 18.8

Author: evgeny-porodnov

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.7.0</version>
+    <version>18.8.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.7.0"
+compile "com.aspose:aspose-cloud-pdf:18.8.0"
 ```
 
 ### Others
@@ -55,7 +55,7 @@ At first generate the JAR by executing:
 
 Then manually install the following JARs:
 
-* target/aspose-cloud-pdf-18.7.0.jar
+* target/aspose-cloud-pdf-18.8.0.jar
 * target/lib/*.jar
 
 ## Getting Started

build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.aspose'
-version = '18.7.0'
+version = '18.8.0'
 
 buildscript {
     repositories {
@@ -71,7 +71,7 @@ dependencies {
 publish {
     groupId = 'com.aspose'
     artifactId = 'aspose-cloud-pdf'
-    publishVersion = '18.7.0'
+    publishVersion = '18.8.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'

setup.json

@@ -1,5 +1,5 @@
 {
-    "app_key" : "",
-    "app_sid" : "",
-    "product_uri" : "https://api-dev.aspose.cloud/v1.1"
+    "app_key": "",
+    "app_sid": "",
+    "product_uri": "https://billing.cloud.saltov.dynabic.com/v2.0"
 }

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

@@ -62,7 +62,7 @@
 
 public class ApiClient {
 
-    private String basePath = "https://api.aspose.cloud/v1.1";
+    private String basePath = "https://api.aspose.cloud/v2.0";
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;
@@ -149,7 +149,7 @@ public String getBasePath() {
     /**
      * Set base path
      *
-     * @param basePath Base path of the URL (e.g https://api.aspose.cloud/v1.1
+     * @param basePath Base path of the URL (e.g https://api.aspose.cloud/v2.0
      * @return An instance of OkHttpClient
      */
     public ApiClient setBasePath(String basePath) {
@@ -1019,7 +1019,7 @@ private void requestToken() throws ApiException
                     .addEncoded("client_secret", getAppKey())
                     .build();
 
-            String url = basePath.replace("/v1.1", "") + "/oauth2/token";
+            String url = basePath.replace("/v2.0", "") + "/oauth2/token";
             Request request = new Request.Builder()
                     .url(url)
                     .post(requestBody)
@@ -1048,7 +1048,7 @@ public void refreshToken() throws ApiException
                     .addEncoded("refresh_token", this.refreshToken)
                     .build();
 
-            String url = basePath.replace("/v1.1", "") + "/oauth2/token";
+            String url = basePath.replace("/v2.0", "") + "/oauth2/token";
             Request request = new Request.Builder()
                     .url(url)
                     .post(requestBody)

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

@@ -24,8 +24,7 @@
 
 import java.util.Objects;
 import com.aspose.asposecloudpdf.model.Annotation;
-import com.aspose.asposecloudpdf.model.HttpStatusCode;
-import com.aspose.asposecloudpdf.model.SaaSposeResponse;
+import com.aspose.asposecloudpdf.model.AsposeResponse;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
@@ -39,7 +38,7 @@
  * AnnotationResponse
  */
 
-public class AnnotationResponse extends SaaSposeResponse {
+public class AnnotationResponse extends AsposeResponse {
   @SerializedName("Annotation")
   private Annotation annotation = null;
 

src/main/java/com/aspose/asposecloudpdf/model/AnnotationResponse.java

@@ -24,8 +24,7 @@
 
 import java.util.Objects;
 import com.aspose.asposecloudpdf.model.Annotations;
-import com.aspose.asposecloudpdf.model.HttpStatusCode;
-import com.aspose.asposecloudpdf.model.SaaSposeResponse;
+import com.aspose.asposecloudpdf.model.AsposeResponse;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
@@ -39,7 +38,7 @@
  * AnnotationsResponse
  */
 
-public class AnnotationsResponse extends SaaSposeResponse {
+public class AnnotationsResponse extends AsposeResponse {
   @SerializedName("Annotations")
   private Annotations annotations = null;
 

src/main/java/com/aspose/asposecloudpdf/model/AnnotationsResponse.java

@@ -56,7 +56,7 @@ public AppendDocument document(String document) {
    * Document to append (server path).
    * @return document
   **/
-  @ApiModelProperty(value = "Document to append (server path).")
+  @ApiModelProperty(required = true, value = "Document to append (server path).")
   public String getDocument() {
     return document;
   }

src/main/java/com/aspose/asposecloudpdf/model/AppendDocument.java

@@ -23,7 +23,6 @@
 package com.aspose.asposecloudpdf.model;
 
 import java.util.Objects;
-import com.aspose.asposecloudpdf.model.HttpStatusCode;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
@@ -39,14 +38,14 @@
 @ApiModel(description = "Base class for all responses.")
 
 
-public class SaaSposeResponse {
+public class AsposeResponse {
   @SerializedName("Code")
-  private HttpStatusCode code = null;
+  private Integer code = null;
 
   @SerializedName("Status")
   private String status = null;
 
-  public SaaSposeResponse code(HttpStatusCode code) {
+  public AsposeResponse code(Integer code) {
     this.code = code;
     return this;
   }
@@ -56,15 +55,15 @@ public SaaSposeResponse code(HttpStatusCode code) {
    * @return code
   **/
   @ApiModelProperty(required = true, value = "Response status code.")
-  public HttpStatusCode getCode() {
+  public Integer getCode() {
     return code;
   }
 
-  public void setCode(HttpStatusCode code) {
+  public void setCode(Integer code) {
     this.code = code;
   }
 
-  public SaaSposeResponse status(String status) {
+  public AsposeResponse status(String status) {
     this.status = status;
     return this;
   }
@@ -91,9 +90,9 @@ public boolean equals(java.lang.Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    SaaSposeResponse saaSposeResponse = (SaaSposeResponse) o;
-    return Objects.equals(this.code, saaSposeResponse.code) &&
-        Objects.equals(this.status, saaSposeResponse.status);
+    AsposeResponse asposeResponse = (AsposeResponse) o;
+    return Objects.equals(this.code, asposeResponse.code) &&
+        Objects.equals(this.status, asposeResponse.status);
   }
 
   @Override
@@ -105,7 +104,7 @@ public int hashCode() {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class SaaSposeResponse {\n");
+    sb.append("class AsposeResponse {\n");
 
     sb.append("    code: ").append(toIndentedString(code)).append("\n");
     sb.append("    status: ").append(toIndentedString(status)).append("\n");

src/main/java/com/aspose/asposecloudpdf/model/SaaSposeResponse.java renamed to src/main/java/com/aspose/asposecloudpdf/model/AsposeResponse.java

@@ -23,9 +23,8 @@
 package com.aspose.asposecloudpdf.model;
 
 import java.util.Objects;
+import com.aspose.asposecloudpdf.model.AsposeResponse;
 import com.aspose.asposecloudpdf.model.Attachment;
-import com.aspose.asposecloudpdf.model.HttpStatusCode;
-import com.aspose.asposecloudpdf.model.SaaSposeResponse;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
@@ -39,7 +38,7 @@
  * AttachmentResponse
  */
 
-public class AttachmentResponse extends SaaSposeResponse {
+public class AttachmentResponse extends AsposeResponse {
   @SerializedName("Attachment")
   private Attachment attachment = null;