Merge pull request #45516 from mcruzdev/config-vertx-graphql

Convert vertx-graphql to use @ConfigMapping
quarkusio · Jan 11, 2025 · 4b0ff98 · 4b0ff98
2 parents 215eb29 + 1b8811e
commit 4b0ff98
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/extensions/vertx-graphql/deployment/pom.xml b/extensions/vertx-graphql/deployment/pom.xml
@@ -53,9 +53,6 @@
                                     <version>${project.version}</version>
                                 </path>
                             </annotationProcessorPaths>
-                            <compilerArgs>
-                                <arg>-AlegacyConfigRoot=true</arg>
-                            </compilerArgs>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...phql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlConfig.java b/...phql/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlConfig.java
@@ -1,32 +1,32 @@
 package io.quarkus.vertx.graphql.deployment;
 
-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
-public final class VertxGraphqlConfig {
+@ConfigMapping(prefix = "quarkus.vertx-graphql")
+public interface VertxGraphqlConfig {
+
     /**
      * GraphQL UI configuration
      */
-    @ConfigItem
-    VertxGraphqlUiConfig ui;
+    VertxGraphqlUiConfig ui();
 
-    @ConfigGroup
-    public static class VertxGraphqlUiConfig {
+    interface VertxGraphqlUiConfig {
         /**
          * If GraphQL UI should be included every time. By default, this is only included when the application is running
          * in dev mode.
          */
-        @ConfigItem
-        boolean alwaysInclude;
+        @WithDefault("false")
+        boolean alwaysInclude();
 
         /**
          * The path where GraphQL UI is available.
          * <p>
          * The value `/` is not allowed as it blocks the application from serving anything else.
          */
-        @ConfigItem(defaultValue = "graphql-ui")
-        String path;
+        @WithDefault("graphql-ui")
+        String path();
     }
 }
diff --git a/...l/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java b/...l/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java
@@ -79,11 +79,11 @@ void registerVertxGraphqlUI(VertxGraphqlRecorder recorder, VertxGraphqlConfig co
             return;
         }
 
-        Matcher matcher = TRAILING_SLASH_SUFFIX_REGEX.matcher(config.ui.path);
+        Matcher matcher = TRAILING_SLASH_SUFFIX_REGEX.matcher(config.ui().path());
         String path = matcher.replaceAll("");
         if (path.isEmpty()) {
             throw new ConfigurationException(
-                    "quarkus.vertx-graphql.ui.path was set to \"" + config.ui.path
+                    "quarkus.vertx-graphql.ui.path was set to \"" + config.ui().path()
                             + "\", this is not allowed as it blocks the application from serving anything else.");
         }
 
@@ -101,7 +101,7 @@ void registerVertxGraphqlUI(VertxGraphqlRecorder recorder, VertxGraphqlConfig co
     }
 
     private static boolean doNotIncludeVertxGraphqlUi(LaunchModeBuildItem launchMode, VertxGraphqlConfig config) {
-        return !launchMode.getLaunchMode().isDevOrTest() && !config.ui.alwaysInclude;
+        return !launchMode.getLaunchMode().isDevOrTest() && !config.ui().alwaysInclude();
     }
 
     @BuildStep

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