1.2.0

make read/write timeouts configurable in WebClientProxy

Author: d-shapiro

build.gradle

@@ -24,7 +24,7 @@ repositories {
 
 dependencies {
     //implementation 'org.iot-dsa:dslink-v2-websocket:+' //for a locally installed sdk
-    api 'com.github.iot-dsa-v2.sdk-dslink-java-v2:dslink-v2-websocket:0.63.0'
+    api 'com.github.iot-dsa-v2.sdk-dslink-java-v2:dslink-v2-websocket:+'
     api 'com.squareup.okhttp3:okhttp:3.14.0'
     implementation 'commons-logging:commons-logging:+'
     implementation 'org.apache.commons:commons-lang3:3.8.1'

dslink.json

@@ -1,6 +1,6 @@
 {
   "name": "dslink-java-v2-restadapter",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "description": "Java DSA to REST adapter DSLink",
   "main": "bin/dslink-java-v2-restadapter",
   "configs": {

src/main/java/org/iot/dsa/dslink/restadapter/WebClientProxy.java

@@ -2,6 +2,7 @@
 
 
 import java.io.IOException;
+import java.time.Duration;
 import org.iot.dsa.logging.DSLogger;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSMap.Entry;
@@ -17,12 +18,20 @@
 
 public class WebClientProxy extends DSLogger {
     private CredentialProvider credentials;
+    private Duration readTimeout = null;
+    private Duration writeTimeout = null;
 
     private OkHttpClient client;
 
     public WebClientProxy(CredentialProvider credentials) {
         this.credentials = credentials;
     }
+    
+    public WebClientProxy(CredentialProvider credentials, long readTimeoutMillis, long writeTimeoutMillis) {
+        this(credentials);
+        this.readTimeout = Duration.ofMillis(readTimeoutMillis);
+        this.writeTimeout = Duration.ofMillis(writeTimeoutMillis);
+    }
 
 //    public static WebClientProxy buildNoAuthClient() {
 //        return new WebClientProxy(null, null, null, null, null, Util.AUTH_SCHEME.NO_AUTH);
@@ -106,6 +115,12 @@ public Request authenticate(Route route, Response response) throws IOException {
 //                client.header(HttpHeaders.AUTHORIZATION, authManager.createAuthorizationHeader());
                 break;
         }
+        if (readTimeout != null) {
+            clientBuilder.readTimeout(readTimeout);
+        }
+        if (writeTimeout != null) {
+            clientBuilder.writeTimeout(writeTimeout);
+        }
         return clientBuilder.build();
     }