Updated sources

Author: product-team

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2003-2019 Aspose Pty Ltd
+Copyright (c) 2003-2021 Aspose Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -38,7 +38,7 @@ Add following repository and dependency to your project's POM
 <dependency>
     <groupId>com.groupdocs</groupId>
     <artifactId>groupdocs-annotation-cloud</artifactId>
-    <version>21.2</version>
+    <version>21.6</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ mvn package
 
 Then manually install the following JARs:
 
-* target/groupdocs-annotation-cloud-21.2.jar
+* target/groupdocs-annotation-cloud-21.6.jar
 * target/lib/*.jar
 
 ## Getting Started

pom.xml

@@ -5,7 +5,7 @@
     <artifactId>groupdocs-annotation-cloud</artifactId>
     <packaging>jar</packaging>
     <name>groupdocs-annotation-cloud</name>
-    <version>21.2</version>
+    <version>21.6</version>
     <url>https://github.com/groupdocs-annotation-cloud/groupdocs-annotation-cloud-java</url>
     <description>Java library for communicating with the GroupDocs.Annotation Cloud API</description>
     <scm>

src/main/java/com/groupdocs/cloud/annotation/client/ApiClient.java

@@ -97,7 +97,7 @@ public ApiClient(Configuration configuration) {
         this.json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("java-sdk/21.2");
+        setUserAgent("java-sdk/21.6");
 
         // Set connection timeout
         setConnectTimeout(configuration.getTimeout());
@@ -868,13 +868,23 @@ public <T> T handleResponse(Response response, Type returnType) throws ApiExcept
                   throw new ApiException(response.message(), response.code());
                 }
 
-                ApiError apiError = null;
+                com.groupdocs.cloud.annotation.model.Error Error = null;
                 try {
-                  apiError = json.deserialize(respBody, ApiError.class);
+                  Error = json.deserialize(respBody, com.groupdocs.cloud.annotation.model.Error.class);
                 } catch (Exception e) {
                   //NOTE: ignore
                 }
-                if(apiError != null && apiError.getError() != null) {
+               if(Error != null && Error.getCode() != null) {
+                  throw new ApiException(Error.getMessage(), response.code());
+                }   
+
+                com.groupdocs.cloud.annotation.model.ApiError apiError = null;
+                try {
+                  apiError = json.deserialize(respBody, com.groupdocs.cloud.annotation.model.ApiError.class);
+                } catch (Exception e) {
+                  //NOTE: ignore
+                }
+               if(apiError != null && apiError.getError().getCode() != null) {
                   throw new ApiException(apiError.getError().getMessage(), response.code());
                 }   
 

src/main/java/com/groupdocs/cloud/annotation/model/AnnotateOptions.java

@@ -64,6 +64,9 @@ public class AnnotateOptions {
   @SerializedName("outputPath")
   private String outputPath = null;
 
+  @SerializedName("fontsPath")
+  private String fontsPath = null;
+
   public AnnotateOptions fileInfo(FileInfo fileInfo) {
     this.fileInfo = fileInfo;
     return this;
@@ -180,6 +183,24 @@ public void setOutputPath(String outputPath) {
     this.outputPath = outputPath;
   }
 
+  public AnnotateOptions fontsPath(String fontsPath) {
+    this.fontsPath = fontsPath;
+    return this;
+  }
+
+   /**
+   * The path to directory containing custom fonts in storage
+   * @return fontsPath
+  **/
+  @ApiModelProperty(value = "The path to directory containing custom fonts in storage")
+  public String getFontsPath() {
+    return fontsPath;
+  }
+
+  public void setFontsPath(String fontsPath) {
+    this.fontsPath = fontsPath;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -195,12 +216,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.firstPage, annotateOptions.firstPage) &&
         Objects.equals(this.lastPage, annotateOptions.lastPage) &&
         Objects.equals(this.onlyAnnotatedPages, annotateOptions.onlyAnnotatedPages) &&
-        Objects.equals(this.outputPath, annotateOptions.outputPath);
+        Objects.equals(this.outputPath, annotateOptions.outputPath) &&
+        Objects.equals(this.fontsPath, annotateOptions.fontsPath);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(fileInfo, annotations, firstPage, lastPage, onlyAnnotatedPages, outputPath);
+    return Objects.hash(fileInfo, annotations, firstPage, lastPage, onlyAnnotatedPages, outputPath, fontsPath);
   }
 
 
