0.45.0

* DSInfo Metadata
* Trend Implementations

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.44.0'
+    version '0.45.0'
 
     sourceCompatibility = 1.6
     targetCompatibility = 1.6
@@ -38,6 +38,14 @@ subprojects {
 
 }
 
+if (JavaVersion.current().isJava8Compatible()) {
+    allprojects {
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xdoclint:none', '-quiet')
+        }
+    }
+}
+
 wrapper {
     gradleVersion = '4.10.2'
 }

dslink-v2-poc/src/main/java/org/iot/dsa/dslink/poc/MainNode.java

@@ -38,7 +38,10 @@ public class MainNode extends DSMainNode implements Runnable {
     @Override
     protected void declareDefaults() {
         super.declareDefaults();
-        declareDefault("Incrementing Int", DSLong.valueOf(1)).setReadOnly(true);
+        declareDefault("Incrementing Int", DSLong.valueOf(1)).setReadOnly(true)
+                                                             .getMetadata()
+                                                             .setDescription("this is a description")
+                                                             .setUnit("ms");
         declareDefault("Writable Boolean", DSBool.valueOf(true)).setAdmin(true);
         declareDefault("Writable Enum",
                        DSFlexEnum.valueOf("On",
@@ -72,7 +75,7 @@ public ActionResult invoke(DSInfo info, ActionInvocation invocation) {
             @Override
             public void prepareParameter(DSInfo info, DSMap parameter) {
             }
-        });
+        }).getMetadata().setActionGroup("Tests", "List");
     }
 
     private class ListHandler implements OutboundListHandler {

dslink-v2/build.gradle

@@ -14,4 +14,3 @@ test {
 javadoc {
     exclude("**/com/**")
 }
-

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/logging/DSLevel.java

@@ -23,7 +23,6 @@ public enum DSLevel implements DSIEnum, DSIValue {
     INFO(LoggingConstants.info),
     WARN(LoggingConstants.warn),
     ERROR(LoggingConstants.error),
-    ADMIN(LoggingConstants.admin),
     OFF(LoggingConstants.off);
 
     ///////////////////////////////////////////////////////////////////////////
@@ -137,8 +136,6 @@ public static DSLevel valueOf(Level arg) {
                 return WARN;
             case LoggingConstants.SEVERE: //error
                 return ERROR;
-            case LoggingConstants.ADMIN: //admin
-                return ADMIN;
             case LoggingConstants.OFF: //off
                 return OFF;
         }

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/logging/LoggerNodeLevel.java

@@ -24,7 +24,6 @@ public enum LoggerNodeLevel implements DSIEnum, DSIValue {
     INFO(LoggingConstants.info),
     WARN(LoggingConstants.warn),
     ERROR(LoggingConstants.error),
-    ADMIN(LoggingConstants.admin),
     OFF(LoggingConstants.off);
 
     ///////////////////////////////////////////////////////////////////////////
@@ -138,8 +137,6 @@ public static LoggerNodeLevel valueOf(Level arg) {
                 return WARN;
             case LoggingConstants.SEVERE: //error
                 return ERROR;
-            case LoggingConstants.ADMIN: //admin
-                return ADMIN;
             case LoggingConstants.OFF: //off
                 return OFF;
         }

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/logging/LoggingConstants.java

@@ -12,7 +12,6 @@ public class LoggingConstants {
     static final int INFO = 800;
     static final int WARN = 900;
     static final int SEVERE = 1000;
-    static final int ADMIN = 2000;
     static final int OFF = Integer.MAX_VALUE;
 
     public static final Level all = Level.ALL;
@@ -21,7 +20,6 @@ public class LoggingConstants {
     public static final Level info = Level.INFO;
     public static final Level warn = Level.WARNING;
     public static final Level error = Level.SEVERE;
-    public static final Level admin = new CustomLevel("ADMIN", ADMIN);
     public static final Level off = Level.OFF;
 
 }

dslink-v2/src/main/java/org/iot/dsa/io/AbstractReader.java

@@ -217,8 +217,6 @@ public Token last() {
      * Subclasses must override this, read the next item from the stream, then call one of the
      * setXxx methods.
      * <p>
-     * <p>
-     * <p>
      * {@inheritDoc}
      */
     @Override

dslink-v2/src/main/java/org/iot/dsa/io/DSIReader.java

@@ -10,32 +10,19 @@
  * between. To get an entire graph, call getElement(), getMap() or getList(). Otherwise, use the
  * next() method to iterate the elements of the input.
  * <p>
- * <p>
- * <p>
  * When next() returns:
- *
  * <ul>
- *
  * <li>ROOT - The initial state, not in a list or map, call next() or getElement().
- *
  * <li>BEGIN_LIST - Call getList() to decodeKeys the entire list, or call next again to get the
  * first element of the list (or END_LIST if empty).
- *
  * <li>BEGIN_MAP - Call getMap() to decodeKeys the entire map, or call next again to get the first
  * key of the map (or END_MAP if empty).
- *
  * <li>END_INPUT - Parsing is finished, close the reader.
- *
  * <li>END_LIST - The current list is complete, call next again.
- *
  * <li>END_MAP - The current map is complete, call next again.
- *
  * <li>BOOLEAN,DOUBLE,LONG,NULL,STRING - Call getElement() or the corresponding getter.
- *
  * </ul>
  * <p>
- * <p>
- * <p>
  * Be aware that if the underlying encoding (such as JSON) doesn't provide a mechanism to
  * differentiate between data types (such as numbers), values might not get as the same type they
  * were encoded.

dslink-v2/src/main/java/org/iot/dsa/io/DSIWriter.java

@@ -6,30 +6,18 @@
 /**
  * An encoder that can be used to encode large graphs with or without object instances.
  * <p>
- * <p>
- * <p>
  * To simply encode a DSMap or DSList, use the value(DSElement) method.
  * <p>
  * For example:
- *
  * <ul>
- *
  * <li>new JsonWriter(out).value(myMap).close();
- *
  * </ul>
  * <p>
- * <p>
- * <p>
  * Otherwise, you can stream data struct without using any DSIObject instances:
- *
  * <ul>
- *
  * <li>out.newMap().key("a").value(1).key("b").value(2).key("c").value(3).endMap();
- *
  * </ul>
  * <p>
- * <p>
- * <p>
  * Be aware that if the underlying encoding (such as JSON) doesn't provide a mechanism to
  * differentiate between data types (such as numbers), values might not get as the same type they
  * were encoded.

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

@@ -1,21 +1,22 @@
 package org.iot.dsa.io;
 
+import java.io.ByteArrayInputStream;
 import java.util.HashMap;
 import org.iot.dsa.io.DSIReader.Token;
+import org.iot.dsa.io.json.JsonReader;
 import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSIObject;
 import org.iot.dsa.node.DSIStorable;
 import org.iot.dsa.node.DSIValue;
 import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSNode;
 import org.iot.dsa.node.DSRegistry;
 import org.iot.dsa.util.DSException;
 
 /**
  * Decodes a node (tree) that was encoded with NodeEncoder.
  * <p>
- * <p>
- * <p>
  * This is for storing the configuration database, not for DSA interop.
  *
  * @author Aaron Hansen
@@ -50,6 +51,17 @@ public static DSNode decode(DSIReader in) {
         return decoder.read();
     }
 
+    /**
+     * Reads a node tree from the give byte array.
+     */
+    public static DSNode decode(byte[] bytes) {
+        ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
+        JsonReader reader = new JsonReader(bin, "UTF-8");
+        DSNode ret = decode(reader);
+        reader.close();
+        return ret;
+    }
+
     /**
      * Will create new instances for anything without a decoder, otherwise returns the decoder
      * instance.
@@ -105,6 +117,7 @@ private void readChild(DSNode parent) {
         DSElement state = null;
         String type = null;
         DSInfo info = null;
+        DSMap meta = null;
         DSIObject obj = null;
         while (in.next() != Token.END_MAP) {
             validateEqual(in.last(), Token.STRING);
@@ -116,12 +129,12 @@ private void readChild(DSNode parent) {
                 validateEqual(in.next(), Token.STRING);
                 name = in.getString();
                 info = parent.getInfo(name);
-                if (info != null) {
-                    ;//TODO parent.reorderToLast(info);
-                }
             } else if ("i".equals(key)) {
                 in.next();
                 state = in.getElement();
+            } else if ("m".equals(key)) {
+                validateEqual(in.next(), Token.BEGIN_MAP);
+                meta = in.getMap();
             } else if ("v".equals(key)) {
                 if (name == null) {
                     throw new IllegalStateException("Missing name");
@@ -133,14 +146,8 @@ private void readChild(DSNode parent) {
                     } else {
                         parent.put(info, obj);
                     }
-                }
-                if (info != null) {
-                    if (obj == null) {
-                        obj = info.getObject();
-                    }
-                    if (state != null) {
-                        info.decodeState(state);
-                    }
+                } else if (info != null) {
+                    obj = info.getObject();
                 }
                 if (obj == null) { //dynamic, or declareDefaults was modified
                     in.next();
@@ -170,19 +177,22 @@ private void readChild(DSNode parent) {
                 } else {
                     parent.put(info, obj);
                 }
+            } else if (info != null) {
+                obj = info.getObject();
             }
-            if (info != null)  {
-                if (obj == null) {
-                    obj = info.getObject();
-                }
-                if (state != null) {
-                    info.decodeState(state);
-                }
+        }
+        if (info != null) {
+            if (state != null) {
+                info.decodeState(state);
+            }
+            if (meta != null) {
+                info.setMetadata(meta);
             }
         }
         if (obj == null) {
             throw new IllegalStateException("Could not decode " + parent.getPath() + "/" + name);
         }
+        //TODO parent.reorderToLast(info);
     }
 
     private void readChildren(DSNode parent) {