Merge pull request #38143 from cescoffier/route-spi

New Route SPI not requiring Vert.x HTTP
quarkusio · Jan 13, 2024 · e75a8c6 · e75a8c6
2 parents 2aa3fb1 + 50c898b
commit e75a8c6
Show file tree

Hide file tree

Showing 8 changed files with 466 additions and 39 deletions.
diff --git a/extensions/info/deployment/src/main/java/io/quarkus/info/deployment/InfoProcessor.java b/extensions/info/deployment/src/main/java/io/quarkus/info/deployment/InfoProcessor.java
@@ -46,7 +46,7 @@
 import io.quarkus.info.runtime.spi.InfoContributor;
 import io.quarkus.maven.dependency.ResolvedDependency;
 import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
-import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.quarkus.vertx.http.deployment.spi.RouteBuildItem;
 
 public class InfoProcessor {
 
@@ -283,14 +283,12 @@ RouteBuildItem defineRoute(InfoBuildTimeConfig buildTimeConfig,
         List<InfoContributor> infoContributors = contributors.stream()
                 .map(InfoBuildTimeContributorBuildItem::getInfoContributor)
                 .collect(Collectors.toList());
+
         unremovableBeanBuildItemBuildProducer.produce(UnremovableBeanBuildItem.beanTypes(InfoContributor.class));
-        return nonApplicationRootPathBuildItem.routeBuilder()
-                .management()
-                .route(buildTimeConfig.path())
-                .routeConfigKey("quarkus.info.path")
-                .handler(recorder.handler(buildTimeInfo, infoContributors))
-                .displayOnNotFoundPage()
-                .blockingRoute()
+
+        return RouteBuildItem.newManagementRoute(buildTimeConfig.path())
+                .withRoutePathConfigKey("quarkus.info.path")
+                .withRequestHandler(recorder.handler(buildTimeInfo, infoContributors))
                 .build();
     }
 }
diff --git a/...oyment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java b/...oyment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java
@@ -107,9 +107,9 @@
 import io.quarkus.vertx.http.deployment.FilterBuildItem;
 import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
-import io.quarkus.vertx.http.deployment.RouteBuildItem;
 import io.quarkus.vertx.http.deployment.SecurityInformationBuildItem;
 import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
+import io.quarkus.vertx.http.deployment.spi.RouteBuildItem;
 import io.quarkus.vertx.http.runtime.management.ManagementInterfaceBuildTimeConfig;
 import io.quarkus.vertx.http.runtime.management.ManagementInterfaceConfiguration;
 import io.smallrye.openapi.api.OpenApiConfig;
@@ -305,32 +305,31 @@ void handler(LaunchModeBuildItem launch,
             }
         }
 
-        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
-                .management("quarkus.smallrye-openapi.management.enabled")
-                .routeFunction(openApiConfig.path, corsFilter)
-                .routeConfigKey("quarkus.smallrye-openapi.path")
-                .handler(handler)
+        routes.produce(RouteBuildItem.newManagementRoute(openApiConfig.path, "quarkus.smallrye-openapi.management.enabled")
+                .withRouteCustomizer(corsFilter)
+                .withRoutePathConfigKey("quarkus.smallrye-openapi.path")
+                .withRequestHandler(handler)
                 .displayOnNotFoundPage("Open API Schema document")
-                .blockingRoute()
+                .asBlockingRoute()
                 .build());
 
-        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
-                .management("quarkus.smallrye-openapi.management.enabled")
-                .routeFunction(openApiConfig.path + ".json", corsFilter)
-                .handler(handler)
-                .build());
-
-        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
-                .management("quarkus.smallrye-openapi.management.enabled")
-                .routeFunction(openApiConfig.path + ".yaml", corsFilter)
-                .handler(handler)
-                .build());
-
-        routes.produce(nonApplicationRootPathBuildItem.routeBuilder()
-                .management("quarkus.smallrye-openapi.management.enabled")
-                .routeFunction(openApiConfig.path + ".yml", corsFilter)
-                .handler(handler)
-                .build());
+        routes.produce(
+                RouteBuildItem.newManagementRoute(openApiConfig.path + ".json", "quarkus.smallrye-openapi.management.enabled")
+                        .withRouteCustomizer(corsFilter)
+                        .withRequestHandler(handler)
+                        .build());
+
+        routes.produce(
+                RouteBuildItem.newManagementRoute(openApiConfig.path + ".yaml", "quarkus.smallrye-openapi.management.enabled")
+                        .withRouteCustomizer(corsFilter)
+                        .withRequestHandler(handler)
+                        .build());
+
+        routes.produce(
+                RouteBuildItem.newManagementRoute(openApiConfig.path + ".yml", "quarkus.smallrye-openapi.management.enabled")
+                        .withRouteCustomizer(corsFilter)
+                        .withRequestHandler(handler)
+                        .build());
 
         // If management is enabled and swagger-ui is part of management, we need to add CORS so that swagger can hit the endpoint
         if (isManagement(managementInterfaceBuildTimeConfig, openApiConfig, launch)) {

diff --git a/extensions/vertx-http/deployment-spi/pom.xml b/extensions/vertx-http/deployment-spi/pom.xml
@@ -18,6 +18,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-web</artifactId>
+        </dependency>
     </dependencies>
 
 </project>