SCI's can't add websocket endpoints

Fixes #19781
quarkusio · Sep 6, 2021 · fc511ef · fc511ef
1 parent 9eb3e8b
commit fc511ef
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 10 deletions.
diff --git a/...ndertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java b/...ndertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java
@@ -523,7 +523,11 @@ public void run() {
     }
 
     public void addServletContextAttribute(RuntimeValue<DeploymentInfo> deployment, String key, Object value1) {
-        deployment.getValue().addServletContextAttribute(key, value1);
+        if (value1 instanceof RuntimeValue) {
+            deployment.getValue().addServletContextAttribute(key, ((RuntimeValue<?>) value1).getValue());
+        } else {
+            deployment.getValue().addServletContextAttribute(key, value1);
+        }
     }
 
     public void addServletExtension(RuntimeValue<DeploymentInfo> deployment, ServletExtension extension) {

diff --git a/extensions/websockets/client/deployment/pom.xml b/extensions/websockets/client/deployment/pom.xml
@@ -21,6 +21,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-websockets-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>

diff --git a/.../main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java b/.../main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java
@@ -12,6 +12,7 @@
 import javax.websocket.ContainerProvider;
 import javax.websocket.Endpoint;
 import javax.websocket.server.ServerApplicationConfig;
+import javax.websocket.server.ServerContainer;
 import javax.websocket.server.ServerEndpointConfig;
 
 import org.jboss.jandex.AnnotationInstance;
@@ -34,10 +35,11 @@
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
-import io.quarkus.netty.deployment.EventLoopSupplierBuildItem;
 import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.undertow.deployment.ServletContextAttributeBuildItem;
 import io.quarkus.undertow.websockets.client.runtime.WebsocketCoreRecorder;
 import io.undertow.websockets.DefaultContainerConfigurator;
+import io.undertow.websockets.ServerWebSocketContainer;
 import io.undertow.websockets.UndertowContainerProvider;
 import io.undertow.websockets.WebSocketDeploymentInfo;
 
@@ -70,16 +72,16 @@ void scanForAnnotatedEndpoints(CombinedIndexBuildItem indexBuildItem,
     }
 
     @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
+    @Record(ExecutionTime.STATIC_INIT)
     public ServerWebSocketContainerBuildItem deploy(final CombinedIndexBuildItem indexBuildItem,
             WebsocketCoreRecorder recorder,
             BuildProducer<ReflectiveClassBuildItem> reflection,
-            EventLoopSupplierBuildItem eventLoopSupplierBuildItem,
             List<AnnotatedWebsocketEndpointBuildItem> annotatedEndpoints,
             BeanContainerBuildItem beanContainerBuildItem,
             WebsocketConfig websocketConfig,
             BuildProducer<WebSocketDeploymentInfoBuildItem> infoBuildItemBuildProducer,
-            Optional<ServerWebSocketContainerFactoryBuildItem> factoryBuildItem) throws Exception {
+            Optional<ServerWebSocketContainerFactoryBuildItem> factoryBuildItem,
+            BuildProducer<ServletContextAttributeBuildItem> servletContextAttributeBuildItemBuildProducer) throws Exception {
 
         final Set<String> endpoints = new HashSet<>();
         final Set<String> config = new HashSet<>();
@@ -121,10 +123,14 @@ public ServerWebSocketContainerBuildItem deploy(final CombinedIndexBuildItem ind
                 websocketConfig.maxFrameSize,
                 websocketConfig.dispatchToWorker);
         infoBuildItemBuildProducer.produce(new WebSocketDeploymentInfoBuildItem(deploymentInfo));
+        RuntimeValue<ServerWebSocketContainer> serverContainer = recorder.createServerContainer(
+                beanContainerBuildItem.getValue(),
+                deploymentInfo,
+                factoryBuildItem.map(ServerWebSocketContainerFactoryBuildItem::getFactory).orElse(null));
+        servletContextAttributeBuildItemBuildProducer
+                .produce(new ServletContextAttributeBuildItem(ServerContainer.class.getName(), serverContainer));
         return new ServerWebSocketContainerBuildItem(
-                recorder.createServerContainer(beanContainerBuildItem.getValue(), eventLoopSupplierBuildItem.getMainSupplier(),
-                        deploymentInfo,
-                        factoryBuildItem.map(ServerWebSocketContainerFactoryBuildItem::getFactory).orElse(null)));
+                serverContainer);
     }
 
     public static void registerCodersForReflection(BuildProducer<ReflectiveClassBuildItem> reflection,

diff --git a/...me/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java b/...me/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java
@@ -19,13 +19,15 @@
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.vertx.core.runtime.VertxCoreRecorder;
 import io.undertow.websockets.ServerWebSocketContainer;
 import io.undertow.websockets.UndertowContainerProvider;
 import io.undertow.websockets.WebSocketDeploymentInfo;
 import io.undertow.websockets.util.ContextSetupHandler;
 import io.undertow.websockets.util.ObjectFactory;
 import io.undertow.websockets.util.ObjectHandle;
 import io.undertow.websockets.util.ObjectIntrospecter;
+import io.vertx.core.impl.VertxInternal;
 
 @Recorder
 public class WebsocketCoreRecorder {
@@ -105,7 +107,6 @@ public RuntimeValue<WebSocketDeploymentInfo> createDeploymentInfo(Set<String> an
     }
 
     public RuntimeValue<ServerWebSocketContainer> createServerContainer(BeanContainer beanContainer,
-            Supplier<EventLoopGroup> eventLoopGroupSupplier,
             RuntimeValue<WebSocketDeploymentInfo> infoVal, ServerWebSocketContainerFactory serverContainerFactory)
             throws DeploymentException {
         WebSocketDeploymentInfo info = infoVal.getValue();
@@ -136,7 +137,12 @@ public void release() {
                     }
                 };
             }
-        }, Thread.currentThread().getContextClassLoader(), eventLoopGroupSupplier,
+        }, Thread.currentThread().getContextClassLoader(), new Supplier<EventLoopGroup>() {
+            @Override
+            public EventLoopGroup get() {
+                return ((VertxInternal) VertxCoreRecorder.getVertx().get()).getEventLoopGroup();
+            }
+        },
                 Collections.singletonList(new ContextSetupHandler() {
                     @Override
                     public <T, C> Action<T, C> create(Action<T, C> action) {

diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java
@@ -0,0 +1,38 @@
+package io.quarkus.it.websocket;
+
+import javax.enterprise.inject.spi.DeploymentException;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+import javax.websocket.Endpoint;
+import javax.websocket.EndpointConfig;
+import javax.websocket.Session;
+import javax.websocket.server.ServerContainer;
+import javax.websocket.server.ServerEndpointConfig;
+
+@WebListener
+public class AddWebSocketHandler implements ServletContextListener {
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+    }
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+        try {
+            ((ServerContainer) sce.getServletContext().getAttribute(ServerContainer.class.getName()))
+                    .addEndpoint(ServerEndpointConfig.Builder.create(WebsockEndpoint.class, "/added-dynamic").build());
+
+        } catch (DeploymentException | javax.websocket.DeploymentException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static class WebsockEndpoint extends Endpoint {
+
+        @Override
+        public void onOpen(Session session, EndpointConfig config) {
+            session.getAsyncRemote().sendText("DYNAMIC");
+        }
+
+    }
+}
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java
@@ -32,6 +32,8 @@ public class WebsocketTestCase {
 
     @TestHTTPResource("wsopen")
     URI openURI;
+    @TestHTTPResource("added-dynamic")
+    URI added;
 
     @Test
     public void websocketTest() throws Exception {
@@ -57,6 +59,29 @@ public void onMessage(String s) {
         }
     }
 
+    @Test
+    public void addedWebSocketTest() throws Exception {
+
+        LinkedBlockingDeque<String> message = new LinkedBlockingDeque<>();
+        Session session = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
+            @Override
+            public void onOpen(Session session, EndpointConfig endpointConfig) {
+                session.addMessageHandler(new MessageHandler.Whole<String>() {
+                    @Override
+                    public void onMessage(String s) {
+                        message.add(s);
+                    }
+                });
+            }
+        }, ClientEndpointConfig.Builder.create().build(), added);
+
+        try {
+            Assertions.assertEquals("DYNAMIC", message.poll(20, TimeUnit.SECONDS));
+        } finally {
+            session.close();
+        }
+    }
+
     @Test
     public void websocketServerEncodingAndDecodingTest() throws Exception {
         LinkedBlockingDeque<String> message = new LinkedBlockingDeque<>();