0.25.0

SysCertManager
DSAction changes
Pathing fixes

Author: a-hansen

.gitignore

@@ -22,6 +22,7 @@
 **/.DS_Store
 
 # Runtime files
+**/dslink.jks
 **/.key
 **/db
 **/nodes.json

README.md

@@ -16,7 +16,7 @@ the DSA architecture, please visit
 ## Sub Projects
 
   - **/dslink-core** - The APIs used to build new links.
-  - **/dslink-java-v2-test** - For proof of concept and testing.
+  - **/dslink-java-v2-poc** - For proof of concept and testing.
   - **/dslink-websocket-standalone** - Used by links that run in their own process, rather
     than in an environment which provides another websocket implementation.
 

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 group 'org.iot.dsa'
-version '0.24.0'
+version '0.25.0'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSByteBuffer.java

@@ -425,6 +425,7 @@ public DSByteBuffer putU32(long v, boolean bigEndian) {
                    (byte) (v >>> 16),
                    (byte) (v >>> 24));
     }
+
     /**
      * Returns the next byte in the buffer, or -1 when nothing is available.
      */

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/RequestPath.java

@@ -52,6 +52,9 @@ public DSInfo getInfo() {
         if (target == null) {
             getTarget();
         }
+        if ((info == null) && (root == target)) {
+            info = new RootInfo(root);
+        }
         return info;
     }
 
@@ -73,10 +76,10 @@ public String getPath() {
         return path;
     }
 
