0.73.0

* Fix list and subscription streams for adds and removes
* Code cleanup
* More generic apis

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.72.1'
+    version '0.73.0'
 
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8

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

@@ -367,6 +367,10 @@ public String toString() {
             return buf.toString();
         }
 
+        long nextRunNanos() {
+            return nextRun;
+        }
+
         /**
          * Executes the task if it is time.
          *
@@ -394,10 +398,6 @@ boolean run(long now) {
             return computeNextRun(now);
         }
 
-        long nextRunNanos() {
-            return nextRun;
-        }
-
         private boolean computeNextRun(long now) {
             if (interval <= 0) {
                 done = true;

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

@@ -137,7 +137,7 @@ public void shutdown() {
     /////////////////////////////////////////////////////////////////
 
     @Override
-    protected void finalize() throws Throwable {
+    protected void finalize() {
         alive = false;
         synchronized (this) {
             notifyAll();

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

@@ -13,6 +13,6 @@ public interface DSIConnectionDescendant {
      * Called when the ancestral DSIConnectionDescendant changes state.  The subtree of this instance will not
      * notified, that is the responsibility of the DSIConnectionDescendant implementation..
      */
-    public void onConnectionChange(DSConnection conn);
+    void onConnectionChange(DSConnection conn);
 
 }

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

