Merge pull request quarkusio#20465 from stuartwdouglas/grpc-remove-ve…

…rtx-dep Remove vertx-http dependency from gRPC
gsmet · Sep 30, 2021 · 210301e · 210301e
2 parents 8c69102 + e688d0b
commit 210301e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grpc/deployment/pom.xml
@@ -13,10 +13,6 @@
     <name>Quarkus - gRPC - Deployment</name>
 
     <dependencies>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
@@ -56,7 +52,7 @@
         <!-- for dev mode -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http-deployment</artifactId>
+            <artifactId>quarkus-vertx-http-dev-console-spi</artifactId>
         </dependency>
 
        <dependency>

diff --git a/.../deployment/src/main/java/io/quarkus/grpc/deployment/devmode/GrpcDevConsoleProcessor.java b/.../deployment/src/main/java/io/quarkus/grpc/deployment/devmode/GrpcDevConsoleProcessor.java
@@ -31,7 +31,6 @@
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
 import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
-import io.quarkus.arc.profile.IfBuildProfile;
 import io.quarkus.arc.runtime.BeanLookupSupplier;
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
@@ -44,6 +43,7 @@
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.dev.console.DevConsoleManager;
 import io.quarkus.dev.testing.GrpcWebSocketProxy;
+import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem;
 import io.quarkus.devconsole.spi.DevConsoleRuntimeTemplateInfoBuildItem;
 import io.quarkus.gizmo.ClassCreator;
 import io.quarkus.gizmo.MethodCreator;
@@ -53,8 +53,6 @@
 import io.quarkus.grpc.runtime.devmode.DelegatingGrpcBeansStorage;
 import io.quarkus.grpc.runtime.devmode.GrpcDevConsoleRecorder;
 import io.quarkus.grpc.runtime.devmode.GrpcServices;
-import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
-import io.quarkus.vertx.http.deployment.RouteBuildItem;
 
 public class GrpcDevConsoleProcessor {
 
@@ -67,8 +65,7 @@ public void devConsoleInfo(BuildProducer<AdditionalBeanBuildItem> beans,
                         new BeanLookupSupplier(GrpcServices.class)));
     }
 
-    @IfBuildProfile("dev")
-    @BuildStep
+    @BuildStep(onlyIf = IsDevelopment.class)
     void prepareDelegatingBeanStorage(
             List<DelegatingGrpcBeanBuildItem> delegatingBeans,
             BuildProducer<UnremovableBeanBuildItem> unremovableBeans,
@@ -133,11 +130,9 @@ public void collectMessagePrototypes(CombinedIndexBuildItem index,
     @Consume(RuntimeConfigSetupCompleteBuildItem.class)
     @Record(ExecutionTime.RUNTIME_INIT)
     @BuildStep(onlyIf = IsDevelopment.class)
-    public RouteBuildItem createWebSocketEndpoint(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
-            GrpcDevConsoleRecorder recorder) {
+    public DevConsoleRouteBuildItem createWebSocketEndpoint(GrpcDevConsoleRecorder recorder) {
         recorder.setServerConfiguration();
-        return nonApplicationRootPathBuildItem.routeBuilder().route("dev/grpc-test")
-                .handler(recorder.handler()).build();
+        return new DevConsoleRouteBuildItem("grpc-test", "GET", recorder.handler());
     }
 
     Collection<Class<?>> getGrpcServices(IndexView index) throws ClassNotFoundException {
@@ -167,4 +162,5 @@ Collection<Class<?>> getGrpcServices(IndexView index) throws ClassNotFoundExcept
         serviceClasses.add(HealthGrpc.class);
         return serviceClasses;
     }
+
 }
diff --git a/extensions/grpc/deployment/src/main/resources/dev-templates/service.html b/extensions/grpc/deployment/src/main/resources/dev-templates/service.html
@@ -68,7 +68,7 @@
             wsUri = "ws:";
           }
 
-          wsUri += "//" + window.location.host + "/q/dev/grpc-test";
+          wsUri += "//" + window.location.host + "/q/dev/io.quarkus.quarkus-grpc/grpc-test";
           grpcWS = new WebSocket(wsUri);
           grpcWS.onopen = function (event) {
             console.log("websocket connected");

diff --git a/...s/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java b/...s/grpc/deployment/src/test/java/io/quarkus/grpc/devconsole/DevConsoleUnaryMethodTest.java
@@ -39,7 +39,7 @@ public void websocketTest() throws Exception {
             List<String> incomingMessages = new CopyOnWriteArrayList<>();
             HttpClient client = vertx.createHttpClient();
 
-            client.webSocket(8080, "localhost", "/q/dev/grpc-test", result -> {
+            client.webSocket(8080, "localhost", "/q/dev/io.quarkus.quarkus-grpc/grpc-test", result -> {
                 if (result.failed()) {
                     log.error("failure making a web socket connection", result.cause());
                     return;

diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml
@@ -30,10 +30,10 @@
             <artifactId>quarkus-arc</artifactId>
         </dependency>
 
-        <!-- for dev mode, TODO: try to get rid of it-->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http</artifactId>
+            <artifactId>quarkus-vertx-http-dev-console-runtime-spi</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>