-    public DSIObject getTarget() {
-        if (parent == null) {
-            parent = root.getParent();
+    public synchronized DSIObject getTarget() {
+        if (target == null) {
             target = root;
+            parent = root.getParent();
             info = root.getInfo();
             int len = names.length;
             if (len == 0) {
@@ -116,4 +119,10 @@ public boolean isResponder() {
         return target instanceof DSIResponder;
     }
 
+    private static class RootInfo extends DSInfo {
+        RootInfo(DSNode root) {
+            super(null, root);
+        }
+    }
+
 }

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscribeStub.java

@@ -9,9 +9,9 @@
 /**
  * Manages the lifecycle of a single subscription and is also the outbound stream passed to the
  * requester.
- *
  * <p>
- *
+ * <p>
+ * <p>
  * There can be multiple subscriptions to a single path.  They are all contained in a
  * DSOutboundSubscribeStubs object.
  *

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundInvoke.java

@@ -15,11 +15,7 @@
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
-import org.iot.dsa.node.action.ActionResult;
-import org.iot.dsa.node.action.ActionSpec;
-import org.iot.dsa.node.action.ActionTable;
-import org.iot.dsa.node.action.ActionValues;
-import org.iot.dsa.node.action.DSAction;
+import org.iot.dsa.node.action.*;
 import org.iot.dsa.security.DSPermission;
 
 /**
@@ -233,7 +229,7 @@ public void run() {
                 setPath(path.getPath());
                 result = responder.onInvoke(this);
             }
-            DSInfo info = path.getInfo();
+            DSInfo info = path.getInfo(); //action must be child of a node
             if (!info.isAction()) {
                 throw new DSRequestException("Not an action " + path.getPath());
             }
@@ -250,7 +246,7 @@ public void run() {
                     throw new DSPermissionException("Read permission required");
                 }
             }
-            DSAction action = info.getAction();
+            DSAbstractAction action = info.getAction();
             result = action.invoke(info, this);
         } catch (Exception x) {
             error(getPath(), x);

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java

@@ -10,19 +10,10 @@
 import org.iot.dsa.dslink.responder.ApiObject;
 import org.iot.dsa.dslink.responder.InboundListRequest;
 import org.iot.dsa.dslink.responder.OutboundListResponse;
-import org.iot.dsa.node.DSElement;
-import org.iot.dsa.node.DSIEnum;
-import org.iot.dsa.node.DSIValue;
-import org.iot.dsa.node.DSInfo;
-import org.iot.dsa.node.DSList;
-import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.*;
 import org.iot.dsa.node.DSMap.Entry;
-import org.iot.dsa.node.DSMetadata;
-import org.iot.dsa.node.DSNode;
-import org.iot.dsa.node.DSPath;
-import org.iot.dsa.node.DSValueType;
 import org.iot.dsa.node.action.ActionSpec;
-import org.iot.dsa.node.action.DSAction;
+import org.iot.dsa.node.action.DSAbstractAction;
 import org.iot.dsa.node.event.DSIEvent;
 import org.iot.dsa.node.event.DSISubscriber;
 import org.iot.dsa.node.event.DSInfoTopic;
@@ -301,9 +292,9 @@ private void encodeTargetAction(ApiObject object, MessageWriter writer) {
             info = (DSInfo) object;
         }
         ActionSpec action = object.getAction();
-        DSAction dsAction = null;
-        if (action instanceof DSAction) {
-            dsAction = (DSAction) action;
+        DSAbstractAction dsAction = null;
+        if (action instanceof DSAbstractAction) {
+            dsAction = (DSAbstractAction) action;
         }
         DSElement e = cacheMap.remove("$invokable");
         if (e == null) {
@@ -599,6 +590,9 @@ public void run() {
                 response = responder.onList(this);
             } else {
                 info = path.getInfo();
+                if (info == null) {
+                    info = new RootInfo((DSNode) path.getTarget());
+                }
                 if (info.isNode()) {
                     node = info.getNode();
                     node.subscribe(DSNode.INFO_TOPIC, null, this);
@@ -726,6 +720,12 @@ private void writeUpdates(MessageWriter writer) {
     // Inner Classes
     ///////////////////////////////////////////////////////////////////////////
 
+    private static class RootInfo extends DSInfo {
+        RootInfo(DSNode node) {
+            super(null, node);
+        }
+    }
+
     protected static class Update {
 
         public boolean added;

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSet.java

@@ -5,10 +5,7 @@
 import org.iot.dsa.dslink.DSPermissionException;
 import org.iot.dsa.dslink.DSRequestException;
 import org.iot.dsa.dslink.responder.InboundSetRequest;
-import org.iot.dsa.node.DSElement;
-import org.iot.dsa.node.DSIValue;
-import org.iot.dsa.node.DSInfo;
-import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.*;
 import org.iot.dsa.security.DSPermission;
 
 public class DSInboundSet extends DSInboundRequest implements InboundSetRequest, Runnable {
@@ -42,19 +39,21 @@ public void run() {
             } else {
                 DSNode parent = path.getParent();
                 DSInfo info = path.getInfo();
-                if (info.isReadOnly()) {
+                if ((info != null) && info.isReadOnly()) {
                     throw new DSRequestException("Not writable: " + getPath());
                 }
                 if (!permission.isConfig()) {
-                    if (info.isAdmin()) {
+                    if ((info != null) && info.isAdmin()) {
                         throw new DSPermissionException("Config permission required");
                     } else if (DSPermission.WRITE.isGreaterThan(permission)) {
                         throw new DSPermissionException("Write permission required");
                     }
                 }
-                if (info.isNode()) {
-                    info.getNode().onSet(value);
+                DSIObject obj = path.getTarget();
+                if (obj instanceof DSNode) {
+                    ((DSNode) obj).onSet(value);
                 } else {
+                    //since not a node, there must be a parent
                     DSIValue current = info.getValue();
                     if (current == null) {
                         if (info.getDefaultObject() instanceof DSIValue) {

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscription.java

@@ -6,11 +6,7 @@
 import org.iot.dsa.dslink.responder.InboundSubscribeRequest;
 import org.iot.dsa.dslink.responder.SubscriptionCloseHandler;
 import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.node.DSIStatus;
-import org.iot.dsa.node.DSIValue;
-import org.iot.dsa.node.DSInfo;
-import org.iot.dsa.node.DSNode;
-import org.iot.dsa.node.DSStatus;
+import org.iot.dsa.node.*;
 import org.iot.dsa.node.event.DSIEvent;
 import org.iot.dsa.node.event.DSISubscriber;
 import org.iot.dsa.node.event.DSTopic;
@@ -97,13 +93,14 @@ protected void init() {
             setPath(path.getPath());
             closeHandler = responder.onSubscribe(this);
         } else {
-            DSInfo info = path.getInfo();
-            if (info.isNode()) {
-                node = info.getNode();
+            DSIObject obj = path.getTarget();
+            if (obj instanceof DSNode) {
+                node = (DSNode) obj;
                 node.subscribe(DSNode.VALUE_TOPIC, null, this);
-                onEvent(DSNode.VALUE_TOPIC, Event.NODE_CHANGED, info.getNode(), null,
+                onEvent(DSNode.VALUE_TOPIC, Event.NODE_CHANGED, node, null,
                         (Object[]) null);
             } else {
+                DSInfo info = path.getInfo();
                 node = path.getParent();
                 child = info;
                 node.subscribe(DSNode.VALUE_TOPIC, info, this);