@@ -12,51 +12,51 @@ public interface Action extends Node {
     /**
      * Only needed for a VALUES type actions, and optional even then.
      */
-    public default int getColumnCount() {
+    default int getColumnCount() {
         return 0;
     }
 
     /**
      * Add the metadata for the column at the given index to the bucket.  Only called before the
      * action invocation.  Throws an IllegalStateException by default.
      */
-    public default void getColumnMetadata(int idx, DSMap bucket) {
+    default void getColumnMetadata(int idx, DSMap bucket) {
         throw new IllegalStateException("Method not overridden");
     }
 
     /**
      * Return 0 or less if there are no parameters.  Returns 0 by default.
      */
-    public default int getParameterCount() {
+    default int getParameterCount() {
         return 0;
     }
 
     /**
      * Add the metadata for the parameter at the given index to the bucket.  Throws an
      * IllegalStateException by default.
      */
-    public default void getParameterMetadata(int idx, DSMap bucket) {
+    default void getParameterMetadata(int idx, DSMap bucket) {
         throw new IllegalStateException("Method not overridden");
     }
 
     /**
      * What the action returns, returns VOID by default.
      */
-    public default ResultsType getResultsType() {
+    default ResultsType getResultsType() {
         return ResultsType.VOID;
     }
 
     /**
      * Whether or not the action requires write permission.  Returns false by default.
      */
-    public default boolean isReadOnly() {
+    default boolean isReadOnly() {
         return false;
     }
 
     /**
      * Defines what the action returns.
      */
-    public enum ResultsType {
+    enum ResultsType {
 
         /**
          * A stream of rows.  Clients can choose to trim rows for memory management.

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

@@ -15,18 +15,18 @@ public interface ActionRequest {
     /**
      * For use with streams and AsyncActionResults, will have no effect if already closed.
      */
-    public void close();
+    void close();
 
     /**
      * Close and send an error. For use with streams and AsyncActionResults, will have no effect
      * if already closed.
      */
-    public void close(Exception reason);
+    void close(Exception reason);
 
     /**
      * A convenience for getting a single parameter out of the parameters map.
      */
-    public default DSElement getParameter(String key) {
+    default DSElement getParameter(String key) {
         DSMap map = getParameters();
         if (map == null) {
             return null;
@@ -37,17 +37,17 @@ public default DSElement getParameter(String key) {
     /**
      * The parameters supplied by the invoker, or null.
      */
-    public DSMap getParameters();
+    DSMap getParameters();
 
     /**
      * The permission level of the invoker.
      */
-    public DSPermission getPermission();
+    DSPermission getPermission();
 
     /**
      * Whether or not response is still open.
      */
-    public boolean isOpen();
+    boolean isOpen();
 
     /**
      * This is for streams and AsyncActionResults.  Call this after returning false
@@ -56,6 +56,6 @@ public default DSElement getParameter(String key) {
      *
      * @see AsyncActionResults
      */
-    public void sendResults();
+    void sendResults();
 
 }

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

@@ -16,23 +16,23 @@ public interface ActionResults {
     /**
      * Unless the result type is void, this should return a value greater than zero.
      */
-    public int getColumnCount();
+    int getColumnCount();
 
     /**
      * Only needed if the column count is greater than 0.
      */
-    public void getColumnMetadata(int idx, DSMap bucket);
+    void getColumnMetadata(int idx, DSMap bucket);
 
     /**
      * The implementation should add the values of the current row to the given bucket.  The
      * bucket can be reused across calls, the implementation should not cache references to it.
      */
-    public void getResults(DSList bucket);
+    void getResults(DSList bucket);
 
     /**
      * Determines how the results should be used.
      */
-    public ResultsType getResultsType();
+    ResultsType getResultsType();
 
     /**
      * Initially, this cursor must be positioned before the first set of results. Return true to
@@ -42,12 +42,12 @@ public interface ActionResults {
      * will be closed once this returns false.  This will only be called once for a results
      * type of VALUES.
      */
-    public boolean next();
+    boolean next();
 
     /**
      * Always called, does nothing by default.
      */
-    public default void onClose() {
+    default void onClose() {
     }
 
 }

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

@@ -25,7 +25,7 @@ public interface DSIRequester {
      * @return The handler parameter.
      * @see AbstractInvokeHandler
      */
-    public OutboundInvokeHandler invoke(String path, DSMap params, OutboundInvokeHandler handler);
+    OutboundInvokeHandler invoke(String path, DSMap params, OutboundInvokeHandler handler);
 
     /**
      * Submits a list request.  Child names do not need to be encoded unless they contain
@@ -38,7 +38,7 @@ public interface DSIRequester {
      * @see org.iot.dsa.node.DSPath#encodeName(String)
      * @see org.iot.dsa.node.DSPath#decodeName(String)
      */
-    public OutboundListHandler list(String path, OutboundListHandler handler);
+    OutboundListHandler list(String path, OutboundListHandler handler);
 
     /**
      * Submits request to remove an attribute.
@@ -47,7 +47,7 @@ public interface DSIRequester {
      * @return The handler parameter.
      * @see SimpleRequestHandler
      */
-    public OutboundRequestHandler remove(String path, OutboundRequestHandler handler);
+    OutboundRequestHandler remove(String path, OutboundRequestHandler handler);
 
     /**
      * Submits a set request.
@@ -56,7 +56,7 @@ public interface DSIRequester {
      * @return The handler parameter.
      * @see SimpleRequestHandler
      */
-    public OutboundRequestHandler set(String path, DSIValue value, OutboundRequestHandler handler);
+    OutboundRequestHandler set(String path, DSIValue value, OutboundRequestHandler handler);
 
     /**
      * Submits a subscribe request.
@@ -66,8 +66,8 @@ public interface DSIRequester {
      * @return The handler parameter.
      * @see AbstractSubscribeHandler
      */
-    public OutboundSubscribeHandler subscribe(String path, DSIValue qos,
-                                              OutboundSubscribeHandler handler);
+    OutboundSubscribeHandler subscribe(String path, DSIValue qos,
+                                       OutboundSubscribeHandler handler);
 
 }
 

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

@@ -32,7 +32,7 @@ public interface DSIResponder {
      * @return The initial response and close notification mechanism, can be null if the if the
      * result type is void.
      */
-    public ActionResults onInvoke(InboundInvokeRequest request);
+    ActionResults onInvoke(InboundInvokeRequest request);
 
     /**
      * The implementation should quickly create an object for responding to the request, but do no
@@ -42,15 +42,15 @@ public interface DSIResponder {
      * @param request The details of the request and the mechanism for providing updates.
      * @return The initial response and close mechanism.
      */
-    public ListCloseHandler onList(InboundListRequest request);
+    ListCloseHandler onList(InboundListRequest request);
 
     /**
      * The implementation should do no processing of it on the calling thread. Simply throw a
      * descriptive exception to report an error with the request.
      *
      * @param request The details of the request.
      */
-    public void onSet(InboundSetRequest request);
+    void onSet(InboundSetRequest request);
 
     /**
      * The implementation should quickly create an object for responding to the request, but do no
@@ -60,6 +60,6 @@ public interface DSIResponder {
      * @param request The details of the request and the mechanism for sending updates.
      * @return Who to notify when the subscription is closed.
      */
-    public SubscriptionCloseHandler onSubscribe(InboundSubscribeRequest request);
+    SubscriptionCloseHandler onSubscribe(InboundSubscribeRequest request);
 
 }

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

@@ -9,17 +9,23 @@
  */
 public interface DSISession extends DSIObject {
 
-    public DSLinkConnection getConnection();
+    DSLinkConnection getConnection();
 
-    public DSIRequester getRequester();
+    DSIRequester getRequester();
 
-    public boolean isRequesterAllowed();
+    boolean isRequesterAllowed();
 
     /**
      * Read the next message.  Intended to be called by the transport.
      *
      * @param async If false, the messsage will be read on the calling thread.
      */
-    public void recvMessage(boolean async);
+    void recvMessage(boolean async);
+
+    /**
+     * An object has been added to the tree, use this to update existing list and
+     * subscription requests for everything starting with this path.
+     */
+    void update(String path);
 
 }