0.61.0

- More attempts to fix unit tests that are failing on the build server
- Event based IO
- Requester now supports list and invoke requests when disconnected
- Now uses timer for DSConnection lifecycle rather than a thread

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.60.0'
+    version '0.61.0'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

dslink-v2-poc/src/main/java/org/iot/dsa/dslink/poc/MainNode.java

@@ -3,7 +3,6 @@
 import java.util.Collection;
 import org.iot.dsa.DSRuntime;
 import org.iot.dsa.dslink.DSMainNode;
-import org.iot.dsa.dslink.requester.SimpleListHandler;
 import org.iot.dsa.node.DSBool;
 import org.iot.dsa.node.DSDouble;
 import org.iot.dsa.node.DSElement;

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

@@ -19,7 +19,6 @@ public abstract class DSBrokerConnection extends DSLinkConnection {
     // Class Fields
     ///////////////////////////////////////////////////////////////////////////
 
-
     protected static final String BROKER_ID = "Broker ID";
     protected static final String BROKER_FORMAT = "Broker Format";
     protected static final String BROKER_PATH = "Path In Broker";
@@ -52,6 +51,11 @@ public String getPathInBroker() {
         return brokerPath.getElement().toString();
     }
 
+    @Override
+    public DSSession getSession() {
+        return (DSSession) super.getSession();
+    }
+
     /**
      * For the sessions to update
      */
@@ -94,6 +98,11 @@ protected void doConnect() {
         }
     }
 
+    @Override
+    protected void doPing() {
+        getSession().sendMessage();
+    }
+
     protected String getBrokerFormat() {
         return brokerFormat.get().toString();
     }
@@ -120,17 +129,6 @@ protected String getBrokerVersion() {
 
     protected abstract void initializeConnection();
 
-    /**
-     * Creates and starts a thread for running the connection lifecycle.
-     */
-    @Override
-    protected void onStable() {
-        super.onStable();
-        Thread t = new Thread(this, "Connection " + getName() + " Runner");
-        t.setDaemon(true);
-        t.start();
-    }
-
     protected void setBrokerFormat(String arg) {
         put(brokerFormat, DSString.valueOf(arg));
     }

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

@@ -12,7 +12,7 @@
 import org.iot.dsa.util.DSUtil;
 
 /**
- * Links that also the root of the node tree.  These links have sys and upstream children.
+ * Links that are also the roots of a node tree.  These links have sys and upstream children.
  *
  * @author Aaron Hansen
  */
@@ -38,6 +38,11 @@ public class DSRootLink extends DSLink {
     // Public Methods
     ///////////////////////////////////////////////////////////////////////////
 
+    @Override
+    public DSLinkConnection getConnection() {
+        return (DSLinkConnection) upstream.get();
+    }
+
     @Override
     public DSMainNode getMain() {
         return (DSMainNode) main.getNode();
@@ -47,11 +52,6 @@ public DSSysNode getSys() {
         return (DSSysNode) sys.get();
     }
 
-    @Override
-    public DSLinkConnection getConnection() {
-        return (DSLinkConnection) upstream.get();
-    }
-
     ///////////////////////////////////////////////////////////////////////////
     // Protected Methods
     ///////////////////////////////////////////////////////////////////////////