WIP transport refactor

eclipse · Sep 19, 2022 · 8763bf4 · 8763bf4
1 parent 00de8c6
commit 8763bf4
Show file tree

Hide file tree

Showing 18 changed files with 202 additions and 91 deletions.
diff --git a/opc-ua-stack/client-transport-https/pom.xml b/opc-ua-stack/client-transport-https/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2022 the Eclipse Milo Authors
+  ~
+  ~ This program and the accompanying materials are made
+  ~ available under the terms of the Eclipse Public License 2.0
+  ~ which is available at https://www.eclipse.org/legal/epl-2.0/
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.milo</groupId>
+        <artifactId>opc-ua-stack</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>client-transport-https</artifactId>
+
+    <properties>
+        <javaModuleName>org.eclipse.milo.opcua.stack.client.transport.https</javaModuleName>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.milo</groupId>
+            <artifactId>stack-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.milo</groupId>
+            <artifactId>stack-client</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.milo</groupId>
+            <artifactId>client-transport</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>23.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.9.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/opc-ua-stack/client-transport-websocket/pom.xml b/opc-ua-stack/client-transport-websocket/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2022 the Eclipse Milo Authors
+  ~
+  ~ This program and the accompanying materials are made
+  ~ available under the terms of the Eclipse Public License 2.0
+  ~ which is available at https://www.eclipse.org/legal/epl-2.0/
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.milo</groupId>
+        <artifactId>opc-ua-stack</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>client-transport-websocket</artifactId>
+
+    <properties>
+        <javaModuleName>org.eclipse.milo.opcua.stack.client.transport.websocket</javaModuleName>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.milo</groupId>
+            <artifactId>stack-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.milo</groupId>
+            <artifactId>stack-client</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.milo</groupId>
+            <artifactId>client-transport</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>23.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.9.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/opc-ua-stack/transport/pom.xml → opc-ua-stack/client-transport/pom.xml b/opc-ua-stack/transport/pom.xml → opc-ua-stack/client-transport/pom.xml
@@ -19,10 +19,10 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>transport</artifactId>
+    <artifactId>client-transport</artifactId>
 
     <properties>
-        <javaModuleName>org.eclipse.milo.opcua.stack.transport</javaModuleName>
+        <javaModuleName>org.eclipse.milo.opcua.stack.client.transport</javaModuleName>
     </properties>
 
     <dependencies>

diff --git a/.../opcua/stack/transport/ClientFactory.java → ...opcua/stack/transport/AbstractClient.java b/.../opcua/stack/transport/ClientFactory.java → ...opcua/stack/transport/AbstractClient.java
@@ -13,16 +13,19 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
 import org.eclipse.milo.opcua.stack.core.Stack;
 import org.eclipse.milo.opcua.stack.core.StatusCodes;
 import org.eclipse.milo.opcua.stack.core.UaException;
+import org.eclipse.milo.opcua.stack.core.types.UaRequestMessageType;
+import org.eclipse.milo.opcua.stack.core.types.UaResponseMessageType;
 import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription;
 import org.eclipse.milo.opcua.stack.core.util.EndpointUtil;
 
