Remove parent node of link, fix pathing

Aaron · Aaron · commit 63e3a02a9557 · 2018-05-08T07:38:28.000-07:00
Add DSLinkConnection.getPathInBroker methods
Fix DSNode.copy
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/RequestPath.java b/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);
+        }
+    }
+
 }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundInvoke.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundInvoke.java
@@ -233,7 +233,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());
             }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java
@@ -599,6 +599,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 +729,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;
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSet.java b/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) {
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscription.java b/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);
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1LinkConnection.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1LinkConnection.java
@@ -37,6 +37,7 @@ public class DS1LinkConnection extends DSLinkConnection {
 
     private DS1ConnectionInit connectionInit;
     private DSLink link;
+    private String pathInBroker;
     private DSIReader reader;
     private DSTransport transport;
     private DS1Session session;
@@ -56,6 +57,11 @@ public void disconnect() {
         }
     }
 
+    @Override
+    public String getPathInBroker() {
+        return pathInBroker;
+    }
+
     public DSIReader getReader() {
         return reader;
     }
@@ -84,6 +90,7 @@ protected DS1ConnectionInit initializeConnection() {
         put(CONNECTION_INIT, init).setTransient(true);
         try {
             init.initializeConnection();
+            pathInBroker = init.getResponse().getString("path");
         } catch (Exception x) {
             DSException.throwRuntime(x);
         }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2LinkConnection.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2LinkConnection.java
@@ -99,6 +99,11 @@ public void disconnect() {
         }
     }
 
+    @Override
+    public String getPathInBroker() {
+        return brokerPath.getValue().toString();
+    }
+
     private byte[] getLinkSalt() {
         if (linkSalt.getObject().isNull()) {
             byte[] tmp = new byte[32];
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLink.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSLink.java
@@ -184,8 +184,6 @@ public static DSLink load(DSLinkConfig config) {
             }
             ret.save();
         }
-        DSNode tmp = new DSNode();
-        tmp.add(ret.getLinkName(), ret);
         return ret;
     }
 
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConnection.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConnection.java
@@ -4,6 +4,7 @@
 import com.acuity.iot.dsa.dslink.transport.DSTransport;
 import java.util.concurrent.ConcurrentHashMap;
 import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.DSPath;
 import org.iot.dsa.time.DSTime;
 
 /**
@@ -92,14 +93,29 @@ protected String getLogName() {
         return getClass().getSimpleName();
     }
 
-    public DSSysNode getSys() {
-        return (DSSysNode) getParent();
+    /**
+     * The path representing the link node in the broker.
+     */
+    public abstract String getPathInBroker();
+
+    /**
+     * Concatenates the path in broker with the path of the node.
+     */
+    public String getPathInBroker(DSNode node) {
+        StringBuilder buf = new StringBuilder();
+        String localPath = DSPath.encodePath(node, buf).toString();
+        buf.setLength(0);
+        return DSPath.concat(getPathInBroker(), localPath, buf).toString();
     }
 
     public abstract DSIRequester getRequester();
 
     public abstract DSSession getSession();
 
