0.66.1

a-hansen · web-flow · commit 55c48ab84993 · 2019-08-16T17:54:23.000-07:00
- Fix enum range encoding / decoding
- Fix connection reconnect timing
- Suppress redundant reconnect failure logging
- Update gradle wrapper
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.66.0'
+    version '0.66.1'
     
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -27,12 +27,12 @@ subprojects {
     }
 
     task sourcesJar(group: 'build', type: Jar, dependsOn: classes) {
-        classifier = 'sources'
+        archiveClassifier = 'sources'
         from sourceSets.main.allJava
     }
 
     task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
+        archiveClassifier = 'javadoc'
         from javadoc.destinationDir
     }
 
@@ -60,5 +60,5 @@ allprojects {
 }
 
 wrapper {
-    gradleVersion = '5.5.1'
+    gradleVersion = '5.6'
 }
diff --git a/dslink-v2-api/src/main/java/org/iot/dsa/conn/DSBaseConnection.java b/dslink-v2-api/src/main/java/org/iot/dsa/conn/DSBaseConnection.java
@@ -94,8 +94,10 @@ protected boolean canConnect() {
             configOk();
             return true;
         } catch (Throwable x) {
-            debug(debug() ? getPath() : null, x);
-            configFault(DSException.makeMessage(x));
+            if (!fault) {
+                debug(x);
+                configFault(DSException.makeMessage(x));
+            }
         }
         return false;
     }
diff --git a/dslink-v2-api/src/main/java/org/iot/dsa/conn/DSConnection.java b/dslink-v2-api/src/main/java/org/iot/dsa/conn/DSConnection.java
@@ -63,6 +63,7 @@ public abstract class DSConnection extends DSBaseConnection {
     // Instance Fields
     ///////////////////////////////////////////////////////////////////////////
 
+    private long lastConnectAttempt = 0;
     private long lastPing;
     private long retryConnectMs = 0;
     protected DSInfo state = getInfo(STATE);
@@ -375,12 +376,13 @@ protected void updateState() {
                         debug(debug() ? getPath() : null, x);
                     }
                 }
