0.9.2

Fix binary date type IO.
Fix already parented exceptions for lists and maps.
Added dynamic value type, and use it with DSNull.

Author: a-hansen

build.gradle

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

dslink-core/src/main/java/org/iot/dsa/io/NodeDecoder.java

@@ -54,7 +54,8 @@ public static DSNode decode(DSIReader in) {
     }
 
     /**
-     * Will create new instances for DSNodes, or return the NULL instance for DSIValues.
+     * Will create new instances for anything without a decoder, otherwise returns the decoder
+     * instance.
      */
     private DSIObject getInstance(String type) {
         DSIObject ret = null;

dslink-core/src/main/java/org/iot/dsa/io/NodeEncoder.java

@@ -160,7 +160,7 @@ void writeObject(DSInfo arg) {
         }
         if (!arg.equalsDefaultType()) {
             DSIObject obj = arg.getObject();
-            if (obj != null) {
+            if ((obj != null) && !(obj instanceof DSElement)) {
                 out.key("t").value(getToken(obj));
             }
         }
@@ -179,7 +179,9 @@ void writeValue(DSInfo arg) {
         if (!arg.equalsDefaultType()) {
             DSIValue v = (DSIValue) arg.getObject();
             if (v != null) {
-                out.key("t").value(getToken(v));
+                if (!(v instanceof DSElement)) {
+                    out.key("t").value(getToken(v));
+                }
                 out.key("v").value(v.store());
             } else {
                 out.key("v").value((String) null);
@@ -195,12 +197,4 @@ void writeValue(DSInfo arg) {
         out.endMap();
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
 }

dslink-core/src/main/java/org/iot/dsa/node/DSBytes.java

@@ -4,8 +4,7 @@
 import org.iot.dsa.io.DSBase64;
 
 /**
- * A Java float.  Try not to use, floats can only be converted to doubles by first converting them
- * to strings.
+ * Byte array that gets encoded as a base64 string.
  *
  * @author Aaron Hansen
  */
@@ -15,6 +14,7 @@ public class DSBytes extends DSValue {
     // ---------
 
     public static final DSBytes NULL = new DSBytes(new byte[0]);
+    private static final String PREFIX = "\u001Bbytes:";
 
     // Fields
     // ------
@@ -91,7 +91,7 @@ public String toString() {
         if (isNull()) {
             return "null";
         }
-        return DSBase64.encodeUrl(value);
+        return PREFIX + DSBase64.encodeUrl(value);
     }
 
     @Override
@@ -116,6 +116,9 @@ public static DSBytes valueOf(String arg) {
         } else if (arg.equalsIgnoreCase("null")) {
             return NULL;
         }
+        if (arg.startsWith(PREFIX)) {
+            arg = arg.substring(PREFIX.length());
+        }
         return new DSBytes(DSBase64.decode(arg));
     }
 

dslink-core/src/main/java/org/iot/dsa/node/DSList.java

@@ -321,20 +321,12 @@ public DSElement next() {
         }
 
         /**
-         * Not implements, throws an exception.
+         * Not implemented, throws an exception.
          */
         @Override
         public void remove() {
             throw new IllegalStateException("Not implemented");
         }
     }
 
-    // Initialization
-    // --------------
-
-    static {
-        DSRegistry.registerDecoder(DSList.class, new DSList());
-    }
-
-
 }

dslink-core/src/main/java/org/iot/dsa/node/DSMap.java

@@ -550,11 +550,4 @@ void setValue(DSElement val) {
         }
     }
 
-    // Initialization
-    // --------------
-
-    static {
-        DSRegistry.registerDecoder(DSMap.class, new DSMap());
-    }
-
 }

dslink-core/src/main/java/org/iot/dsa/node/DSNull.java

@@ -58,7 +58,7 @@ public boolean equals(Object arg) {
 
     @Override
     public DSValueType getValueType() {
-        return null;
+        return DSValueType.DYNAMIC;
     }
 
     /**

dslink-core/src/main/java/org/iot/dsa/node/DSValueType.java

@@ -10,6 +10,7 @@ public enum DSValueType {
 
     BINARY("binary"),
     BOOL("bool"),
+    DYNAMIC("dynamic"),
     ENUM("enum"),
     LIST("array"),
     MAP("map"),

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

@@ -10,6 +10,8 @@
 import org.iot.dsa.io.json.JsonWriter;
 import org.iot.dsa.node.DSFloat;
 import org.iot.dsa.node.DSInt;
+import org.iot.dsa.node.DSList;
+import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSNode;
 import org.iot.dsa.node.DSString;
 import org.junit.Assert;
@@ -78,6 +80,29 @@ public void theTest() throws Exception {
         Assert.assertTrue(orig.equals(decoded));
     }
 
+    /**
+     * Testing an "Already parented" bug that cropped up.
+     */
+    @Test
+    public void testMultipleGroups() throws Exception {
+        DSNode node = new MyNode();
+        DSList list = new DSList();
+        list.add("a").add("b").add("c");
+        node.put("first", list);
+        list = new DSList();
+        list.add("d").add("e").add("f");
+        node.put("second", list);
+        node = decode(encode(node));
+        list = (DSList) node.get("first");
+        Assert.assertTrue(list.getString(0).equals("a"));
+        Assert.assertTrue(list.getString(1).equals("b"));
+        Assert.assertTrue(list.getString(2).equals("c"));
+        list = (DSList) node.get("second");
+        Assert.assertTrue(list.getString(0).equals("d"));
+        Assert.assertTrue(list.getString(1).equals("e"));
+        Assert.assertTrue(list.getString(2).equals("f"));
+    }
+
     // Inner Classes
     // -------------