0.32.0

Author: a-hansen

build.gradle

@@ -4,7 +4,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.31.0'
+    version '0.32.0'
 
     sourceCompatibility = 1.6
     targetCompatibility = 1.6

dslink-v2-poc/dslink.json

@@ -10,9 +10,9 @@
       "value": "org.iot.dsa.dslink.poc.MainNode"
     },
     "log": {
-      "desc": "all, trace, debug, fine, warn, info, error, admin, fatal, none",
+      "desc": "all, trace, debug, warn, info, error, admin, fatal, none",
       "type": "enum",
-      "value": "warn"
+      "value": "info"
     },
     "token": {
       "desc": "Authentication token for the broker.",

dslink-v2-websocket/src/main/java/org/iot/dsa/dslink/websocket/WsBinaryTransport.java

@@ -5,8 +5,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
 import javax.websocket.*;
 import org.glassfish.tyrus.client.ClientManager;
 import org.iot.dsa.util.DSException;
@@ -100,7 +98,7 @@ public DSTransport open() {
             client.setDefaultMaxBinaryMessageBufferSize(64 * 1024);
             client.setDefaultMaxTextMessageBufferSize(64 * 1024);
             client.connectToServer(this, new URI(getConnectionUrl()));
-            fine(fine() ? "Transport open" : null);
+            debug(debug() ? "Transport open" : null);
         } catch (Exception x) {
             DSException.throwRuntime(x);
         }

dslink-v2-websocket/src/main/java/org/iot/dsa/dslink/websocket/WsTextTransport.java

@@ -8,9 +8,15 @@
 import java.io.Reader;
 import java.io.Writer;
 import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import javax.websocket.*;
+import javax.websocket.ClientEndpoint;
+import javax.websocket.CloseReason;
+import javax.websocket.EndpointConfig;
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.RemoteEndpoint;
+import javax.websocket.Session;
 import org.glassfish.tyrus.client.ClientManager;
 import org.iot.dsa.util.DSException;
 
@@ -54,6 +60,7 @@ public DSTransport close() {
             return this;
         }
         open = false;
+        debug(debug() ? "WsTextTransport.close()" : null, new Exception());
         try {
             if (session != null) {
                 session.close();
@@ -126,7 +133,9 @@ public void onMessage(Session session, String msgPart, boolean isLast) {
     @OnOpen
     public void onOpen(Session session, EndpointConfig config) {
         open = true;
+        buffer.open();
         this.session = session;
+        debug("WsTextTransport open");
     }
 
     @Override
@@ -141,9 +150,6 @@ public DSTransport open() {
             client.setDefaultMaxBinaryMessageBufferSize(64 * 1024);
             client.setDefaultMaxTextMessageBufferSize(64 * 1024);
             client.connectToServer(this, new URI(getConnectionUrl()));
-            buffer.open();
-            open = true;
-            fine(fine() ? "Transport open" : null);
         } catch (Exception x) {
             DSException.throwRuntime(x);
         }
@@ -159,7 +165,7 @@ public DSTransport open() {
      */
     public void write(String text, boolean isLast) {
         if (!open) {
-            throw new DSIoException("Closed " + getConnectionUrl());
+            throw new DSIoException("Not open " + getConnectionUrl());
         }
         try {
             RemoteEndpoint.Basic basic = session.getBasicRemote();

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/Template.java

@@ -45,7 +45,7 @@ public int available() {
     public synchronized void clear() {
         length = 0;
         offset = 0;
-        notify();
+        notifyAll();
     }
 
     /**
@@ -56,7 +56,7 @@ public synchronized void close() {
             return;
         }
         open = false;
-        notify();
+        notifyAll();
     }
 
     /**
@@ -68,7 +68,7 @@ public synchronized void close(RuntimeException toThrow) {
         }
         closeException = toThrow;
         open = false;
-        notify();
+        notifyAll();
     }
 
     /**
@@ -106,7 +106,7 @@ public synchronized void open() {
         offset = 0;
         open = true;
         closeException = null;
-        notify();
+        notifyAll();
     }
 
     /**
@@ -128,7 +128,7 @@ public synchronized void put(char b) {
         }
         buffer[length + offset] = b;
         length++;
-        notify();
+        notifyAll();
     }
 
     /**
@@ -163,7 +163,7 @@ public synchronized void put(char[] msg, int off, int len) {
         //System.arraycopy(msg, off, buffer, length + offset, len);
         System.arraycopy(msg, off, buffer, offset, len);
         length += len;
-        notify();
+        notifyAll();
     }
 
     /**
@@ -185,7 +185,7 @@ public synchronized void put(String msg) {
         }
         msg.getChars(0, len, buffer, offset + length);
         length += len;
-        notify();
+        notifyAll();
     }
 
     /**
@@ -204,7 +204,7 @@ public synchronized int read() {
             } catch (InterruptedException ignore) {
             }
         }
-        notify();
+        notifyAll();
         if (!open) {
             if (length == 0) {
                 if (closeException != null) {
@@ -241,7 +241,7 @@ public synchronized int read(char[] buf, int off, int len) {
             } catch (InterruptedException ignore) {
             }
         }
-        notify();
+        notifyAll();
         if (!open) {
             if (length == 0) {
                 if (closeException != null) {