0.57.0

- Requester now merges multiple list requests into one.
- Requester list API changed.
- ApiObject interface changed.
- Fix chunked list responses.
- Fix concurrency bug in SimpleTable.
- DSLink.getUpstream() changed to DSLink.getConnection()
- Fix list invalid cast.
- New unit tests.

Author: a-hansen

build.gradle

@@ -1,11 +1,11 @@
 subprojects {
 
     apply plugin: 'jacoco'
-    apply plugin: 'java'
+    apply plugin: 'java-library'
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.56.0'
+    version '0.57.0'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

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

@@ -3,9 +3,6 @@
 import java.util.Collection;
 import org.iot.dsa.DSRuntime;
 import org.iot.dsa.dslink.DSMainNode;
-import org.iot.dsa.dslink.requester.ErrorType;
-import org.iot.dsa.dslink.requester.OutboundListHandler;
-import org.iot.dsa.dslink.requester.OutboundStream;
 import org.iot.dsa.node.DSBool;
 import org.iot.dsa.node.DSDouble;
 import org.iot.dsa.node.DSElement;
@@ -56,7 +53,7 @@ public class MainNode extends DSMainNode implements Runnable {
     public DSInfo getVirtualAction(DSInfo target, String name) {
         if (target == incrementingInt) {
             if (name.equals("Reset")) {
-                return actionInfo(name, new DSAction.Parameterless() {
+                return virtualInfo(name, new DSAction.Parameterless() {
                     @Override
                     public ActionResult invoke(DSInfo target, ActionInvocation invocation) {
                         put(incrementingInt, DSElement.make(0));
@@ -66,7 +63,7 @@ public ActionResult invoke(DSInfo target, ActionInvocation invocation) {
             }
         } else if (target.get() == this) {
             if (name.equals("Foobar")) {
-                return actionInfo(name, new Parameterless() {
+                return virtualInfo(name, new Parameterless() {
                     @Override
                     public ActionResult invoke(DSInfo target, ActionInvocation invocation) {
                         System.out.println("Hi Mom");

dslink-v2-websocket/build.gradle

@@ -3,6 +3,6 @@ artifacts {
 }
 
 dependencies {
-    implementation project(':dslink-v2')
+    api project(':dslink-v2')
     implementation 'org.glassfish.tyrus.bundles:tyrus-standalone-client:[1.13.1,)'
 }

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

@@ -48,7 +48,7 @@ public DSSysNode getSys() {
     }
 
     @Override
-    public DSLinkConnection getUpstream() {
+    public DSLinkConnection getConnection() {
         return (DSLinkConnection) upstream.get();
     }
 

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

@@ -15,12 +15,11 @@
  */
 public class DSTarget {
 
-    private String[] names;
-
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
+    private String[] names;
     private DSNode node;
     private DSInfo parentInfo;
     private String path;

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

@@ -3,6 +3,8 @@
 import org.iot.dsa.io.DSIReader;
 
 /**
+ * V2 needs more than just a DSIReader, so this provides the necessary abstraction.
+ *
  * @author Aaron Hansen
  */
 public interface MessageReader {

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

@@ -3,6 +3,8 @@
 import org.iot.dsa.io.DSIWriter;
 
 /**
+ * V2 needs more than just a DSIWriter, so this provides the necessary abstraction.
+ *
  * @author Aaron Hansen
  */
 public interface MessageWriter {

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

@@ -8,7 +8,8 @@
 public interface OutboundMessage {
 
     /**
-     * True if the message is ready to be written.
+     * True if the message is ready to be written. A can be queued to write something, but may
+     * not be able to such as waiting for an ack.
      */
     public boolean canWrite(DSSession session);