Merge pull request #46075 from gsmet/configmapping-cleanup

Vert.x HTTP - Switch DevUIConfig to @ConfigMapping
quarkusio · Feb 4, 2025 · d656dc3 · d656dc3
2 parents f6d54eb + 385e366
commit d656dc3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/...r/src/main/java/io/quarkus/annotation/processor/documentation/config/model/Extension.java b/...r/src/main/java/io/quarkus/annotation/processor/documentation/config/model/Extension.java
@@ -59,8 +59,7 @@ public boolean equals(Object obj) {
     @Deprecated(forRemoval = true)
     @JsonIgnore
     public boolean isMixedModule() {
-        return "io.quarkus".equals(groupId) && ("quarkus-core".equals(artifactId) || "quarkus-vertx-http".equals(artifactId)
-                || "quarkus-messaging".equals(artifactId));
+        return "io.quarkus".equals(groupId) && ("quarkus-core".equals(artifactId) || "quarkus-vertx-http".equals(artifactId));
     }
 
     @JsonIgnore

diff --git a/extensions/vertx-http/deployment/pom.xml b/extensions/vertx-http/deployment/pom.xml
@@ -167,9 +167,6 @@
                                     <version>${project.version}</version>
                                 </path>
                             </annotationProcessorPaths>
-                            <compilerArgs>
-                                <arg>-AlegacyConfigRoot=true</arg>
-                            </compilerArgs>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java b/...-http/deployment/src/main/java/io/quarkus/devui/deployment/BuildTimeContentProcessor.java
@@ -528,7 +528,7 @@ private void addFooterTabBuildTimeData(BuildTimeConstBuildItem internalBuildTime
         footerTabs.add(testLog);
 
         // This is only needed when extension developers work on an extension, so we only included it if you build from source.
-        if (Version.getVersion().equalsIgnoreCase("999-SNAPSHOT") || devUIConfig.showJsonRpcLog) {
+        if (Version.getVersion().equalsIgnoreCase("999-SNAPSHOT") || devUIConfig.showJsonRpcLog()) {
             Page devUiLog = Page.webComponentPageBuilder().internal()
                     .namespace("devui-jsonrpcstream")
                     .title("Dev UI")

diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIConfig.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIConfig.java
@@ -4,23 +4,25 @@
 import java.util.Optional;
 
 import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 
-@ConfigRoot(name = "dev-ui")
-public class DevUIConfig {
+@ConfigRoot
+@ConfigMapping(prefix = "quarkus.dev-ui")
+public interface DevUIConfig {
 
     /**
      * The number of history log entries to remember.
      */
-    @ConfigItem(defaultValue = "50")
-    public int historySize;
+    @WithDefault("50")
+    int historySize();
 
     /**
      * Show the JsonRPC Log. Useful for extension developers
      */
-    @ConfigItem(defaultValue = "false")
-    public boolean showJsonRpcLog;
+    @WithDefault("false")
+    boolean showJsonRpcLog();
 
     /**
      * More hosts allowed for Dev UI
@@ -29,22 +31,21 @@ public class DevUIConfig {
      * (This can also be a regex)
      * By default localhost and 127.0.0.1 will always be allowed
      */
-    @ConfigItem
-    public Optional<List<String>> hosts = Optional.empty();
+    Optional<List<String>> hosts();
 
     /**
      * CORS configuration.
      */
-    public Cors cors = new Cors();
+    Cors cors();
 
     @ConfigGroup
-    public static class Cors {
+    interface Cors {
 
         /**
          * Enable CORS filter.
          */
-        @ConfigItem(defaultValue = "true")
-        public boolean enabled = true;
+        @WithDefault("true")
+        boolean enabled();
     }
 
 }
diff --git a/...sions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java b/...sions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/DevUIProcessor.java
@@ -146,10 +146,10 @@ void registerDevUiHandlers(
 
         routeProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
                 .orderedRoute(DEVUI + SLASH_ALL, -2 * FilterBuildItem.CORS)
-                .handler(recorder.createLocalHostOnlyFilter(devUIConfig.hosts.orElse(null)))
+                .handler(recorder.createLocalHostOnlyFilter(devUIConfig.hosts().orElse(null)))
                 .build());
 
-        if (devUIConfig.cors.enabled) {
+        if (devUIConfig.cors().enabled()) {
             routeProducer.produce(nonApplicationRootPathBuildItem.routeBuilder()
                     .orderedRoute(DEVUI + SLASH_ALL, -1 * FilterBuildItem.CORS)
                     .handler(new DevUICORSFilter())