Merge pull request #42196 from mkouba/issue-42182

WebSockets Next client: support string params for connector.baseUri()
quarkusio · Jul 29, 2024 · b1de140 · b1de140
2 parents 99162f6 + eb18d0e
commit b1de140
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/...t/deployment/src/test/java/io/quarkus/websockets/next/test/client/BasicConnectorTest.java b/...t/deployment/src/test/java/io/quarkus/websockets/next/test/client/BasicConnectorTest.java
@@ -47,7 +47,7 @@ public class BasicConnectorTest {
     @Test
     void testClient() throws InterruptedException {
 
-        assertThrows(NullPointerException.class, () -> connector.baseUri(null));
+        assertThrows(IllegalArgumentException.class, () -> connector.baseUri("foo\\"));
         assertThrows(NullPointerException.class, () -> connector.path(null));
         assertThrows(NullPointerException.class, () -> connector.addHeader(null, "foo"));
         assertThrows(NullPointerException.class, () -> connector.addHeader("foo", null));

diff --git a/...ment/src/test/java/io/quarkus/websockets/next/test/client/ClientAutoPingIntervalTest.java b/...ment/src/test/java/io/quarkus/websockets/next/test/client/ClientAutoPingIntervalTest.java
@@ -37,7 +37,7 @@ public class ClientAutoPingIntervalTest {
 
     @Test
     public void testPingPong() throws InterruptedException, ExecutionException {
-        connector.baseUri(uri).connectAndAwait();
+        connector.baseUri(uri.toString()).connectAndAwait();
         // Ping messages are sent automatically
         assertTrue(ClientEndpoint.PONG.await(5, TimeUnit.SECONDS));
     }

diff --git a/...ockets-next/runtime/src/main/java/io/quarkus/websockets/next/BasicWebSocketConnector.java b/...ockets-next/runtime/src/main/java/io/quarkus/websockets/next/BasicWebSocketConnector.java
@@ -39,6 +39,16 @@ static BasicWebSocketConnector create() {
      */
     BasicWebSocketConnector baseUri(URI uri);
 
+    /**
+     * Set the base URI.
+     *
+     * @param baseUri
+     * @return self
+     */
+    default BasicWebSocketConnector baseUri(String baseUri) {
+        return baseUri(URI.create(baseUri));
+    }
+
     /**
      * Set the path that should be appended to the path of the URI set by {@link #baseUri(URI)}.
      * <p>

diff --git a/.../websockets-next/runtime/src/main/java/io/quarkus/websockets/next/WebSocketConnector.java b/.../websockets-next/runtime/src/main/java/io/quarkus/websockets/next/WebSocketConnector.java
@@ -27,6 +27,16 @@ public interface WebSocketConnector<CLIENT> {
      */
     WebSocketConnector<CLIENT> baseUri(URI baseUri);
 
+    /**
+     * Set the base URI.
+     *
+     * @param baseUri
+     * @return self
+     */
+    default WebSocketConnector<CLIENT> baseUri(String baseUri) {
+        return baseUri(URI.create(baseUri));
+    }
+
     /**
      * Set the path param.
      * <p>