@@ -215,6 +237,7 @@ public String toString() {
     sb.append("    lastPage: ").append(toIndentedString(lastPage)).append("\n");
     sb.append("    onlyAnnotatedPages: ").append(toIndentedString(onlyAnnotatedPages)).append("\n");
     sb.append("    outputPath: ").append(toIndentedString(outputPath)).append("\n");
+    sb.append("    fontsPath: ").append(toIndentedString(fontsPath)).append("\n");
     sb.append("}");
     return sb.toString();
   }

src/main/java/com/groupdocs/cloud/annotation/model/AnnotationInfo.java

@@ -357,6 +357,9 @@ public PenStyleEnum read(final JsonReader jsonReader) throws IOException {
   @SerializedName("angle")
   private Double angle = null;
 
+  @SerializedName("zindex")
+  private Integer zindex = null;
+
   @SerializedName("url")
   private String url = null;
 
@@ -829,6 +832,24 @@ public void setAngle(Double angle) {
     this.angle = angle;
   }
 
+  public AnnotationInfo zindex(Integer zindex) {
+    this.zindex = zindex;
+    return this;
+  }
+
+   /**
+   * Gets or sets z-index. Default value is 0 The z-index property specifies the stack order of an element.
+   * @return zindex
+  **/
+  @ApiModelProperty(required = true, value = "Gets or sets z-index. Default value is 0 The z-index property specifies the stack order of an element.")
+  public Integer getZindex() {
+    return zindex;
+  }
+
+  public void setZindex(Integer zindex) {
+    this.zindex = zindex;
+  }
+
   public AnnotationInfo url(String url) {
     this.url = url;
     return this;
@@ -900,13 +921,14 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.fontSize, annotationInfo.fontSize) &&
         Objects.equals(this.opacity, annotationInfo.opacity) &&
         Objects.equals(this.angle, annotationInfo.angle) &&
+        Objects.equals(this.zindex, annotationInfo.zindex) &&
         Objects.equals(this.url, annotationInfo.url) &&
         Objects.equals(this.imagePath, annotationInfo.imagePath);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, text, textToReplace, horizontalAlignment, verticalAlignment, creatorId, creatorName, creatorEmail, box, points, pageNumber, annotationPosition, svgPath, type, replies, createdOn, fontColor, penColor, penWidth, penStyle, backgroundColor, fontFamily, fontSize, opacity, angle, url, imagePath);
+    return Objects.hash(id, text, textToReplace, horizontalAlignment, verticalAlignment, creatorId, creatorName, creatorEmail, box, points, pageNumber, annotationPosition, svgPath, type, replies, createdOn, fontColor, penColor, penWidth, penStyle, backgroundColor, fontFamily, fontSize, opacity, angle, zindex, url, imagePath);
   }
 
 
