0.53.0

- Combine text and binary transports into one.
- Add more logging methods to DSLogger.
- Event and action invocation logging in DSNode, really nice!

Author: a-hansen

build.gradle

@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.52.0'
+    version '0.53.0'
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

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

@@ -0,0 +1,56 @@
+package org.iot.dsa.dslink.websocket;
+
+import com.acuity.iot.dsa.dslink.sys.cert.SysCertService;
+import com.acuity.iot.dsa.dslink.transport.DSTransportWs;
+import java.net.URI;
+import javax.websocket.ClientEndpoint;
+import org.glassfish.tyrus.client.ClientManager;
+import org.glassfish.tyrus.client.ClientProperties;
+import org.glassfish.tyrus.client.SslContextConfigurator;
+import org.glassfish.tyrus.client.SslEngineConfigurator;
+import org.iot.dsa.util.DSException;
+
+/**
+ * Websocket client implementation of DSTextTransport based on Tyrus, the reference implementation
+ * of JSR 356.
+ *
+ * @author Aaron Hansen
+ */
+@ClientEndpoint
+public class ClientTransport extends DSTransportWs {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private ClientManager client;
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - In alphabetical order by method name.
+    /////////////////////////////////////////////////////////////////
+
+    @Override
+    public void open() {
+        try {
+            if (isOpen()) {
+                return;
+            }
+            if (client == null) {
+                client = ClientManager.createClient();
+            }
+            URI connUri = new URI(getConnectionUrl());
+            if ("wss".equalsIgnoreCase(connUri.getScheme())) {
+                SslEngineConfigurator sslEngineConfigurator = new SslEngineConfigurator(
+                        new SslContextConfigurator());
+                sslEngineConfigurator
+                        .setHostnameVerifier(SysCertService.getInstance().getHostnameVerifier());
+                client.getProperties()
+                      .put(ClientProperties.SSL_ENGINE_CONFIGURATOR, sslEngineConfigurator);
+            }
+            client.connectToServer(this, connUri);
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+    }
+
+}

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

@@ -1,27 +1,19 @@
 package org.iot.dsa.dslink.websocket;
 
-import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
-import com.acuity.iot.dsa.dslink.transport.DSTextTransport;
 import com.acuity.iot.dsa.dslink.transport.DSTransport.Factory;
 import org.iot.dsa.dslink.DSLinkConnection;
-import org.iot.dsa.logging.DSLogger;
 
 /**
  * Websocket client implementation of DSTransport.Factory based on Tyrus, the reference
  * implementation of JSR 356.
  *
  * @author Aaron Hansen
  */
-public class StandaloneTransportFactory extends DSLogger implements Factory {
+public class StandaloneTransportFactory implements Factory {
 
     @Override
-    public DSBinaryTransport makeBinaryTransport(DSLinkConnection conn) {
-        return new WsBinaryTransport();
-    }
-
-    @Override
-    public DSTextTransport makeTextTransport(DSLinkConnection conn) {
-        return new WsTextTransport();
+    public ClientTransport makeTransport(DSLinkConnection conn) {
+        return new ClientTransport();
     }
 
 }