Routing 3

bom/pom.xml

@@ -43,6 +43,11 @@
                 <artifactId>helidon-webserver</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.webserver</groupId>
+                <artifactId>helidon-webserver-http2</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.helidon.webserver</groupId>
                 <artifactId>helidon-webserver-jersey</artifactId>
@@ -70,7 +75,7 @@
             </dependency>
             <dependency>
                 <groupId>io.helidon.webserver</groupId>
-                <artifactId>helidon-webserver-tyrus</artifactId>
+                <artifactId>helidon-webserver-websocket</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
             <dependency>

examples/messaging/jms-websocket-se/pom.xml

@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.webserver</groupId>
-            <artifactId>helidon-webserver-tyrus</artifactId>
+            <artifactId>helidon-webserver-websocket</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.config</groupId>

examples/messaging/jms-websocket-se/src/main/java/io/helidon/examples/messaging/se/Main.java

@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,9 @@
 import java.util.logging.LogManager;
 
 import io.helidon.config.Config;
-import io.helidon.webserver.Routing;
 import io.helidon.webserver.WebServer;
 import io.helidon.webserver.staticcontent.StaticContentSupport;
-import io.helidon.webserver.tyrus.TyrusSupport;
+import io.helidon.webserver.websocket.WebSocketRouting;
 
 import jakarta.websocket.server.ServerEndpointConfig;
 
