Action table metadata.

Author: Aaron

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.49.0a1'
+    version '0.49.0'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
@@ -38,11 +38,9 @@ subprojects {
 
 }
 
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-        tasks.withType(Javadoc) {
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
+allprojects {
+    tasks.withType(Javadoc) {
+        options.addStringOption('Xdoclint:none', '-quiet')
     }
 }
 

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

@@ -356,11 +356,15 @@ private boolean isClosePending() {
     private void writeColumns(MessageWriter writer) {
         DSIWriter out = writer.getWriter();
         if (result instanceof ActionTable) {
+            DSMap tableMeta = ((ActionTable) result).getMetadata();
+            if (tableMeta == null) {
+                tableMeta = new DSMap();
+            }
             ActionSpec action = result.getAction();
             out.key("meta")
                .beginMap()
                .key("mode").value(action.getResultType().isStream() ? "stream" : "append")
-               .key("meta").beginMap().endMap()
+               .key("meta").value(tableMeta)
                .endMap();
             out.key("columns").beginList();
             ActionTable tbl = (ActionTable) result;

dslink-v2/src/main/java/org/iot/dsa/conn/DSBaseConnection.java

@@ -9,7 +9,7 @@
 
 /**
  * Basic representation of a connection, which is subclassed by DSConnection for longer lived
- * connections.  DSConnection should be subclassed but this can be:
+ * connections.  DSConnection should really be subclassed but this can if desired.
  * <p>
  * Subclasses must:<br>
  * <ul>

dslink-v2/src/main/java/org/iot/dsa/conn/DSConnection.java

@@ -43,12 +43,12 @@ public abstract class DSConnection extends DSBaseConnection implements Runnable
     /**
      * The topic to subscribe to for connected events.
      */
-    public static final DSConnectionTopic CONNECTED = new DSConnectionTopic();
+    public static final DSConnectionTopic CONNECTED = new DSConnectionTopic("CONNECTED");
 
     /**
      * The topic to subscribe to for disconnected events.
      */
-    public static final DSConnectionTopic DISCONNECTED = new DSConnectionTopic();
+    public static final DSConnectionTopic DISCONNECTED = new DSConnectionTopic("DISCONNECTED");
 
     ///////////////////////////////////////////////////////////////////////////
     // Instance Fields
@@ -327,8 +327,11 @@ private void notifyConnectedDescendants(DSNode node, DSConnection conn) {
      */
     public static class DSConnectionTopic extends DSTopic implements DSIEvent {
 
+        String name;
+
         // Prevent instantiation
-        private DSConnectionTopic() {
+        private DSConnectionTopic(String name) {
+            this.name = name;
         }
 
         /**
@@ -344,6 +347,11 @@ public DSITopic getTopic() {
             return this;
         }
 
+        @Override
+        public String toString() {
+            return name;
+        }
+
     }
 
 }

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

@@ -1,6 +1,5 @@
 package org.iot.dsa.node;
 
-
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -10,9 +9,6 @@
  */
 public class DSRegistry {
 
-    // Constants
-    // ---------
-
     // Fields
     // ------
 
@@ -21,9 +17,6 @@ public class DSRegistry {
     private static ConcurrentHashMap<Class, DSNode> defaultMap =
             new ConcurrentHashMap<Class, DSNode>();
 
-    // Constructors
-    // ------------
-
     // Public Methods
     // --------------
 
@@ -69,7 +62,4 @@ static DSNode removeDefault(Class clazz) {
         return defaultMap.remove(clazz);
     }
 
-    // Inner Classes
-    // -------------
-
 }

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

@@ -11,23 +11,23 @@
 public interface ActionSpec {
 
     /**
-     * Returns 0 or less if the result columns are unknown in advance.
+     * Return 0 or less if the result columns are unknown in advance.
      */
     public int getColumnCount();
 
     /**
-     * Adds the metadata for the column at the given index to the bucket.  Only called before the
+     * Add the metadata for the column at the given index to the bucket.  Only called before the
      * action invocation.
      */
     public void getColumnMetadata(int idx, DSMap bucket);
 
     /**
-     * Returns 0 or less if there are no parameters.
+     * Return 0 or less if there are no parameters.
      */
     public int getParameterCount();
 
     /**
-     * Adds the metadata for the parameter at the given index to the bucket.
+     * Add the metadata for the parameter at the given index to the bucket.
      */
     public void getParameterMetadata(int idx, DSMap bucket);
 

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

@@ -1,5 +1,6 @@
 package org.iot.dsa.node.action;
 
+import org.iot.dsa.node.DSMap;
 import org.iot.dsa.table.DSIRowCursor;
 
 /**
@@ -9,4 +10,10 @@
  */
 public interface ActionTable extends ActionValues, DSIRowCursor {
 
+    /**
+     * Metadata for the entire table, null by default.
+     */
+    public default DSMap getMetadata() {
+        return null;
+    }
 }

dslink-v2/src/main/java/org/iot/dsa/time/DSInterval.java

@@ -51,17 +51,6 @@ private void doit(DSLink link) throws Exception {
                 ActionValuesTest.this.notifyAll();
             }
         });
-        /*
-        link.getConnection().subscribe(DSLinkConnection.CONNECTED, null, new DSISubscriber() {
-            @Override
-            public void onEvent(DSNode node, DSInfo child, DSIEvent event) {
-                success = true;
-                synchronized (ActionValuesTest.this) {
-                    ActionValuesTest.this.notifyAll();
-                }
-            }
-        });
-        */
         Thread t = new Thread(link, "DSLink Runner");
         t.start();
         synchronized (this) {