+    public DSSysNode getSys() {
+        return (DSSysNode) getParent();
+    }
+
     public abstract DSTransport getTransport();
 
     /**
@@ -151,6 +167,7 @@ public void removeListener(Listener listener) {
         }
     }
 
+
     // Inner Classes
     // -------------
 
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSSysNode.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSSysNode.java
@@ -5,6 +5,8 @@
 import com.acuity.iot.dsa.dslink.protocol.v2.DS2LinkConnection;
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.DSNull;
+import org.iot.dsa.node.DSString;
 import org.iot.dsa.node.action.ActionInvocation;
 import org.iot.dsa.node.action.ActionResult;
 import org.iot.dsa.node.action.DSAction;
@@ -17,18 +19,18 @@
  */
 public class DSSysNode extends DSNode {
 
-    static final String CONNECTION = "connection";
-    static final String SAVE = "save";
-    static final String STOP = "stop";
-    static final String PROFILER = "profiler";
+    static final String CONNECTION = "Connection";
+    static final String SAVE = "Save";
+    static final String STOP = "Stop";
+    static final String PROFILER = "Profiler";
 
     private DSInfo connection = getInfo(CONNECTION);
     private DSInfo save = getInfo(SAVE);
     private DSInfo stop = getInfo(STOP);
 
     @Override
     protected void declareDefaults() {
-        declareDefault(CONNECTION, new DSNode()).setTransient(true);
+        declareDefault(CONNECTION, DSNull.NULL).setTransient(true);
         declareDefault(SAVE, DSAction.DEFAULT);
         declareDefault(STOP, DSAction.DEFAULT);
         declareDefault(PROFILER, new ProfilerNode()).setTransient(true);
@@ -62,6 +64,8 @@ void init() {
             }
             fine(fine() ? "Connection type: " + conn.getClass().getName() : null);
             put(connection, conn);
+            DSInfo info = getInfo(CONNECTION);
+            System.out.println(info == connection);
         } catch (Exception x) {
             DSException.throwRuntime(x);
         }
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSInfo.java b/dslink-core/src/main/java/org/iot/dsa/node/DSInfo.java
@@ -8,34 +8,20 @@
 
 /**
  * All node children have corresponding DSInfo instances. This type serves two purposes:
- *
- * <p>
- *
  * <ul>
- *
- * <li>It carries some meta-data about the relationship between the parent node and the child.
- *
+ * <li>It carries some 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>
- *
  * <p>
- *
  * Important things for developers to know about DSInfo are:
- *
- * <p>
- *
  * <ul>
- *
  * <li>You can configure state such as transient, readonly and hidden.
- *
- * <li>You can declare fields in the your Java class for default infos to avoid looking up the child
- * every time it is needed.  This is can be used to create fast getters and setters.
- *
+ * <li>You can declare fields in the your Java class for default infos to avoid looking up
+ * the child every time it is needed.  This is can be used to create fast getters and
+ * setters.
  * </ul>
  *
- * <p>
- *
  * @author Aaron Hansen
  */
 public class DSInfo implements ApiObject {
@@ -69,7 +55,7 @@ public class DSInfo implements ApiObject {
     DSInfo() {
     }
 
-    DSInfo(String name, DSIObject value) {
+    protected DSInfo(String name, DSIObject value) {
         this.name = name;
         setObject(value);
     }
@@ -78,6 +64,21 @@ public class DSInfo implements ApiObject {
     // Methods
     ///////////////////////////////////////////////////////////////////////////
 
+    /**
+     * This is only called by DSNode.copy.  Therefore, this will already
+     * be populated with the default value.
+     */
+    void copy(DSInfo info) {
+        flags = info.flags;
+        name = info.name;
+        if (isDefaultOnCopy()) {
+            return;
+        }
+        if (info.value != null) {
+            setObject(info.value.copy());
+        }
+    }
+
     public DSInfo copy() {
         DSInfo ret = new DSInfo();
         ret.flags = flags;
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSInfoProxy.java b/dslink-core/src/main/java/org/iot/dsa/node/DSInfoProxy.java
@@ -32,6 +32,16 @@ class DSInfoProxy extends DSInfo {
     // Methods
     ///////////////////////////////////////////////////////////////////////////
 
+    @Override
+    void copy(DSInfo info) {
+        if (info instanceof DSInfoProxy) {
+            defaultInfo = ((DSInfoProxy)info).defaultInfo;
+        } else {
+            defaultInfo = info;
+        }
+        super.copy(info);
+    }
+
     @Override
     public DSInfo copy() {
         DSInfoProxy ret = new DSInfoProxy(defaultInfo);
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSNode.java b/dslink-core/src/main/java/org/iot/dsa/node/DSNode.java
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSPath.java b/dslink-core/src/main/java/org/iot/dsa/node/DSPath.java

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public void run() {`
`233`	`233`	`setPath(path.getPath());`
`234`	`234`	`result = responder.onInvoke(this);`
`235`	`235`	`}`
`236`		`- DSInfo info = path.getInfo();`
	`236`	`+ DSInfo info = path.getInfo(); //action must be child of a node`
`237`	`237`	`if (!info.isAction()) {`
`238`	`238`	`throw new DSRequestException("Not an action " + path.getPath());`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ public class DS1LinkConnection extends DSLinkConnection {`
`37`	`37`
`38`	`38`	`private DS1ConnectionInit connectionInit;`
`39`	`39`	`private DSLink link;`
	`40`	`+ private String pathInBroker;`
`40`	`41`	`private DSIReader reader;`
`41`	`42`	`private DSTransport transport;`
`42`	`43`	`private DS1Session session;`
`@@ -56,6 +57,11 @@ public void disconnect() {`
`56`	`57`	`}`
`57`	`58`	`}`
`58`	`59`
	`60`	`+ @Override`
	`61`	`+ public String getPathInBroker() {`
	`62`	`+ return pathInBroker;`
	`63`	`+ }`
	`64`	`+`
`59`	`65`	`public DSIReader getReader() {`
`60`	`66`	`return reader;`
`61`	`67`	`}`
`@@ -84,6 +90,7 @@ protected DS1ConnectionInit initializeConnection() {`
`84`	`90`	`put(CONNECTION_INIT, init).setTransient(true);`
`85`	`91`	`try {`
`86`	`92`	`init.initializeConnection();`
	`93`	`+ pathInBroker = init.getResponse().getString("path");`
`87`	`94`	`} catch (Exception x) {`
`88`	`95`	`DSException.throwRuntime(x);`
`89`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,11 @@ public void disconnect() {`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ @Override`
	`103`	`+ public String getPathInBroker() {`
	`104`	`+ return brokerPath.getValue().toString();`
	`105`	`+ }`
	`106`	`+`
`102`	`107`	`private byte[] getLinkSalt() {`
`103`	`108`	`if (linkSalt.getObject().isNull()) {`
`104`	`109`	`byte[] tmp = new byte[32];`
Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,6 @@ public static DSLink load(DSLinkConfig config) {`
`184`	`184`	`}`
`185`	`185`	`ret.save();`
`186`	`186`	`}`
`187`		`- DSNode tmp = new DSNode();`
`188`		`- tmp.add(ret.getLinkName(), ret);`
`189`	`187`	`return ret;`
`190`	`188`	`}`
`191`	`189`