0.72.0

* Fix node encoding
* More typing fixes
* Complete genericizing DSInfo
* Fix action groups not working
* Refactor InboundListRequest
* Fix duplicate subscription
* Misc cleanup based on Intellij code analysis
* Syncing sys.logging with internal usage

Author: a-hansen

build.gradle

@@ -5,8 +5,8 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.71.0'
-    
+    version '0.72.0'
+
     targetCompatibility = JavaVersion.VERSION_1_8
     sourceCompatibility = JavaVersion.VERSION_1_8
 
@@ -21,7 +21,7 @@ subprojects {
     jar {
         manifest {
             attributes(
-                    'Automatic-Module-Name' : 'org.iot.dsa.' + project.name.replaceAll('-','.')
+                    'Automatic-Module-Name': 'org.iot.dsa.' + project.name.replaceAll('-', '.')
             )
         }
     }

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

@@ -127,9 +127,9 @@ public static Timer runDelayed(Runnable arg, long delayMillis) {
      */
     private static void executeTimers() {
         long now = System.nanoTime();
-        long nextCycleTmp = now + 60000000000l;
-        Timer current = null;
-        Timer next = null;
+        long nextCycleTmp = now + 60000000000L;
+        Timer current;
+        Timer next;
         Timer keepHead = null;
         Timer keepTail = null;
         long tmp;
@@ -250,10 +250,10 @@ public static class Timer implements Runnable {
         private long count = 0;
         boolean done = false;
         boolean hasRun = false;
-        private long interval = 0;
+        private long interval;
         private long lastRun = 0;
         private Timer next; //linked list
-        private long nextRun = 0;
+        private long nextRun;
         private Runnable runnable;
         private boolean running = false;
         private boolean skipMissed = true;

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

@@ -22,8 +22,8 @@ class DSThreadPool {
 
     private boolean alive = true;
     private int idleThreads = 0;
-    private int max = -1;
-    private int min = 1;
+    private int max;
+    private int min;
     private int numThreads = 0;
     private LinkedList queue = new LinkedList();
     private String threadName;
@@ -183,7 +183,7 @@ public DSThread(String name) {
         }
 
         public void run() {
-            long start = 0;
+            long start;
             Runnable r = null;
             try {
                 while (alive) {

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

@@ -38,8 +38,8 @@ public abstract class DSBaseConnection extends DSEnabledNode implements DSIStatu
 
     protected boolean down = getDefaultStatus().isDown();
     protected boolean fault = false;
-    protected DSInfo lastFail = getInfo(LAST_FAIL);
-    protected DSInfo lastOk = getInfo(LAST_OK);
+    protected DSInfo<?> lastFail = getInfo(LAST_FAIL);
+    protected DSInfo<?> lastOk = getInfo(LAST_OK);
     protected long lastOkMillis;
 
     ///////////////////////////////////////////////////////////////////////////

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

@@ -66,8 +66,8 @@ public abstract class DSConnection extends DSBaseConnection {
     private long lastConnectAttempt = 0;
     private long lastPing;
     private long retryConnectMs = 0;
-    protected DSInfo state = getInfo(STATE);
-    protected DSInfo stateTime = getInfo(STATE_TIME);
+    protected DSInfo<?> state = getInfo(STATE);
+    protected DSInfo<?> stateTime = getInfo(STATE_TIME);
     private DSRuntime.Timer updateTimer;
     private boolean updating = false;
 
@@ -330,7 +330,7 @@ protected void onStable() {
     protected void startUpdateTimer() {
         if (updateTimer == null) {
             updateTimer = DSRuntime
-                    .run(() -> updateState(), System.currentTimeMillis(), getUpdateInterval());
+                    .run(this::updateState, System.currentTimeMillis(), getUpdateInterval());
         }
     }
 
@@ -399,7 +399,7 @@ protected void updateState() {
      * DSIConnectionDescendant and DSConnection.
      */
     private void notifyConnectedDescendants(DSNode node, DSConnection conn) {
-        DSInfo info = node.getFirstInfo();
+        DSInfo<?> info = node.getFirstInfo();
         while (info != null) {
             if (info.is(DSIConnectionDescendant.class)) {
                 try {

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

@@ -26,7 +26,7 @@ public enum DSConnectionState implements DSIEnum, DSIValue {
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    private DSConnectionState(String display) {
+    DSConnectionState(String display) {
         this.element = DSString.valueOf(display);
     }
 

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

@@ -47,7 +47,7 @@ public default ResultsType getResultsType() {
     }
 
     /**
-     * Whether or not the action the action requires write permission.  Returns false by default.
+     * Whether or not the action requires write permission.  Returns false by default.
      */
     public default boolean isReadOnly() {
         return false;

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

@@ -115,7 +115,7 @@ public String getPathInBroker(DSNode node) {
      * @param config Configuration options
      */
     public static DSLink load(DSLinkOptions config) {
-        DSLink ret = null;
+        DSLink ret;
         File nodes = config.getNodesFile();
         if (nodes.exists()) {
             long time = System.currentTimeMillis();
@@ -172,13 +172,9 @@ public void run() {
             } catch (Throwable t) {
                 debug(null, t);
             }
-            Runtime.getRuntime().addShutdownHook(new Thread() {
-                public void run() {
-                    shutdown();
-                }
-            });
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> shutdown()));
             start();
-            long stableDelay = options.getConfig(DSLinkOptions.CFG_STABLE_DELAY, 2000l);
+            long stableDelay = options.getConfig(DSLinkOptions.CFG_STABLE_DELAY, 2000L);
             try {
                 Thread.sleep(stableDelay);
             } catch (Exception x) {
@@ -202,8 +198,7 @@ public void run() {
                 DSException.throwRuntime(x);
             }
             LogManager.getLogManager().reset();
-            Logger logger = Logger.getLogger("");
-            for (Handler h : logger.getLogger("").getHandlers()) {
+            for (Handler h : Logger.getLogger("").getHandlers()) {
                 h.close();
             }
         } finally {

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

@@ -103,7 +103,7 @@ protected void doDisconnect() {
     @Override
     protected void onDisconnected() {
         super.onDisconnected();
-        DSInfo info = getInfo(TRANSPORT);
+        DSInfo<?> info = getInfo(TRANSPORT);
         if (info != null) {
             remove(info.setLocked(false));
         }

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

@@ -182,7 +182,7 @@ public String getDslinkJson() {
      */
     public DSMap getDslinkMap() {
         if (dslinkMap == null) {
-            File file = null;
+            File file;
             if (home != null) { //home cannot be in dslink.json
                 file = makeFile(getHome(), getDslinkJson());
             } else {