Migrated to camel undertow component for websockets (openremote#1082)

black-device · Jun 29, 2023 · c9b5ef3 · c9b5ef3
1 parent bd69894
commit c9b5ef3
Show file tree

Hide file tree

Showing 20 changed files with 293 additions and 986 deletions.
diff --git a/container/src/main/java/org/openremote/container/message/MessageBrokerService.java b/container/src/main/java/org/openremote/container/message/MessageBrokerService.java
@@ -40,8 +40,6 @@
 import org.apache.camel.util.concurrent.CamelThreadFactory;
 import org.openremote.container.concurrent.ContainerExecutor;
 import org.openremote.container.concurrent.ContainerScheduledExecutor;
-import org.openremote.container.web.DefaultWebsocketComponent;
-import org.openremote.container.web.socket.WebsocketComponent;
 import org.openremote.model.Container;
 import org.openremote.model.ContainerService;
 
@@ -51,12 +49,8 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.logging.Logger;
 
-import static org.openremote.container.util.MapAccess.getString;
-
 public class MessageBrokerService implements ContainerService {
 
-    public static final String MESSAGE_SESSION_ALLOWED_ORIGIN = "MESSAGE_SESSION_ALLOWED_ORIGIN";
-    public static final String MESSAGE_SESSION_ALLOWED_ORIGIN_DEFAULT = null;
     private static final Logger LOG = Logger.getLogger(MessageBrokerService.class.getName());
     public static final int PRIORITY = ContainerService.LOW_PRIORITY;
 
@@ -142,13 +136,6 @@ protected String getExecutorName(String name, ThreadFactory threadFactory) {
 
         ((SimpleRegistry)((DefaultRegistry)context.getRegistry()).getFallbackRegistry()).put("OpenRemote", Map.of(Container.class, container));
 
-        String allowedOrigin = getString(container.getConfig(), MESSAGE_SESSION_ALLOWED_ORIGIN, MESSAGE_SESSION_ALLOWED_ORIGIN_DEFAULT);
-        WebsocketComponent websocketComponent = new DefaultWebsocketComponent(
-            container,
-            allowedOrigin
-        );
-
-        context.addComponent(WebsocketComponent.NAME, websocketComponent);
         context.addComponent("snmp", new SnmpComponent());
     }
 

diff --git a/container/src/main/java/org/openremote/container/web/ConnectionConstants.java b/container/src/main/java/org/openremote/container/web/ConnectionConstants.java
diff --git a/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java b/container/src/main/java/org/openremote/container/web/DefaultWebsocketComponent.java
diff --git a/container/src/main/java/org/openremote/container/web/WebService.java b/container/src/main/java/org/openremote/container/web/WebService.java
@@ -301,6 +301,10 @@ protected ResteasyDeployment createResteasyDeployment(Container container, Colle
         return resteasyDeployment;
     }
 
+    public Undertow getUndertow() {
+        return undertow;
+    }
+
     public static synchronized FilterInfo getCorsFilterInfo(Container container) {
 
         if (corsFilterRef == null) {

diff --git a/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.java b/container/src/main/java/org/openremote/container/web/socket/MemoryWebsocketSessions.java