@@ -940,6 +962,7 @@ public String toString() {
     sb.append("    fontSize: ").append(toIndentedString(fontSize)).append("\n");
     sb.append("    opacity: ").append(toIndentedString(opacity)).append("\n");
     sb.append("    angle: ").append(toIndentedString(angle)).append("\n");
+    sb.append("    zindex: ").append(toIndentedString(zindex)).append("\n");
     sb.append("    url: ").append(toIndentedString(url)).append("\n");
     sb.append("    imagePath: ").append(toIndentedString(imagePath)).append("\n");
     sb.append("}");

src/main/java/com/groupdocs/cloud/annotation/model/ApiError.java

@@ -39,7 +39,7 @@
  */
 @ApiModel(description = "Describes API error.")
 public class ApiError {
-  @SerializedName("Error")
+  @SerializedName("error")
   private Error error = null;
 
   public ApiError error(Error error) {

src/main/java/com/groupdocs/cloud/annotation/model/Error.java

@@ -39,7 +39,7 @@
  */
 @ApiModel(description = "Describes API error.")
 public class Error {
-  @SerializedName("Code")
+  @SerializedName("code")
   private String code = null;
 
   public Error code(String code) {
@@ -60,7 +60,7 @@ public void setCode(String code) {
     this.code = code;
   }
 
-  @SerializedName("Message")
+  @SerializedName("message")
   private String message = null;
 
   public Error message(String message) {

src/main/java/com/groupdocs/cloud/annotation/model/PreviewOptions.java

@@ -109,9 +109,18 @@ public FormatEnum read(final JsonReader jsonReader) throws IOException {
   @SerializedName("height")
   private Integer height = null;
 
+  @SerializedName("resolution")
+  private Integer resolution = null;
+
   @SerializedName("renderComments")
   private Boolean renderComments = null;
 
+  @SerializedName("renderAnnotations")
+  private Boolean renderAnnotations = null;
+
+  @SerializedName("fontsPath")
+  private String fontsPath = null;
+
   public PreviewOptions fileInfo(FileInfo fileInfo) {
     this.fileInfo = fileInfo;
     return this;
@@ -210,6 +219,24 @@ public void setHeight(Integer height) {
     this.height = height;
   }
 
+  public PreviewOptions resolution(Integer resolution) {
+    this.resolution = resolution;
+    return this;
+  }
+
+   /**
+   * Gets or sets the resolution for generated images, in dots per inch. The default value is 96.
+   * @return resolution
+  **/
+  @ApiModelProperty(required = true, value = "Gets or sets the resolution for generated images, in dots per inch. The default value is 96.")
+  public Integer getResolution() {
+    return resolution;
+  }
+
+  public void setResolution(Integer resolution) {
+    this.resolution = resolution;
+  }
+
   public PreviewOptions renderComments(Boolean renderComments) {
     this.renderComments = renderComments;
     return this;
@@ -228,6 +255,42 @@ public void setRenderComments(Boolean renderComments) {
     this.renderComments = renderComments;
   }
 
+  public PreviewOptions renderAnnotations(Boolean renderAnnotations) {
+    this.renderAnnotations = renderAnnotations;
+    return this;
+  }
+
+   /**
+   * The property that controls whether annotations will be generated on the preview. Default State - true.
+   * @return renderAnnotations
+  **/
+  @ApiModelProperty(required = true, value = "The property that controls whether annotations will be generated on the preview. Default State - true.")
+  public Boolean getRenderAnnotations() {
+    return renderAnnotations;
+  }
+
+  public void setRenderAnnotations(Boolean renderAnnotations) {
+    this.renderAnnotations = renderAnnotations;
+  }
+
+  public PreviewOptions fontsPath(String fontsPath) {
+    this.fontsPath = fontsPath;
+    return this;
+  }
+
+   /**
+   * The path to directory containing custom fonts in storage
+   * @return fontsPath
+  **/
+  @ApiModelProperty(value = "The path to directory containing custom fonts in storage")
+  public String getFontsPath() {
+    return fontsPath;
+  }
+
+  public void setFontsPath(String fontsPath) {
+    this.fontsPath = fontsPath;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -243,12 +306,15 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.pageNumbers, previewOptions.pageNumbers) &&
         Objects.equals(this.width, previewOptions.width) &&
         Objects.equals(this.height, previewOptions.height) &&
-        Objects.equals(this.renderComments, previewOptions.renderComments);
+        Objects.equals(this.resolution, previewOptions.resolution) &&
+        Objects.equals(this.renderComments, previewOptions.renderComments) &&
+        Objects.equals(this.renderAnnotations, previewOptions.renderAnnotations) &&
+        Objects.equals(this.fontsPath, previewOptions.fontsPath);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(fileInfo, format, pageNumbers, width, height, renderComments);
+    return Objects.hash(fileInfo, format, pageNumbers, width, height, resolution, renderComments, renderAnnotations, fontsPath);
   }
 
 
@@ -262,7 +328,10 @@ public String toString() {
     sb.append("    pageNumbers: ").append(toIndentedString(pageNumbers)).append("\n");
     sb.append("    width: ").append(toIndentedString(width)).append("\n");
     sb.append("    height: ").append(toIndentedString(height)).append("\n");
+    sb.append("    resolution: ").append(toIndentedString(resolution)).append("\n");
     sb.append("    renderComments: ").append(toIndentedString(renderComments)).append("\n");
+    sb.append("    renderAnnotations: ").append(toIndentedString(renderAnnotations)).append("\n");
+    sb.append("    fontsPath: ").append(toIndentedString(fontsPath)).append("\n");
     sb.append("}");
     return sb.toString();
   }

src/test/java/com/groupdocs/cloud/annotation/api/AnnotationInfoApiTests.java

@@ -32,15 +32,31 @@
 import com.groupdocs.cloud.annotation.model.requests.GetInfoRequest;
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(JUnitParamsRunner.class)
 public class AnnotationInfoApiTests extends BaseApiTest
 {
+    @Test
+    public void TestGetInfoReturnsFileNotFound()
+    {
+        // Arrange        
+        FileInfo fileInfo = new FileInfo();
+        fileInfo.setFilePath("some-folder\\notExists.docx");        
 
+        GetInfoRequest request = new GetInfoRequest(fileInfo);
+
+        // Act & Assert  
+        try {
+            infoApi.getInfo(request);
+            fail("Expected ApiException was not thrown.");
+        } catch (ApiException ex) {
+            assertEquals("Specified file not found", ex.getMessage());
+        }  
+    }
+    
     @Test
     @Parameters(
             {