Replace most DSAction signatures with DSAbstractAction.

Rename dslink-java-v2-test to dslink-java-v2-poc.
Add support for local certificates to SysCertManager

Author: Aaron

.gitignore

@@ -22,6 +22,7 @@
 **/.DS_Store
 
 # Runtime files
+**/dslink.jks
 **/.key
 **/db
 **/nodes.json

README.md

@@ -16,7 +16,7 @@ the DSA architecture, please visit
 ## Sub Projects
 
   - **/dslink-core** - The APIs used to build new links.
-  - **/dslink-java-v2-test** - For proof of concept and testing.
+  - **/dslink-java-v2-poc** - For proof of concept and testing.
   - **/dslink-websocket-standalone** - Used by links that run in their own process, rather
     than in an environment which provides another websocket implementation.
 

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSByteBuffer.java

@@ -425,6 +425,7 @@ public DSByteBuffer putU32(long v, boolean bigEndian) {
                    (byte) (v >>> 16),
                    (byte) (v >>> 24));
     }
+
     /**
      * Returns the next byte in the buffer, or -1 when nothing is available.
      */

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscribeStub.java

@@ -9,9 +9,9 @@
 /**
  * Manages the lifecycle of a single subscription and is also the outbound stream passed to the
  * requester.
- *
  * <p>
- *
+ * <p>
+ * <p>
  * There can be multiple subscriptions to a single path.  They are all contained in a
  * DSOutboundSubscribeStubs object.
  *

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

@@ -15,11 +15,7 @@
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
-import org.iot.dsa.node.action.ActionResult;
-import org.iot.dsa.node.action.ActionSpec;
-import org.iot.dsa.node.action.ActionTable;
-import org.iot.dsa.node.action.ActionValues;
-import org.iot.dsa.node.action.DSAction;
+import org.iot.dsa.node.action.*;
 import org.iot.dsa.security.DSPermission;
 
 /**
@@ -250,7 +246,7 @@ public void run() {
                     throw new DSPermissionException("Read permission required");
                 }
             }
-            DSAction action = info.getAction();
+            DSAbstractAction action = info.getAction();
             result = action.invoke(info, this);
         } catch (Exception x) {
             error(getPath(), x);

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java

@@ -10,19 +10,10 @@
 import org.iot.dsa.dslink.responder.ApiObject;
 import org.iot.dsa.dslink.responder.InboundListRequest;
 import org.iot.dsa.dslink.responder.OutboundListResponse;
-import org.iot.dsa.node.DSElement;
-import org.iot.dsa.node.DSIEnum;
-import org.iot.dsa.node.DSIValue;
-import org.iot.dsa.node.DSInfo;
-import org.iot.dsa.node.DSList;
-import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.*;
 import org.iot.dsa.node.DSMap.Entry;
-import org.iot.dsa.node.DSMetadata;
-import org.iot.dsa.node.DSNode;
-import org.iot.dsa.node.DSPath;
-import org.iot.dsa.node.DSValueType;
 import org.iot.dsa.node.action.ActionSpec;
-import org.iot.dsa.node.action.DSAction;
+import org.iot.dsa.node.action.DSAbstractAction;
 import org.iot.dsa.node.event.DSIEvent;
 import org.iot.dsa.node.event.DSISubscriber;
 import org.iot.dsa.node.event.DSInfoTopic;
@@ -301,9 +292,9 @@ private void encodeTargetAction(ApiObject object, MessageWriter writer) {
             info = (DSInfo) object;
         }
         ActionSpec action = object.getAction();
-        DSAction dsAction = null;
-        if (action instanceof DSAction) {
-            dsAction = (DSAction) action;
+        DSAbstractAction dsAction = null;
+        if (action instanceof DSAbstractAction) {
+            dsAction = (DSAbstractAction) action;
         }
         DSElement e = cacheMap.remove("$invokable");
         if (e == null) {
@@ -600,7 +591,7 @@ public void run() {
             } else {
                 info = path.getInfo();
                 if (info == null) {
-                    info = new RootInfo((DSNode)path.getTarget());
+                    info = new RootInfo((DSNode) path.getTarget());
                 }
                 if (info.isNode()) {
                     node = info.getNode();
@@ -731,7 +722,7 @@ private void writeUpdates(MessageWriter writer) {
 
     private static class RootInfo extends DSInfo {
         RootInfo(DSNode node) {
-            super(null,node);
+            super(null, node);
         }
     }
 

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSet.java

@@ -51,7 +51,7 @@ public void run() {
                 }
                 DSIObject obj = path.getTarget();
                 if (obj instanceof DSNode) {
-                    ((DSNode)obj).onSet(value);
+                    ((DSNode) obj).onSet(value);
                 } else {
                     //since not a node, there must be a parent
                     DSIValue current = info.getValue();

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1ConnectionInit.java

@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
-import java.net.URI;
 import java.net.URL;
 import java.security.MessageDigest;
 import org.iot.dsa.dslink.DSLink;

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1Session.java

@@ -1,11 +1,5 @@
 package com.acuity.iot.dsa.dslink.protocol.v1;
 
-import static org.iot.dsa.io.DSIReader.Token.BEGIN_LIST;
-import static org.iot.dsa.io.DSIReader.Token.BEGIN_MAP;
-import static org.iot.dsa.io.DSIReader.Token.END_LIST;
-import static org.iot.dsa.io.DSIReader.Token.END_MAP;
-import static org.iot.dsa.io.DSIReader.Token.NULL;
-
 import com.acuity.iot.dsa.dslink.protocol.DSProtocolException;
 import com.acuity.iot.dsa.dslink.protocol.DSSession;
 import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
@@ -21,6 +15,7 @@
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSInt;
 import org.iot.dsa.node.DSMap;
+import static org.iot.dsa.io.DSIReader.Token.*;
 
 /**
  * Implements DSA 1.1.2

dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/responder/DS1Responder.java

@@ -3,12 +3,7 @@
 import com.acuity.iot.dsa.dslink.protocol.DSProtocolException;
 import com.acuity.iot.dsa.dslink.protocol.DSSession;
 import com.acuity.iot.dsa.dslink.protocol.DSStream;
-import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundInvoke;
-import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundList;
-import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundRequest;
-import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSet;
-import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSubscriptions;
-import com.acuity.iot.dsa.dslink.protocol.responder.DSResponder;
+import com.acuity.iot.dsa.dslink.protocol.responder.*;
 import com.acuity.iot.dsa.dslink.protocol.v1.CloseMessage;
 import org.iot.dsa.DSRuntime;
 import org.iot.dsa.node.DSElement;