Update sources

Author: Vladimir Litvinchik

README.md

@@ -37,7 +37,7 @@ Add following repository and dependency to your project's POM
 <dependency>
     <groupId>com.groupdocs</groupId>
     <artifactId>groupdocs-viewer-cloud</artifactId>
-    <version>18.5</version>
+    <version>18.7</version>
     <scope>compile</scope>
 </dependency>
 ```
@@ -50,7 +50,7 @@ At first generate the JAR by executing:
 
 Then manually install the following JARs:
 
-* target/groupdocs-viewer-cloud-18.5.jar
+* target/groupdocs-viewer-cloud-18.7.jar
 * target/lib/*.jar
 
 ## Getting Started

pom.xml

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

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

@@ -67,20 +67,17 @@
 public class ApiClient {
     private Configuration configuration = null;
 
-    private String basePath = null;
+    private String serverUrl = null;
     private boolean debugging = false;
     private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
     private String tempFolderPath = null;
 
     private Map<String, Authentication> authentications;
 
     private DateFormat dateFormat;
-    private DateFormat datetimeFormat;
-    private boolean lenientDatetimeFormat;
-    private int dateLength;
-
     private InputStream sslCaCert;
     private boolean verifyingSsl;
+    
     private KeyManager[] keyManagers;
 
     private OkHttpClient httpClient;
@@ -93,45 +90,44 @@ public class ApiClient {
      */
     public ApiClient(Configuration configuration) {
         this.configuration = configuration;
-        this.basePath = configuration.getBasePath();
-
+        this.serverUrl = configuration.getServerUrl();
         this.httpClient = new OkHttpClient();
-
-
         this.verifyingSsl = true;
-
         this.json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("Swagger-Codegen/18.5/java");
+        setUserAgent("java-sdk/18.7");
+
+        // Set connection timeout
+        setConnectTimeout(configuration.getTimeout());
 
         // Setup authentications (key: authentication name, value: authentication).
         this.authentications = new HashMap<String, Authentication>();
-        String tokenUrl = configuration.getBasePath().replace(configuration.getContextPath(), "");
+
         String appSid = configuration.getAppSid();
         String appKey = configuration.getAppKey();
-        this.authentications.put("oauth", new OAuth(tokenUrl, appSid, appKey));
+        this.authentications.put("oauth", new OAuth(configuration, appSid, appKey));
         // Prevent the authentications from being modified.
         this.authentications = Collections.unmodifiableMap(authentications);
     }
 
     /**
-     * Get base path
+     * Get server URL, default value is https://api.groupdocs.cloud/v1
      *
-     * @return Base path
+     * @return Server URL
      */
-    public String getBasePath() {
-        return basePath;
+    public String getServerUrl() {
+        return serverUrl;
     }
 
     /**
-     * Set base path
+     * Set server URL
      *
-     * @param basePath Base path of the URL (e.g https://api.groupdocs.cloud/v1
+     * @param serverUrl Server URL
      * @return An instance of OkHttpClient
      */
-    public ApiClient setBasePath(String basePath) {
-        this.basePath = basePath;
+    public ApiClient setServerUrl(String serverUrl) {
+        this.serverUrl = serverUrl;
         return this;
     }
 
@@ -968,7 +964,7 @@ public Request buildRequest(String path, String method, List<Pair> queryParams,
      */
     public String buildUrl(String path, List<Pair> queryParams, List<Pair> collectionQueryParams) {
         final StringBuilder url = new StringBuilder();
-        url.append(basePath).append(path);
+        url.append(serverUrl).append(path);
 
         if (queryParams != null && !queryParams.isEmpty()) {
             // support (constant) query string in `path`, e.g. "/posts?draft=1"

src/main/java/com/groupdocs/cloud/viewer/client/Configuration.java

@@ -34,9 +34,11 @@ public class Configuration {
 
     private String appKey = null;
 
-    private String basePath = "https://api.groupdocs.cloud/v1";
+    private String apiVersion = "/v1";
 
-    private String contextPath = "/v1";
+    private String apiBaseUrl = "https://api.groupdocs.cloud";
+
+    private int timeout = 60 * 1000;
 
     /**
      * Constructor for Configuration
@@ -49,65 +51,83 @@ public Configuration(String appSid, String appKey) {
     }
 
     /**
-     * Application identifier (App SID)
+     * Gets Application identifier (App SID)
      *
      * @return Application identifier (App SID)
      */
     public String getAppSid() {
       return appSid;
     }
 
+    /**
+     * Sets application identifier (App SID)
+     *
+     * @param appSid Application identifier (App SID)
+     */
     public void setAppSid(String appSid) {
       this.appSid = appSid;
     }
 
     /**
-     * Application private key (App Key)
+     * Gets Application private key (App Key)
      *
      * @return Application private key (App Key)
      */
     public String getAppKey() {
       return appKey;
     }
 
+    /**
+     * Sets application private key (App Key)
+     *
+     * @param appKey Application private key (App Key)
+     */
     public void setAppKey(String appKey) {
       this.appKey = appKey;
     }
 
     /**
-     * Get base path of the URL (e.g https://api.groupdocs.cloud/v1)
+     * Gets API base URL, default value is https://api.groupdocs.cloud
+     *
+     * @return API base URL
+     */
+    public String getApiBaseUrl() {
+        return apiBaseUrl;
+    }
+
+    /**
+     * Sets API base URL
      *
-     * @return Base path
+     * @param apiBaseUrl API base URL
      */
-    public String getBasePath() {
-        return basePath;
+    public void setApiBaseUrl(String apiBaseUrl) {
+        this.apiBaseUrl = apiBaseUrl;
     }
 
     /**
-     * Set base path
+     * Gets connection timeout in miliseconds
      *
-     * @param basePath Base path of the URL (e.g https://api.groupdocs.cloud/v1)
+     * @return Timeout in miliseconds 
      */
-    public void setBasePath(String basePath) {
-        this.basePath = basePath;
+    public int getTimeout() {
+        return timeout;
     }
 
     /**
-     * Get context path of the URL (e.g /v1)
+     * Sets connection timeout in miliseconds
      *
-     * @return Context path
+     * @param timeout Timeout in miliseconds 
      */
-    public String getContextPath() {
-        return contextPath;
+    public void setTimeout(int timeout) {
+        this.timeout = timeout;
     }
 
     /**
-     * Set context path
+     * Gets Server URL e.g. https://api.groupdocs.cloud/v1
      *
-     * @param contextPath Context path of the URL (e.g /v1)
+     * @return Server URL
      */
-    public void setContextPath(String contextPath) {
-        this.basePath = this.basePath.replace(this.contextPath, contextPath);
-        this.contextPath = contextPath;
+    protected String getServerUrl(){
+        return apiBaseUrl + apiVersion;
     }
 }

src/main/java/com/groupdocs/cloud/viewer/client/JSON.java

@@ -168,6 +168,9 @@ public OffsetDateTime read(JsonReader in) throws IOException {
                     return null;
                 default:
                     String date = in.nextString();
+                    if(date.equals("0001-01-01T00:00:00")) {
+                        return OffsetDateTime.MIN;
+                    }
                     if (date.endsWith("+0000")) {
                         date = date.substring(0, date.length()-5) + "Z";
                     }

src/main/java/com/groupdocs/cloud/viewer/client/auth/OAuth.java

@@ -28,12 +28,14 @@
 package com.groupdocs.cloud.viewer.client.auth;
 
 import com.groupdocs.cloud.viewer.client.ApiException;
+import com.groupdocs.cloud.viewer.client.Configuration;
 import com.groupdocs.cloud.viewer.client.JSON;
 import com.groupdocs.cloud.viewer.client.Pair;
 import com.squareup.okhttp.*;
 import com.squareup.okhttp.OkHttpClient;
 
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -66,12 +68,14 @@ public synchronized void setAccessToken(String accessToken, String refreshToken,
     this.expirationTimeMillis = System.currentTimeMillis() + expiresIn * MILLIS_PER_SECOND;
   }
 
-  public OAuth(String tokenUrl, String appSid, String appKey) {
-    this.tokenUrl = tokenUrl;
+  public OAuth(Configuration configuration, String appSid, String appKey) {
+    this.tokenUrl = configuration.getApiBaseUrl();
     this.appSid = appSid;
     this.appKey = appKey;
 
     this.httpClient = new OkHttpClient();
+    this.httpClient.setConnectTimeout(configuration.getTimeout(), TimeUnit.MILLISECONDS);
+
     this.json = new JSON();
   }
 

src/main/java/com/groupdocs/cloud/viewer/model/CadOptions.java

@@ -33,6 +33,7 @@
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.groupdocs.cloud.viewer.model.Tile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
@@ -62,6 +63,9 @@ public class CadOptions {
   @SerializedName("layers")
   private List<String> layers = null;
 
+  @SerializedName("tiles")
+  private List<Tile> tiles = null;
+
   public CadOptions scaleFactor(Double scaleFactor) {
     this.scaleFactor = scaleFactor;
     return this;
@@ -178,6 +182,32 @@ public void setLayers(List<String> layers) {
     this.layers = layers;
   }
 
+  public CadOptions tiles(List<Tile> tiles) {
+    this.tiles = tiles;
+    return this;
+  }
+
+  public CadOptions addTilesItem(Tile tilesItem) {
+    if (this.tiles == null) {
+      this.tiles = new ArrayList<Tile>();
+    }
+    this.tiles.add(tilesItem);
+    return this;
+  }
+
+   /**
+   * The coordinates of the drawing regions, that should be rendered. Please note, that this option works only for DWG format. When the list is empty, then whole drawing is rendered. When the list contains at least one tile, then ScaleFactor, Width, Height, RenderLayouts and LayoutName properties are ignored. 
+   * @return tiles
+  **/
+  @ApiModelProperty(value = "The coordinates of the drawing regions, that should be rendered. Please note, that this option works only for DWG format. When the list is empty, then whole drawing is rendered. When the list contains at least one tile, then ScaleFactor, Width, Height, RenderLayouts and LayoutName properties are ignored. ")
+  public List<Tile> getTiles() {
+    return tiles;
+  }
+
+  public void setTiles(List<Tile> tiles) {
+    this.tiles = tiles;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -193,12 +223,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.height, cadOptions.height) &&
         Objects.equals(this.renderLayouts, cadOptions.renderLayouts) &&
         Objects.equals(this.layoutName, cadOptions.layoutName) &&
-        Objects.equals(this.layers, cadOptions.layers);
+        Objects.equals(this.layers, cadOptions.layers) &&
+        Objects.equals(this.tiles, cadOptions.tiles);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(scaleFactor, width, height, renderLayouts, layoutName, layers);
+    return Objects.hash(scaleFactor, width, height, renderLayouts, layoutName, layers, tiles);
   }
 
 
@@ -213,6 +244,7 @@ public String toString() {
     sb.append("    renderLayouts: ").append(toIndentedString(renderLayouts)).append("\n");
     sb.append("    layoutName: ").append(toIndentedString(layoutName)).append("\n");
     sb.append("    layers: ").append(toIndentedString(layers)).append("\n");
+    sb.append("    tiles: ").append(toIndentedString(tiles)).append("\n");
     sb.append("}");
     return sb.toString();
   }