-public class ClientFactory {
-
+public abstract class AbstractClient {
 
     public static AbstractClient create(OpcTransportConfig config) {
         return null;
@@ -69,10 +72,46 @@ public static AbstractClient create(
         var configBuilder = new ClientConfigBuilder() {};
         ClientConfig config = buildConfig.apply(configBuilder);
 
-        OpcTransport transport = TransportFactory.getInstance().create(profileUri, config);
+        OpcTransport transport = ClientTransportFactory.getInstance().create(profileUri, config);
 
         return new AbstractClient(transport) {};
     }
 
+    private final OpcTransport transport;
+
+    public AbstractClient(OpcTransport transport) {
+        this.transport = transport;
+    }
+
+    public void connect() throws UaException {
+        try {
+            transport.connect().get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw UaException.extract(e)
+                .orElseGet(() -> new UaException(StatusCodes.Bad_UnexpectedError, e));
+        }
+    }
+
+    public void disconnect() throws UaException {
+        try {
+            transport.disconnect().get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw UaException.extract(e)
+                .orElseGet(() -> new UaException(StatusCodes.Bad_UnexpectedError, e));
+        }
+    }
+
+    public UaResponseMessageType sendRequest(UaRequestMessageType request) throws UaException {
+        try {
+            return transport.sendRequestMessage(request).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw UaException.extract(e)
+                .orElseGet(() -> new UaException(StatusCodes.Bad_UnexpectedError, e));
+        }
+    }
+
+    public CompletableFuture<UaResponseMessageType> sendRequestAsync(UaRequestMessageType request) {
+        return transport.sendRequestMessage(request);
+    }
 
 }
diff --git a/...o/opcua/stack/transport/ClientConfig.java → ...o/opcua/stack/transport/ClientConfig.java b/...o/opcua/stack/transport/ClientConfig.java → ...o/opcua/stack/transport/ClientConfig.java
diff --git a/.../stack/transport/ClientConfigBuilder.java → .../stack/transport/ClientConfigBuilder.java b/.../stack/transport/ClientConfigBuilder.java → .../stack/transport/ClientConfigBuilder.java
diff --git a/...cua/stack/transport/TransportFactory.java → ...ack/transport/ClientTransportFactory.java b/...cua/stack/transport/TransportFactory.java → ...ack/transport/ClientTransportFactory.java
@@ -17,17 +17,18 @@
 import org.eclipse.milo.opcua.stack.core.Stack;
 import org.eclipse.milo.opcua.stack.core.StatusCodes;
 import org.eclipse.milo.opcua.stack.core.UaException;
+import org.eclipse.milo.opcua.stack.transport.tcp.OpcTcpTransport;
 
-public class TransportFactory {
+public class ClientTransportFactory {
 
-    private static final TransportFactory INSTANCE;
+    private static final ClientTransportFactory INSTANCE;
 
     static {
-        INSTANCE = new TransportFactory();
+        INSTANCE = new ClientTransportFactory();
         INSTANCE.register(Stack.TCP_UASC_UABINARY_TRANSPORT_URI, new OpcTcpTransportFactory());
     }
 
-    public static TransportFactory getInstance() {
+    public static ClientTransportFactory getInstance() {
         return INSTANCE;
     }
 

diff --git a/...o/opcua/stack/transport/OpcTransport.java → ...o/opcua/stack/transport/OpcTransport.java b/...o/opcua/stack/transport/OpcTransport.java → ...o/opcua/stack/transport/OpcTransport.java
diff --git a/...a/stack/transport/OpcTransportConfig.java → ...a/stack/transport/OpcTransportConfig.java b/...a/stack/transport/OpcTransportConfig.java → ...a/stack/transport/OpcTransportConfig.java
diff --git a/...pcua/stack/transport/OpcTcpTransport.java → .../stack/transport/tcp/OpcTcpTransport.java b/...pcua/stack/transport/OpcTcpTransport.java → .../stack/transport/tcp/OpcTcpTransport.java
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.milo.opcua.stack.transport;
+package org.eclipse.milo.opcua.stack.transport.tcp;
 
 import java.net.ConnectException;
 import java.util.Map;
@@ -51,6 +51,7 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.RequestHeader;
 import org.eclipse.milo.opcua.stack.core.util.EndpointUtil;
 import org.eclipse.milo.opcua.stack.core.util.Unit;
+import org.eclipse.milo.opcua.stack.transport.OpcTransport;
 import org.eclipse.milo.opcua.stack.transport.uasc.UascClientAcknowledgeHandler;
 import org.eclipse.milo.opcua.stack.transport.uasc.UascClientConfig;
 import org.eclipse.milo.opcua.stack.transport.uasc.UascClientResponseHandler;

diff --git a/...rt/uasc/UascClientAcknowledgeHandler.java → ...rt/uasc/UascClientAcknowledgeHandler.java b/...rt/uasc/UascClientAcknowledgeHandler.java → ...rt/uasc/UascClientAcknowledgeHandler.java
diff --git a/...tack/transport/uasc/UascClientConfig.java → ...tack/transport/uasc/UascClientConfig.java b/...tack/transport/uasc/UascClientConfig.java → ...tack/transport/uasc/UascClientConfig.java
diff --git a/...nsport/uasc/UascClientMessageHandler.java → ...nsport/uasc/UascClientMessageHandler.java b/...nsport/uasc/UascClientMessageHandler.java → ...nsport/uasc/UascClientMessageHandler.java
diff --git a/...sport/uasc/UascClientResponseHandler.java → ...sport/uasc/UascClientResponseHandler.java b/...sport/uasc/UascClientResponseHandler.java → ...sport/uasc/UascClientResponseHandler.java
diff --git a/...cua/stack/transport/uasc/UascMessage.java → ...cua/stack/transport/uasc/UascMessage.java b/...cua/stack/transport/uasc/UascMessage.java → ...cua/stack/transport/uasc/UascMessage.java
diff --git a/opc-ua-stack/pom.xml b/opc-ua-stack/pom.xml
@@ -23,14 +23,16 @@
     <packaging>pom</packaging>
 
     <modules>
+        <module>client-transport</module>
+        <module>client-transport-https</module>
+        <module>client-transport-websocket</module>
         <module>encoding-json</module>
         <module>encoding-xml</module>
         <module>guava-dependencies</module>
         <module>stack-client</module>
         <module>stack-core</module>
         <module>stack-server</module>
         <module>stack-tests</module>
-        <module>transport</module>
     </modules>
 
     <build>

diff --git a/opc-ua-stack/stack-tests/pom.xml b/opc-ua-stack/stack-tests/pom.xml
@@ -38,26 +38,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.milo</groupId>
-            <artifactId>transport</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.0</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.testng</groupId>

diff --git a/...-stack/transport/src/main/java/org/eclipse/milo/opcua/stack/transport/AbstractClient.java b/...-stack/transport/src/main/java/org/eclipse/milo/opcua/stack/transport/AbstractClient.java