Merge pull request #175 from iot-dsa-v2/develop

0.73.1

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.73.0'
+    version '0.73.1'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8

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

@@ -294,30 +294,7 @@ public DSInfo<?> add(String name, DSIObject object) {
         }
         info = new DSInfo<>(name.intern(), object);
         add(info);
-        if (isRunning()) {
-            if (argIsNode) {
-                argAsNode.start();
-            }
-        }
-        if (isStable()) {
-            if (argIsNode) {
-                argAsNode.stable();
-            }
-            //Update any existing lists and subscriptions
-            String updatePath = info.getPath(null).toString();
-            DSRuntime.run(() -> {
-                DSLink link = getAncestor(DSLink.class);
-                if (link != null) {
-                    DSLinkConnection conn = link.getConnection();
-                    if (conn != null) {
-                        DSISession session = conn.getSession();
-                        if (session != null) {
-                            session.update(updatePath);
-                        }
-                    }
-                }
-            });
-        }
+        added(info);
         return info;
     }
 
@@ -951,18 +928,15 @@ public DSNode put(DSInfo<?> info, DSIObject object) {
         }
         if (isRunning()) {
             if (argIsNode) {
-                argAsNode.start();
-            } else {
-                try {
-                    onChildChanged(info);
-                } catch (Exception x) {
-                    error(getPath(), x);
-                }
-                if (info.isValue()) {
-                    fire(VALUE_CHANGED_EVENT, info, info.getElement());
-                } else {
-                    fire(VALUE_CHANGED_EVENT, info, null);
-                }
+                added(info);
+            }
+            try {
+                onChildChanged(info);
+            } catch (Exception x) {
+                error(getPath(), x);
+            }
+            if (info.isValue()) {
+                fire(VALUE_CHANGED_EVENT, info, info.getElement());
             }
         }
         return this;
@@ -1003,20 +977,18 @@ public DSNode remove(DSInfo<?> info) {
             }
             size--;
         }
-        if (info.isNode()) {
-            DSNode node = info.getNode();
-            if (isRunning()) {
-                notifyRemoved(node);
-            }
-            node.stop();
-            node.infoInParent = null;
-        }
         if (isRunning()) {
             try {
                 onChildRemoved(info);
             } catch (Exception x) {
                 error(getPath(), x);
             }
+            if (info.isNode()) {
+                DSNode node = info.getNode();
+                notifyRemoved(node);
+                node.stop();
+                node.infoInParent = null;
+            }
             fire(CHILD_REMOVED_EVENT, info, null);
         }
         return this;
@@ -1030,10 +1002,9 @@ public DSNode remove(DSInfo<?> info) {
      */
     public DSInfo<?> remove(String name) {
         DSInfo<?> info = getInfo(name);
-        if (info == null) {
-            return info;
+        if (info != null) {
+            remove(info);
         }
-        remove(info);
         return info;
     }
 
@@ -1546,13 +1517,38 @@ void dsInit() {
     // Private Methods
     ///////////////////////////////////////////////////////////////////////////
 
+    private void added(DSInfo<?> info) {
+        boolean isNode = info.isNode();
+        if (isRunning() && isNode) {
+            info.getNode().start();
+        }
+        if (isStable()) {
+            if (isNode) {
+                info.getNode().stable();
+            }
+            //Update any existing lists and subscriptions
+            String updatePath = info.getPath(null).toString();
+            DSRuntime.run(() -> {
+                DSLink link = getAncestor(DSLink.class);
+                if (link != null) {
+                    DSLinkConnection conn = link.getConnection();
+                    if (conn != null) {
+                        DSISession session = conn.getSession();
+                        if (session != null) {
+                            session.update(updatePath);
+                        }
+                    }
+                }
+            });
+        }
+    }
+
     private void notifyRemoved(DSNode node) {
         DSInfo<?> info = node.getFirstInfo();
         while (info != null) {
             if (info.isNode()) {
                 notifyRemoved(info.getNode());
             }
-            fire(CHILD_REMOVED_EVENT, info, null);
             info = info.next();
         }
         try {

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

@@ -145,24 +145,28 @@ public void onEvent(DSEvent event, DSNode node, DSInfo<?> child, DSIValue data)
         }
         switch (event.getEventId()) {
             case DSNode.CHILD_RENAMED:
-                if (target.getTargetInfo().isNode()) {
+                if (target.getTarget() == node) {
                     sendRemove(data.toString());
                 }
-                break;
+                //fall through to add the child
             case DSNode.CHILD_ADDED:
-                if (target.getTargetInfo().isNode()) {
+                if (target.getTarget() == node) {
                     encodeChild(child);
                 }
                 break;
             case DSNode.CHILD_REMOVED:
-                if (target.getTargetInfo().isNode()) {
-                    sendRemove(child.getName());
-                } else if (target.getTargetInfo() == child) {
+                if (target.getTargetInfo() == child) {
                     send("$disconnectedTs", DSDateTime.now().toElement());
+                    subscription.close();
+                    subscription = null;
+                } else if (target.getTarget() == node) {
+                    sendRemove(child.getName());
                 }
                 break;
             case DSNode.STOPPED:
                 send("$disconnectedTs", DSDateTime.now().toElement());
+                subscription.close();
+                subscription = null;
         }
     }
 
@@ -839,6 +843,16 @@ private void writeUpdates(MessageWriter writer) {
                 break;
             }
             writer.getWriter().value(update);
+            if (update.isList()) { //DGLux bug workaround
+                DSList list = update.toList();
+                if (list.size() > 1) {
+                    if (list.get(0).isString()) {
+                        if ("$disconnectedTs".equals(list.getString(0))) {
+                            break;
+                        }
+                    }
+                }
+            }
             if (responder.shouldEndMessage()) {
                 break;
             }

dslink-v2/src/test/java/org/iot/dsa/dslink/AddRemoveRequesterTest.java

@@ -153,13 +153,6 @@ private void subDeepValue(DSLink link) {
         update = h.nextUpdate(5000);
         Assert.assertTrue(update.status == DSStatus.ok);
 
-        //remove the value
-        /*
-        link.getMain().remove("def");
-        update = h.nextUpdate(5000);
-        Assert.assertTrue(update.status == DSStatus.unknown);
-        h.getStream().closeStream();
-        */
     }
 
     private void subSimpleValue(DSLink link) {