@@ -65,7 +64,20 @@ static WebServer startServer() throws IOException {
 
         SendingService sendingService = new SendingService(config);
 
-        WebServer server = WebServer.builder(createRouting(sendingService))
+        WebServer server = WebServer.builder()
+                .routing(r -> r
+                        // register static content support (on "/")
+                        .register(StaticContentSupport.builder("/WEB")
+                                .welcomeFileName("index.html")
+                                .build())
+                        // register rest endpoint for sending to Jms
+                        .register("/rest/messages", sendingService))
+                .addRouting(WebSocketRouting.builder()
+                        // register WebSocket endpoint to push messages coming from Jms to client
+                        .endpoint("/ws", ServerEndpointConfig.Builder.create(
+                                        WebSocketEndpoint.class, "/messages")
+                                .build())
+                        .build())
                 .config(config.get("server"))
                 .build();
 
@@ -90,28 +102,6 @@ static WebServer startServer() throws IOException {
         return server;
     }
 
-    /**
-     * Creates new {@link Routing}.
-     *
-     * @param sendingService the service
-     */
-    private static Routing createRouting(SendingService sendingService) {
-
-        return Routing.builder()
-                // register static content support (on "/")
-                .register(StaticContentSupport.builder("/WEB").welcomeFileName("index.html"))
-                // register rest endpoint for sending to Jms
-                .register("/rest/messages", sendingService)
-                // register WebSocket endpoint to push messages coming from Jms to client
-                .register("/ws",
-                        TyrusSupport.builder().register(
-                                ServerEndpointConfig.Builder.create(
-                                        WebSocketEndpoint.class, "/messages")
-                                        .build())
-                                .build())
-                .build();
-    }
-
     /**
      * Configure logging from logging.properties file.
      */

examples/messaging/kafka-websocket-se/pom.xml

@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.webserver</groupId>
-            <artifactId>helidon-webserver-tyrus</artifactId>
+            <artifactId>helidon-webserver-websocket</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.config</groupId>

examples/messaging/kafka-websocket-se/src/main/java/io/helidon/examples/messaging/se/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,9 @@
 
 import io.helidon.common.LogConfig;
 import io.helidon.config.Config;
-import io.helidon.webserver.Routing;
 import io.helidon.webserver.WebServer;
 import io.helidon.webserver.staticcontent.StaticContentSupport;
-import io.helidon.webserver.tyrus.TyrusSupport;
+import io.helidon.webserver.websocket.WebSocketRouting;
 
 import jakarta.websocket.server.ServerEndpointConfig;
 
@@ -59,7 +58,21 @@ static WebServer startServer() {
 
         SendingService sendingService = new SendingService(config);
 
-        WebServer server = WebServer.builder(createRouting(sendingService))
+        WebServer server = WebServer.builder()
+                .routing(r -> r
+                        // register static content support (on "/")
+                        .register(StaticContentSupport.builder("/WEB")
+                                .welcomeFileName("index.html")
+                                .build())
+                        // register rest endpoint for sending to Kafka
+                        .register("/rest/messages", sendingService)
+                )
+                // register WebSocket endpoint to push messages coming from Kafka to client
+                .addRouting(WebSocketRouting.builder()
+                        .endpoint("/ws", ServerEndpointConfig.Builder.create(
+                                        WebSocketEndpoint.class, "/messages")
+                                .build())
+                        .build())
                 .config(config.get("server"))
                 .build();
 
@@ -83,27 +96,4 @@ static WebServer startServer() {
         // Server threads are not daemon. No need to block. Just react.
         return server;
     }
-
-    /**
-     * Creates new {@link Routing}.
-     *
-     * @param sendingService service to configure
-     * @return routing configured with JSON support, a health check, and a service
-     */
-    private static Routing createRouting(SendingService sendingService) {
-
-        return Routing.builder()
-                // register static content support (on "/")
-                .register(StaticContentSupport.builder("/WEB").welcomeFileName("index.html"))
-                // register rest endpoint for sending to Kafka
-                .register("/rest/messages", sendingService)
-                // register WebSocket endpoint to push messages coming from Kafka to client
-                .register("/ws",
-                        TyrusSupport.builder().register(
-                                ServerEndpointConfig.Builder.create(
-                                        WebSocketEndpoint.class, "/messages")
-                                        .build())
-                                .build())
-                .build();
-    }
 }

examples/webserver/websocket/pom.xml

@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.webserver</groupId>
-            <artifactId>helidon-webserver-tyrus</artifactId>
+            <artifactId>helidon-webserver-websocket</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.inject</groupId>

examples/webserver/websocket/src/main/java/io/helidon/webserver/examples/websocket/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,9 @@
 import java.util.Collections;
 import java.util.List;
 
-import io.helidon.webserver.Routing;
 import io.helidon.webserver.WebServer;
 import io.helidon.webserver.staticcontent.StaticContentSupport;
-import io.helidon.webserver.tyrus.TyrusSupport;
+import io.helidon.webserver.websocket.WebSocketRouting;
 
 import jakarta.websocket.Encoder;
 import jakarta.websocket.server.ServerEndpointConfig;
@@ -37,34 +36,29 @@ public class Main {
     private Main() {
     }
 
-    /**
-     * Creates new {@link Routing}.
-     *
-     * @return the new instance
-     */
-    static Routing createRouting() {
+    static WebServer startWebServer() {
         List<Class<? extends Encoder>> encoders = Collections.singletonList(UppercaseEncoder.class);
 
-        return Routing.builder()
-                .register("/rest", new MessageQueueService())
-                .register("/websocket",
-                        TyrusSupport.builder().register(
-                                ServerEndpointConfig.Builder.create(MessageBoardEndpoint.class, "/board")
-                                        .encoders(encoders).build())
-                                .build())
-                .register("/web", StaticContentSupport.builder("/WEB").build())
-                .build();
-    }
-
-    static WebServer startWebServer() {
         // Wait for webserver to start before returning
-        WebServer server = WebServer.builder(createRouting())
+        WebServer server = WebServer.builder()
                 .port(8080)
+                .routing(r -> r
+                        .register("/web", StaticContentSupport.builder("/WEB")
+                                .welcomeFileName("index.html")
+                                .build())
+                        .register("/rest", new MessageQueueService())
+                )
+                .addRouting(WebSocketRouting.builder()
+                        .endpoint("/websocket", ServerEndpointConfig.Builder.create(MessageBoardEndpoint.class, "/board")
+                                .encoders(encoders)
+                                .build())
+                        .build()
+                )
                 .build()
                 .start()
                 .await();
 
-        System.out.println("WEB server is up! http://localhost:" + server.port());
+        System.out.println("WEB server is up! http://localhost:" + server.port() + "/web");
 
         return server;
     }

graphql/server/src/test/java/io/helidon/graphql/server/GraphQlSupportTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,9 +44,7 @@ class GraphQlSupportTest {
     void testHelloWorld() {
         WebServer server = WebServer.builder()
                 .host("localhost")
-                .routing(Routing.builder()
-                                 .register(GraphQlSupport.create(buildSchema()))
-                                 .build())
+                .routing(r -> r.register(GraphQlSupport.create(buildSchema())))
                 .build()
                 .start()
                 .await(10, TimeUnit.SECONDS);

jersey/client/src/test/java/io/helidon/jersey/client/ContextTest.java

@@ -59,9 +59,7 @@ public class ContextTest {
     static void beforeAll() {
         server = WebServer.builder()
                 .host("localhost")
-                .routing(Routing.builder()
-                        .put((req, res) -> res.send("I'm Frank!"))
-                        .build())
+                .routing(r -> r.put((req, res) -> res.send("I'm Frank!")))
                 .build()
                 .start()
                 .await(TIME_OUT);

lra/coordinator/server/src/test/java/CoordinatorTest.java

@@ -70,11 +70,7 @@ static void beforeAll() {
                 .addNamedRouting(COORDINATOR_ROUTING_NAME, Routing.builder()
                         .register("/lra-coordinator", coordinatorService)
                         .build())
-                .routing(Routing.builder()
-                        .register(CONTEXT_PATH, rules -> rules.put((req, res) -> {
-                            res.send();
-                        }))
-                        .build())
+                .routing(r -> r.register(CONTEXT_PATH, rules -> rules.put((req, res) -> res.send())))
                 .build();
         server.start().await();
         serverUrl = "http://localhost:" + server.port();

metrics/service-api/src/test/java/io/helidon/metrics/serviceapi/TestMinimalMetricsSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ void testEndpoint() throws ExecutionException, InterruptedException {
             webServer = WebServer.builder()
                     .host("localhost")
                     .port(0)
-                    .routing(routing)
+                    .addRouting(routing)
                     .build()
                     .start()
                     .toCompletableFuture()

microprofile/server/src/main/java/io/helidon/microprofile/server/ServerCdiExtension.java

@@ -194,7 +194,7 @@ private void startServer(@Observes @Priority(PLATFORM_AFTER + 100) @Initialized(
         registerJaxRsApplications(beanManager);
 
         // start the webserver
-        serverBuilder.routing(routingBuilder.build());
+        serverBuilder.addRouting(routingBuilder.build());
 
         namedRoutings.forEach(serverBuilder::addNamedRouting);
         webserver = serverBuilder.build();

microprofile/websocket/pom.xml

@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.webserver</groupId>
-            <artifactId>helidon-webserver-tyrus</artifactId>
+            <artifactId>helidon-webserver-websocket</artifactId>
         </dependency>
         <dependency>
             <groupId>io.helidon.common</groupId>
@@ -64,7 +64,6 @@
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>
             <artifactId>tyrus-client</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.tyrus</groupId>