-            } else {
-                if (isEnabled() && getConnectionState().isDisconnected()) {
-                    if (getTimeInState() >= retryConnectMs) {
-                        retryConnectMs = Math.min(60000, retryConnectMs + getUpdateInterval());
-                        connect();
-                    }
+            } else if (isEnabled() && getConnectionState().isDisconnected()) {
+                long now = System.currentTimeMillis();
+                long millis = now - lastConnectAttempt;
+                if (millis >= retryConnectMs) {
+                    lastConnectAttempt = now;
+                    retryConnectMs = Math.min(60000, retryConnectMs + getUpdateInterval());
+                    connect();
                 }
             }
         } finally {
diff --git a/dslink-v2-api/src/main/java/org/iot/dsa/logging/DSLogger.java b/dslink-v2-api/src/main/java/org/iot/dsa/logging/DSLogger.java
@@ -83,6 +83,9 @@ public boolean debug() {
      * Log a finer message.
      */
     public void debug(Object msg) {
+        if (msg instanceof Throwable) {
+            debug(null, (Throwable) msg);
+        }
         if (msg != null) {
             getLogger().log(debug, string(msg));
         }
@@ -124,6 +127,9 @@ public boolean error() {
      * Log a severe message.
      */
     public void error(Object msg) {
+        if (msg instanceof Throwable) {
+            error(null, (Throwable) msg);
+        }
         if (msg != null) {
             getLogger().log(error, string(msg));
         }
@@ -172,6 +178,9 @@ public boolean info() {
      * Log an infrequent major lifecycle event.
      */
     public void info(Object msg) {
+        if (msg instanceof Throwable) {
+            info(null, (Throwable) msg);
+        }
         if (msg != null) {
             getLogger().log(info, string(msg));
         }
@@ -213,6 +222,9 @@ public boolean trace() {
      * Log a trace or verbose event.
      */
     public void trace(Object msg) {
+        if (msg instanceof Throwable) {
+            trace(null, (Throwable) msg);
+        }
         if (msg != null) {
             getLogger().log(trace, string(msg));
         }
@@ -261,6 +273,9 @@ public boolean warn() {
      * Log a trace or verbose event.
      */
     public void warn(Object msg) {
+        if (msg instanceof Throwable) {
+            warn(null, (Throwable) msg);
+        }
         if (msg != null) {
             getLogger().log(warn, string(msg));
         }
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java
@@ -648,7 +648,7 @@ private void fixRangeTypes(DSMap arg) {
             String type = arg.getString(DSMetadata.TYPE);
             if ("bool".equals(type)) {
                 DSList range = (DSList) arg.remove(DSMetadata.BOOLEAN_RANGE);
-                if ((range != null) || (range.size() == 2)) {
+                if ((range != null) && (range.size() == 2)) {
                     String utf8 = DSString.UTF8.toString();
                     cacheBuf.setLength(0);
                     cacheBuf.append(type);
diff --git a/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1LinkConnection.java b/dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1LinkConnection.java
@@ -112,7 +112,10 @@ protected DSTransport makeTransport() {
     @Override
     protected void onStarted() {
         super.onStarted();
-        setBrokerUri(makeHandshakeUri());
+        String uri = makeHandshakeUri();
+        if (uri != null) {
+            setBrokerUri(uri);
+        }
         debug(debug() ? "Broker URI " + getBrokerUri() : null);
     }
 
@@ -175,7 +178,10 @@ private String makeHandshakeUri() {
         StringBuilder builder = new StringBuilder();
         DSLink link = getLink();
         String uri = link.getOptions().getBrokerUri();
-        if ((uri == null) || uri.isEmpty() || !uri.contains("://")) {
+        if ((uri == null) || uri.isEmpty()) {
+            return null;
+        }
+        if (!uri.contains("://")) {
             throw new IllegalArgumentException("Invalid broker uri: " + uri);
         }
         builder.append(uri);
diff --git a/dslink-v2/src/test/java/org/iot/dsa/dslink/RequesterSubscriptionsReconnectTest.java b/dslink-v2/src/test/java/org/iot/dsa/dslink/RequesterSubscriptionsReconnectTest.java
@@ -38,7 +38,7 @@ private void doit(DSLink link) throws Exception {
         Assert.assertTrue(link.getConnection().isConnected());
         DSIRequester requester = link.getConnection().getRequester();
         requester.subscribe("/main/abc", DSLong.valueOf(0), new MyHandler());
-        long end = System.currentTimeMillis() + 10000;
+        long end = System.currentTimeMillis() + 15000;
         synchronized (mutex) {
             while (((testStatus == null) || (!testStatus.isOk()))
                     && (System.currentTimeMillis() < end)) {
@@ -49,12 +49,12 @@ private void doit(DSLink link) throws Exception {
         testStatus = null;
         link.getConnection().setEnabled(false);
         link.getConnection().disconnect();
-        end = System.currentTimeMillis() + 10000;
+        end = System.currentTimeMillis() + 15000;
         while (link.getConnection().isConnected() && (System.currentTimeMillis() < end)) {
             mutex.wait(100);
         }
         Assert.assertFalse(link.getConnection().isConnected());
-        end = System.currentTimeMillis() + 10000;
+        end = System.currentTimeMillis() + 15000;
         synchronized (mutex) {
             while (((testStatus == null) || (!testStatus.isDown()))
                     && (System.currentTimeMillis() < end)) {
@@ -65,9 +65,9 @@ private void doit(DSLink link) throws Exception {
         testStatus = null;
         link.getConnection().setEnabled(true);
         link.getConnection().connect();
-        link.getConnection().waitForConnection(10000);
+        link.getConnection().waitForConnection(15000);
         Assert.assertTrue(link.getConnection().isConnected());
-        end = System.currentTimeMillis() + 10000;
+        end = System.currentTimeMillis() + 15000;
         synchronized (mutex) {
             while (((testStatus == null) || (!testStatus.isOk()))
                     && (System.currentTimeMillis() < end)) {
diff --git a/dslink-v2/src/test/java/org/iot/dsa/dslink/StreamTableTest.java b/dslink-v2/src/test/java/org/iot/dsa/dslink/StreamTableTest.java
@@ -27,8 +27,6 @@ public class StreamTableTest {
     // Fields
     // ------
 
-    private static boolean success = false;
-
     // Methods
     // -------
 
@@ -39,7 +37,6 @@ public void test() throws Exception {
     }
 
     private void doit(DSLink link) throws Exception {
-        success = false;
         Thread t = new Thread(link, "DSLink Runner");
         t.start();
         link.getConnection().waitForConnection(5000);
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ subprojects {`
`5`	`5`	`apply plugin: 'maven'`
`6`	`6`
`7`	`7`	`group 'org.iot-dsa'`
`8`		`- version '0.66.0'`
	`8`	`+ version '0.66.1'`
`9`	`9`
`10`	`10`	`targetCompatibility = JavaVersion.VERSION_1_8`
`11`	`11`	`sourceCompatibility = JavaVersion.VERSION_1_8`
`@@ -27,12 +27,12 @@ subprojects {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`task sourcesJar(group: 'build', type: Jar, dependsOn: classes) {`
`30`		`- classifier = 'sources'`
	`30`	`+ archiveClassifier = 'sources'`
`31`	`31`	`from sourceSets.main.allJava`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`task javadocJar(type: Jar, dependsOn: javadoc) {`
`35`		`- classifier = 'javadoc'`
	`35`	`+ archiveClassifier = 'javadoc'`
`36`	`36`	`from javadoc.destinationDir`
`37`	`37`	`}`
`38`	`38`
`@@ -60,5 +60,5 @@ allprojects {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`wrapper {`
`63`		`- gradleVersion = '5.5.1'`
	`63`	`+ gradleVersion = '5.6'`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,10 @@ protected boolean canConnect() {`
`94`	`94`	`configOk();`
`95`	`95`	`return true;`
`96`	`96`	`} catch (Throwable x) {`
`97`		`- debug(debug() ? getPath() : null, x);`
`98`		`- configFault(DSException.makeMessage(x));`
	`97`	`+ if (!fault) {`
	`98`	`+ debug(x);`
	`99`	`+ configFault(DSException.makeMessage(x));`
	`100`	`+ }`
`99`	`101`	`}`
`100`	`102`	`return false;`
`101`	`103`	`}`