0.35.0

Check for cloud broker salt so connection init isn't resused.

Author: a-hansen

.gitignore

@@ -1,33 +1,30 @@
 # Tooling
 **.classpath
 **.idea
+**.iml
 **.metadata
 **.project
 **.settings
-**eclipseBin
+**/eclipseBin
 
 # Build artifacts
+.gradle
 **.class
-**.iml
-**build
-**classes
-**libJar
-**out
-**target
-**/.gradle
-**javadoc
-**repository
+**/build
+**/classes
+**/libJar
+**/out
+**/target
 
 # Misc
 **.bak
-**.old
 **.log
+**.old
 **.DS_Store
 
 # Runtime files
 **.jks
 **.key
-**db
 **nodes.json
 **nodes*.zip
 **test.json

build.gradle

@@ -4,7 +4,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.34.0'
+    version '0.35.0'
 
     sourceCompatibility = 1.6
     targetCompatibility = 1.6
@@ -25,6 +25,6 @@ subprojects {
     }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.9'
+wrapper {
+    gradleVersion = '4.10'
 }

dslink-core/.gitignore

@@ -68,7 +68,11 @@ public DSIWriter getWriter() {
     }
 
     public void updateSalt(String salt) {
-        connectionInit.updateSalt(salt);
+        if ((salt == null) || salt.equals("1234"))  {
+            connectionInit = null;
+        } else {
+            connectionInit.updateSalt(salt);
+        }
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -152,6 +156,7 @@ protected void onConnect() {
             connOk();
         } catch (Exception x) {
             connDown(DSException.makeMessage(x));
+            connectionInit = null;
         }
     }
 

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1LinkConnection.java

@@ -7,9 +7,9 @@
 import org.iot.dsa.util.DSUtil;
 
 /**
- * All node children have corresponding DSInfo instances. This type serves two purposes:
+ * All node children have corresponding DSInfo instances. DSInfo serves two purposes:
  * <ul>
- * <li>It carries some meta-data about the relationship between the parent node and the
+ * <li>It carries meta-data about the relationship between the parent node and the
  * child.
  * <li>It tracks whether or not the child matches a declared default.
  * </ul>

dslink-v2/src/main/java/org/iot/dsa/node/DSInfo.java

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists