Merge pull request #40485 from mkouba/ws-next-virtual-threads

WebSockets Next: add test for virtual threads
quarkusio · May 7, 2024 · 3c0c416 · 3c0c416
2 parents 2bfd9cb + a4f9f57
commit 3c0c416
Show file tree

Hide file tree

Showing 4 changed files with 118 additions and 2 deletions.
diff --git a/extensions/websockets-next/deployment/pom.xml b/extensions/websockets-next/deployment/pom.xml
@@ -29,6 +29,13 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-websockets-next</artifactId>
         </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-vertx</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>
@@ -69,4 +76,42 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>java-21</id>
+            <activation>
+                <jdk>[21,)</jdk>
+            </activation>
+
+            <properties>
+                <maven.compiler.target>21</maven.compiler.target>
+                <maven.compiler.source>21</maven.compiler.source>
+                <!-- javaparser 3.25.10 used by impsort-maven-plugin does not define the "language level" for 21 -->
+                <!--maven.compiler.release>21</maven.compiler.release-->
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-java21-directory</id>
+                                <phase>generate-test-sources</phase>
+                                <goals>
+                                    <goal>add-test-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>src/test/java21</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/...rc/test/java21/io/quarkus/websockets/next/test/virtualthreads/RunOnVirtualThreadTest.java b/...rc/test/java21/io/quarkus/websockets/next/test/virtualthreads/RunOnVirtualThreadTest.java
@@ -0,0 +1,71 @@
+package io.quarkus.websockets.next.test.virtualthreads;
+
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.net.URI;
+
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.vertx.VirtualThreadsAssertions;
+import io.quarkus.websockets.next.OnError;
+import io.quarkus.websockets.next.OnTextMessage;
+import io.quarkus.websockets.next.WebSocket;
+import io.quarkus.websockets.next.test.utils.WSClient;
+import io.smallrye.common.annotation.RunOnVirtualThread;
+import io.vertx.core.Vertx;
+import jakarta.inject.Inject;
+
+public class RunOnVirtualThreadTest {
+
+    @RegisterExtension
+    public static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .withApplicationRoot(root -> {
+                root.addClasses(Endpoint.class, WSClient.class)
+                        .addAsResource(new StringAsset(
+                                "quarkus.virtual-threads.name-prefix=wsnext-virtual-thread-"),
+                                "application.properties");
+            });
+
+    @Inject
+    Vertx vertx;
+
+    @TestHTTPResource("end")
+    URI endUri;
+
+    @Test
+    void testVirtualThreads() {
+        try (WSClient client = new WSClient(vertx).connect(endUri)) {
+            client.sendAndAwait("foo");
+            client.sendAndAwait("bar");
+            client.waitForMessages(2);
+            String message1 = client.getMessages().get(0).toString();
+            String message2 = client.getMessages().get(1).toString();
+            assertNotEquals(message1, message2);
+            assertTrue(message1.startsWith("wsnext-virtual-thread-"));
+            assertTrue(message2.startsWith("wsnext-virtual-thread-"));
+        }
+    }
+
+    @WebSocket(path = "/end")
+    public static class Endpoint {
+
+        @RunOnVirtualThread
+        @OnTextMessage
+        String text(String ignored) {
+            VirtualThreadsAssertions.assertEverything();
+            return Thread.currentThread().getName();
+        }
+
+        @OnError
+        String error(Throwable t) {
+            return t.toString();
+        }
+
+    }
+
+}
diff --git a/.../websockets-next/runtime/src/main/java/io/quarkus/websockets/next/BinaryMessageCodec.java b/.../websockets-next/runtime/src/main/java/io/quarkus/websockets/next/BinaryMessageCodec.java
@@ -10,7 +10,7 @@
  *
  * Some types of messages bypass the encoding/decoding process:
  * <ul>
- * <li>{@code java.lang.Buffer},</li>
+ * <li>{@code io.vertx.core.buffer.Buffer},</li>
  * <li>{@code byte[]},</li>
  * <li>{@code java.lang.String},</li>
  * <li>{@code io.vertx.core.json.JsonObject}.</li>

diff --git a/...ns/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/TextMessageCodec.java b/...ns/websockets-next/runtime/src/main/java/io/quarkus/websockets/next/TextMessageCodec.java
@@ -9,7 +9,7 @@
  *
  * Some types of messages bypass the encoding/decoding process:
  * <ul>
- * <li>{@code java.lang.Buffer},</li>
+ * <li>{@code io.vertx.core.buffer.Buffer},</li>
  * <li>{@code byte[]},</li>
  * <li>{@code java.lang.String},</li>
  * <li>{@code io.vertx.core.json.JsonObject}.</li>