Use Dev UI Context root in swagger ui

Signed-off-by: Phillip Kruger <[email protected]>

Author: phillip-kruger

extensions/devui/deployment-spi/src/main/java/io/quarkus/devui/spi/DevContextBuildItem.java

@@ -0,0 +1,18 @@
+package io.quarkus.devui.spi;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Provides dev mode context as setup in Dev UI
+ */
+public final class DevContextBuildItem extends SimpleBuildItem {
+    private final String devUIContextRoot;
+
+    public DevContextBuildItem(String devUIContextRoot) {
+        this.devUIContextRoot = devUIContextRoot;
+    }
+
+    public String getDevUIContextRoot() {
+        return devUIContextRoot;
+    }
+}

extensions/devui/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java

@@ -64,6 +64,7 @@
 import io.quarkus.devui.deployment.extension.Extension;
 import io.quarkus.devui.spi.AbstractDevUIBuildItem;
 import io.quarkus.devui.spi.Constants;
+import io.quarkus.devui.spi.DevContextBuildItem;
 import io.quarkus.devui.spi.DevUIContent;
 import io.quarkus.devui.spi.buildtime.BuildTimeActionBuildItem;
 import io.quarkus.devui.spi.buildtime.BuildTimeData;
@@ -100,10 +101,16 @@ public class BuildTimeContentProcessor {
      * This will be merged into the final importmap
      */
     @BuildStep(onlyIf = IsLocalDevelopment.class)
-    InternalImportMapBuildItem createKnownInternalImportMap(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+    void createKnownInternalImportMap(BuildProducer<InternalImportMapBuildItem> internalImportMapProducer,
+            BuildProducer<DevContextBuildItem> devContextProducer,
+            NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
             DevUIConfig config) {
 
         String devUIContext = config.contextRoot().orElse("");
+
+        if (!devUIContext.isBlank())
+            devContextProducer.produce(new DevContextBuildItem(devUIContext));
+
         String contextRoot = devUIContext + nonApplicationRootPathBuildItem.getNonApplicationRootPath()
                 + Constants.DEV_UI + SLASH;
 
@@ -151,7 +158,8 @@ InternalImportMapBuildItem createKnownInternalImportMap(NonApplicationRootPathBu
         internalImportMapBuildItem.add("assistant-state", contextRoot + "state/assistant-state.js");
         internalImportMapBuildItem.add("devui-state", contextRoot + "state/devui-state.js");
 
-        return internalImportMapBuildItem;
+        internalImportMapProducer.produce(internalImportMapBuildItem);
+
     }
 
     @BuildStep(onlyIf = IsLocalDevelopment.class)

extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/devui/OpenApiDevUIProcessor.java

@@ -1,8 +1,11 @@
 package io.quarkus.smallrye.openapi.deployment.devui;
 
+import java.util.Optional;
+
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.devui.spi.DevContextBuildItem;
 import io.quarkus.devui.spi.JsonRPCProvidersBuildItem;
 import io.quarkus.devui.spi.page.CardPageBuildItem;
 import io.quarkus.devui.spi.page.Page;
@@ -18,13 +21,18 @@ public class OpenApiDevUIProcessor {
     public CardPageBuildItem pages(NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
             ManagementInterfaceBuildTimeConfig managementBuildTimeConfig,
             LaunchModeBuildItem launchModeBuildItem,
+            Optional<DevContextBuildItem> devContextBuildItem,
             SwaggerUiConfig swaggerUiConfig,
             SmallRyeOpenApiConfig openApiConfig) {
 
-        String uiPath = nonApplicationRootPathBuildItem.resolveManagementPath(swaggerUiConfig.path(),
+        String devUIContextRoot = "";
+        if (devContextBuildItem.isPresent()) {
+            devUIContextRoot = devContextBuildItem.get().getDevUIContextRoot();
+        }
+        String uiPath = devUIContextRoot + nonApplicationRootPathBuildItem.resolveManagementPath(swaggerUiConfig.path(),
                 managementBuildTimeConfig, launchModeBuildItem, openApiConfig.managementEnabled());
 
-        String schemaPath = nonApplicationRootPathBuildItem.resolveManagementPath(openApiConfig.path(),
+        String schemaPath = devUIContextRoot + nonApplicationRootPathBuildItem.resolveManagementPath(openApiConfig.path(),
                 managementBuildTimeConfig, launchModeBuildItem, openApiConfig.managementEnabled());
 
         CardPageBuildItem cardPageBuildItem = new CardPageBuildItem();

extensions/swagger-ui/deployment/src/main/java/io/quarkus/swaggerui/deployment/SwaggerUiProcessor.java

@@ -28,6 +28,7 @@
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.devui.spi.Constants;
+import io.quarkus.devui.spi.DevContextBuildItem;
 import io.quarkus.maven.dependency.GACT;
 import io.quarkus.runtime.configuration.ConfigurationException;
 import io.quarkus.smallrye.openapi.common.deployment.SmallRyeOpenApiConfig;
@@ -86,6 +87,7 @@ List<HotDeploymentWatchedFileBuildItem> brandingFiles() {
     @BuildStep
     public void getSwaggerUiFinalDestination(
             NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            Optional<DevContextBuildItem> devContextBuildItem,
             LaunchModeBuildItem launchMode,
             SwaggerUiConfig swaggerUiConfig,
             SmallRyeOpenApiConfig openapi,
@@ -107,9 +109,14 @@ public void getSwaggerUiFinalDestination(
 
             }
 
-            String openApiPath = nonApplicationRootPathBuildItem.resolvePath(openapi.path());
+            String devUIContextRoot = "";
+            if (devContextBuildItem.isPresent()) {
+                devUIContextRoot = devContextBuildItem.get().getDevUIContextRoot();
+            }
 
-            String swaggerUiPath = nonApplicationRootPathBuildItem.resolvePath(swaggerUiConfig.path());
+            String openApiPath = devUIContextRoot + nonApplicationRootPathBuildItem.resolvePath(openapi.path());
+
+            String swaggerUiPath = devUIContextRoot + nonApplicationRootPathBuildItem.resolvePath(swaggerUiConfig.path());
             ThemeHref theme = swaggerUiConfig.theme().orElse(ThemeHref.feeling_blue);
 
             NonApplicationRootPathBuildItem indexRootPathBuildItem = null;
@@ -143,6 +150,7 @@ public void registerSwaggerUiHandler(SwaggerUiRecorder recorder,
             BuildProducer<RouteBuildItem> routes,
             NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
             WebJarResultsBuildItem webJarResultsBuildItem,
+            Optional<DevContextBuildItem> devContextBuildItem,
             LaunchModeBuildItem launchMode,
             SwaggerUiConfig swaggerUiConfig,
             BuildProducer<SwaggerUiBuildItem> swaggerUiBuildProducer,