0.51.0

- DSMainNode doesn't have to be a child of the DSLink node.

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.50.0'
+    version '0.51.0'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

dslink-v2/src/main/java/org/iot/dsa/dslink/DSMainNode.java

@@ -11,10 +11,10 @@
 public class DSMainNode extends DSNode {
 
     /**
-     * The parent link or null.
+     * The ancestral DSLink, or null.
      */
     public DSLink getLink() {
-        return (DSLink) getParent();
+        return (DSLink) getAncestor(DSLink.class);
     }
 
     /**
@@ -31,14 +31,4 @@ public boolean isResponder() {
         return true;
     }
 
-    /**
-     * The parent must be a DSLink instance.
-     */
-    public void validateParent(DSNode node) {
-        if (node instanceof DSLink) {
-            return;
-        }
-        throw new IllegalArgumentException("Must be a child of DSLink");
-    }
-
 }

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

@@ -132,6 +132,10 @@ public DSFlexEnum valueOf(DSElement arg) {
         if ((arg == null) || arg.isNull()) {
             return NULL;
         }
+        if (arg.isList()) {
+            DSList list = arg.toList();
+            return valueOf(list.first().toString(), list);
+        }
         return valueOf(arg.toString());
     }