0.68.0 (#147)

- Generic DSInfo
- Remove isNull from DSIObject
- Update gradle

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.67.1'
+    version '0.68.0'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -60,5 +60,5 @@ allprojects {
 }
 
 wrapper {
-    gradleVersion = '5.6'
+    gradleVersion = '5.6.2'
 }

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

@@ -12,9 +12,4 @@ public interface DSIObject {
      */
     public DSIObject copy();
 
-    /**
-     * Whether or not this object represents a null instance.
-     */
-    public boolean isNull();
-
 }

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

@@ -22,7 +22,7 @@
  *
  * @author Aaron Hansen
  */
-public class DSInfo implements ApiObject, GroupListener {
+public class DSInfo<T extends DSIObject> implements ApiObject, GroupListener {
 
     ///////////////////////////////////////////////////////////////////////////
     // Constants
@@ -44,7 +44,7 @@ public class DSInfo implements ApiObject, GroupListener {
     DSMap metadata;
     String name;
     DSInfo next;
-    DSIObject object;
+    T object;
     DSNode parent;
     DSInfo prev;
 
@@ -55,7 +55,7 @@ public class DSInfo implements ApiObject, GroupListener {
     DSInfo() {
     }
 
-    public DSInfo(String name, DSIObject object) {
+    protected DSInfo(String name, T object) {
         this.name = name;
         setObject(object);
     }
@@ -64,22 +64,6 @@ public DSInfo(String name, DSIObject object) {
     // Public Methods
     ///////////////////////////////////////////////////////////////////////////
 
-    public DSInfo copy() {
-        DSInfo ret = new DSInfo();
-        ret.copyState(this);
-        if (isDefaultOnCopy()) {
-            DSIObject val = getDefaultObject();
-            if (val != null) {
-                ret.setObject(val.copy());
-                return ret;
-            }
-        }
-        if (object != null) {
-            ret.setObject(object.copy());
-        }
-        return ret;
-    }
-
     public void decodeState(DSElement state) {
         flags = state.toInt();
     }
@@ -159,7 +143,7 @@ public boolean equivalent(Object arg) {
     /**
      * Returns the target object.
      */
-    public DSIObject get() {
+    public T get() {
         return object;
     }
 
@@ -201,13 +185,6 @@ public Iterator<String> getChildren() {
         return bucket.iterator();
     }
 
-    /**
-     * If this is a proxy , this will return the original default instance.
-     */
-    public DSIObject getDefaultObject() {
-        return get();
-    }
-
     /**
      * A convenience that casts the object.  Will call DSIValue.toElement on values.
      */
@@ -248,15 +225,6 @@ public DSNode getNode() {
         return (DSNode) get();
     }
 
-    /**
-     * User get() instead.
-     *
-     * @deprecated 18-11-14
-     */
-    public DSIObject getObject() {
-        return object;
-    }
-
     public DSNode getParent() {
         return parent;
     }
@@ -288,7 +256,7 @@ public boolean hasNext() {
     /**
      * True if the value of the info is an instance of the given class.
      */
-    public boolean is(Class clazz) {
+    public boolean is(Class<?> clazz) {
         if (object == null) {
             return false;
         }
@@ -328,7 +296,8 @@ public boolean isFrozen() {
     }
 
     /**
-     * True if the info cannot be removed or renamed. Use for non-default nodes.
+     * True if the info cannot be removed or renamed.
+     * Intended for non-default children, default children are implicitly locked.
      */
     public boolean isLocked() {
         return getFlag(LOCKED);
@@ -348,7 +317,10 @@ public boolean isNull() {
         if (object == null) {
             return true;
         }
-        return object.isNull();
+        if (isValue()) {
+            return getValue().isNull();
+        }
+        return false;
     }
 
     /**
@@ -388,73 +360,73 @@ public void modified(DSGroup map) {
     }
 
     /**
-     * The next info in the parent node.
+     * The next info in the parent node, or null.
      */
     public DSInfo next() {
         return next;
     }
 
     /**
-     * The next DSInfo in the parent whose object is of the given type.
+     * The next DSInfo in the parent whose object is of the given type, or null.
      */
-    public DSInfo next(Class is) {
+    public DSInfo next(Class<?> is) {
         DSInfo cur = next;
         while (cur != null) {
             if (cur.is(is)) {
                 return cur;
             }
             cur = cur.next();
         }
-        return cur;
+        return null;
     }
 
     /**
      * The next DSInfo in the parent that is an action, or null.
      */
-    public DSInfo nextAction() {
+    public DSInfo<DSAction> nextAction() {
         DSInfo cur = next;
         while (cur != null) {
             if (cur.isAction()) {
                 return cur;
             }
             cur = cur.next();
         }
-        return cur;
+        return null;
     }
 
     /**
      * The next DSInfo in the parent that is a node, or null.
      */
-    public DSInfo nextNode() {
+    public DSInfo<DSNode> nextNode() {
         DSInfo cur = next;
         while (cur != null) {
             if (cur.isNode()) {
                 return cur;
             }
             cur = cur.next();
         }
-        return cur;
+        return null;
     }
 
     /**
      * The next DSInfo in the parent that is a value, or null.
      */
-    public DSInfo nextValue() {
+    public DSInfo<DSIValue> nextValue() {
         DSInfo cur = next;
         while (cur != null) {
             if (cur.isValue()) {
                 return cur;
             }
             cur = cur.next();
         }
-        return cur;
+        return null;
     }
 
     /**
      * False by default, set to true if you don't want the child to require admin level
      * permissions.
      */
-    public DSInfo setAdmin(boolean admin) {
+    public DSInfo<T> setAdmin(boolean admin) {
         setFlag(ADMIN, admin);
         return this;
     }
@@ -463,21 +435,21 @@ public DSInfo setAdmin(boolean admin) {
      * False by default, set to true to reset the target to it's default when the encapsulated node
      * is copied.
      */
-    public DSInfo setDefaultOnCopy(boolean defaultOnCopy) {
+    public DSInfo<T> setDefaultOnCopy(boolean defaultOnCopy) {
         setFlag(DEFAULT_ON_COPY, defaultOnCopy);
         return this;
     }
 
     /**
      * False by default, set to true if the info cannot be removed or renamed.
-     * Use for non-default nodes.
+     * Intended for non-default children, default children are implicitly locked.
      */
-    public DSInfo setLocked(boolean locked) {
+    public DSInfo<T> setLocked(boolean locked) {
         setFlag(LOCKED, locked);
         return this;
     }
 
-    public DSInfo setMetadata(DSMap map) {
+    public DSInfo<T> setMetadata(DSMap map) {
         map.setParent(this);
         metadata = map;
         return this;
@@ -486,23 +458,23 @@ public DSInfo setMetadata(DSMap map) {
     /**
      * False by default, set to true if you don't want the child to be sent to clients.
      */
-    public DSInfo setPrivate(boolean hidden) {
+    public DSInfo<T> setPrivate(boolean hidden) {
         setFlag(PRIVATE, hidden);
         return this;
     }
 
     /**
      * False by default, set to true if you don't want the child to be written by clients.
      */
-    public DSInfo setReadOnly(boolean readOnly) {
+    public DSInfo<T> setReadOnly(boolean readOnly) {
         setFlag(READONLY, readOnly);
         return this;
     }
 
     /**
      * False by default, set to true if you don't want the child persisted.
      */
-    public DSInfo setTransient(boolean trans) {
+    public DSInfo<T> setTransient(boolean trans) {
         setFlag(TRANSIENT, trans);
         return this;
     }
@@ -518,32 +490,47 @@ public String toString() {
     // Package Methods
     ///////////////////////////////////////////////////////////////////////////
 
-    /**
-     * This is only called by DSNode.copy.  Therefore, this will already
-     * be populated with the default value.
-     */
-    void copy(DSInfo info) {
+    DSInfo<T> copy() {
+        DSInfo<T> ret = new DSInfo<>();
+        ret.copyState(this);
+        if (isDefaultOnCopy()) {
+            DSIObject val = getDefaultObject();
+            if (val != null) {
+                ret.setObject((T) val.copy());
+                return ret;
+            }
+        }
+        if (object != null) {
+            ret.setObject((T) object.copy());
+        }
+        return ret;
+    }
+
+    void copy(DSInfo<T> info) {
         copyState(info);
         if (isDefaultOnCopy()) {
             return;
         }
         if (info.object != null) {
-            setObject(info.object.copy());
+            setObject((T) info.object.copy());
         }
     }
 
-    /**
-     * This is only called by DSNode.copy.  Therefore, this will already
-     * be populated with the default value.
-     */
-    void copyState(DSInfo info) {
+    void copyState(DSInfo<T> info) {
         flags = info.flags;
         name = info.name;
         if (info.metadata != null) {
             metadata = info.metadata.copy();
         }
     }
 
+    /**
+     * If this is a proxy , this will return the original default instance.
+     */
+    T getDefaultObject() {
+        return get();
+    }
+
     boolean getFlag(int position) {
         return DSUtil.getBit(flags, position);
     }
@@ -566,28 +553,32 @@ boolean isProxy() {
         return false;
     }
 
-    DSInfo setFlag(int position, boolean on) {
+    DSInfo<T> newProxy() {
+        return new DSInfoProxy<>(this);
+    }
+
+    DSInfo<T> setFlag(int position, boolean on) {
         //modified?
         flags = DSUtil.setBit(flags, position, on);
         return this;
     }
 
-    DSInfo setName(String arg) {
+    DSInfo<T> setName(String arg) {
         this.name = arg;
         return this;
     }
 
-    DSInfo setObject(DSIObject arg) {
+    DSInfo<T> setObject(T arg) {
         this.object = arg;
         return this;
     }
 
-    DSInfo setParent(DSNode arg) {
+    DSInfo<T> setParent(DSNode arg) {
         this.parent = arg;
         return this;
     }
 
-    DSInfo setDeclared(boolean arg) {
+    DSInfo<T> setDeclared(boolean arg) {
         setFlag(DECLARED, arg);
         return this;
     }