0.70.7

* Fix eventing and subscriptions for Nodes that are DIValues.
* DSElementType fixes.

Author: a-hansen

build.gradle

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

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

@@ -574,6 +574,11 @@ DSInfo<T> setName(String arg) {
     DSInfo<T> setObject(T arg) {
         if (isDeclared()) {
             if (!getDefaultObject().getClass().isInstance(arg)) {
+                if (isValue() && (arg instanceof DSIValue)) {
+                    DSIValue v = (DSIValue) arg;
+                    this.object = (T) getValue().valueOf(v.toElement());
+                    return this;
+                }
                 throw new IllegalArgumentException(arg + " not an instanceof the declared type " +
                                                            getDefaultObject().getClass().getName());
             }

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

@@ -1,5 +1,7 @@
 package org.iot.dsa.node;
 
+import org.iot.dsa.node.event.DSEvent;
+
 /**
  * A convenience implementation of a node that is also a value.  The value of the node must be
  * stored as a child.  Subclasses only need to override is getValueChild()
@@ -34,7 +36,7 @@ public boolean isNull() {
     public void onChildChanged(DSInfo child) {
         DSInfo info = getValueChild();
         if (child == info) {
-            fire(VALUE_CHANGED_EVENT, child, child.getValue());
+            fire(VALUE_CHANGED_EVENT, null, child.getValue());
             DSNode parent = getParent();
             if (parent != null) {
                 parent.fire(VALUE_CHANGED_EVENT, getInfo(), child.getValue());

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

@@ -43,7 +43,7 @@ public DSEventFilter(DSISubscriber subscriber) {
      * @param child      Optional.
      */
     public DSEventFilter(DSISubscriber subscriber, DSEvent event, DSInfo child) {
-        this.subscriber = subscriber;
+        this(subscriber);
         this.event = event;
         this.child = child;
     }

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

@@ -41,7 +41,6 @@ public void run() {
                 setPath(path.getPath());
                 responder.onSet(this);
             } else {
-                DSNode parent = path.getNode();
                 DSInfo info = path.getTargetInfo();
                 if ((info != null) && info.isReadOnly()) {
                     throw new DSRequestException("Not writable: " + getPath());
@@ -58,6 +57,7 @@ public void run() {
                     ((DSNode) obj).onSet(value);
                 } else {
                     //since not a node, there must be a parent
+                    DSNode parent = info.getParent();
                     DSIValue current = info.getValue();
                     if (current == null) {
                         if (info.isValue()) {

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

@@ -12,8 +12,10 @@
 import org.iot.dsa.node.DSIValue;
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.DSNull;
 import org.iot.dsa.node.DSStatus;
 import org.iot.dsa.node.event.DSEvent;
+import org.iot.dsa.node.event.DSEventFilter;
 import org.iot.dsa.node.event.DSISubscriber;
 import org.iot.dsa.node.event.DSISubscription;
 import org.iot.dsa.time.DSDateTime;
@@ -110,17 +112,20 @@ public void onClosed(DSISubscription subscription) {
 
     @Override
     public void onEvent(DSEvent event, DSNode node, DSInfo child, DSIValue data) {
-        DSIValue value;
-        if (child != null) {
-            value = child.getValue();
-        } else {
-            value = (DSIValue) node;
+        if (data == null) {
+            if ((child != null) && child.isValue()) {
+                data = child.getValue();
+            } else if (node instanceof DSIValue) {
+                data = (DSIValue) node;
+            } else {
+                data = DSNull.NULL;
+            }
         }
         DSStatus status = DSStatus.ok;
-        if (value instanceof DSIStatus) {
-            status = ((DSIStatus) value).getStatus();
+        if (data instanceof DSIStatus) {
+            status = ((DSIStatus) data).getStatus();
         }
-        update(DSDateTime.now(), value, status);
+        update(DSDateTime.now(), data, status);
     }
 
     /**
@@ -219,11 +224,18 @@ protected void init() {
             DSIObject obj = path.getTarget();
             if (obj instanceof DSNode) {
                 node = (DSNode) obj;
-                this.subscription = node.subscribe(this, DSNode.VALUE_CHANGED_EVENT, null);
+                this.subscription = node.subscribe(new DSISubscriber() {
+                    @Override
+                    public void onEvent(DSEvent event, DSNode node, DSInfo child, DSIValue data) {
+                        if (child == null) {
+                            DSInboundSubscription.this.onEvent(event, node, null, data);
+                        }
+                    }
+                });
                 onEvent(DSNode.VALUE_CHANGED_EVENT, node, null, null);
             } else {
                 DSInfo info = path.getTargetInfo();
-                node = path.getNode();
+                node = info.getParent();
                 child = info;
                 this.subscription = node.subscribe(this, DSNode.VALUE_CHANGED_EVENT, info);
                 onEvent(DSNode.VALUE_CHANGED_EVENT, node, info, null);

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

@@ -36,22 +36,6 @@ public class SerializationTest {
     // Methods
     // -------
 
-    @Test
-    public void differentTypeThanDefault() throws Exception {
-        DSNode node = new MyNode();
-        node.put("tmp", DSElement.make(10));
-        boolean success = false;
-        try {
-            node.put("string", DSLong.valueOf(6));
-        } catch (Exception x) {
-            success = true;
-        }
-        Assert.assertTrue(success);
-        node = decode(encode(node));
-        Assert.assertEquals(node.get("string"), DSString.EMPTY);
-        Assert.assertEquals(node.get("tmp"), DSElement.make(10));
-    }
-
     /**
      * Testing an "Already parented" bug that cropped up.
      */