Merge pull request #45231 from mcruzdev/config-web-dep-locator

Convert web-dependency-locator to use @ConfigMapping

Author: gsmet

extensions/web-dependency-locator/deployment/pom.xml

@@ -97,9 +97,6 @@
                                     <version>${project.version}</version>
                                 </path>
                             </annotationProcessorPaths>
-                            <compilerArgs>
-                                <arg>-AlegacyConfigRoot=true</arg>
-                            </compilerArgs>
                         </configuration>
                     </execution>
                 </executions>

extensions/web-dependency-locator/deployment/src/main/java/io/quarkus/webdependency/locator/deployment/WebDependencyLocatorConfig.java

@@ -3,37 +3,38 @@
 import java.util.Map;
 
 import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 
 /**
  * Build time configuration for Web Dependency Locator.
  */
 @ConfigRoot
-public class WebDependencyLocatorConfig {
+@ConfigMapping(prefix = "quarkus.web-dependency-locator")
+public interface WebDependencyLocatorConfig {
 
     /**
      * If the version reroute is enabled.
      */
-    @ConfigItem(defaultValue = "true")
-    public boolean versionReroute;
+    @WithDefault("true")
+    boolean versionReroute();
 
     /**
      * User defined import mappings
      */
-    @ConfigItem
     @ConfigDocMapKey("module-specifier")
-    public Map<String, String> importMappings;
+    Map<String, String> importMappings();
 
     /**
      * The directory in the resources which serves as root for the web assets
      */
-    @ConfigItem(defaultValue = "web")
-    public String webRoot;
+    @WithDefault("web")
+    String webRoot();
 
     /**
      * The directory in the resources which serves as root for the app assets
      */
-    @ConfigItem(defaultValue = "app")
-    public String appRoot;
+    @WithDefault("app")
+    String appRoot();
 }

extensions/web-dependency-locator/deployment/src/main/java/io/quarkus/webdependency/locator/deployment/WebDependencyLocatorProcessor.java

@@ -51,22 +51,22 @@ public void findRelevantFiles(BuildProducer<GeneratedStaticResourceBuildItem> ge
             BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedProducer,
             WebDependencyLocatorConfig config) throws IOException {
 
-        QuarkusClassLoader.visitRuntimeResources(config.webRoot, visit -> {
+        QuarkusClassLoader.visitRuntimeResources(config.webRoot(), visit -> {
             final Path web = visit.getPath();
             if (Files.isDirectory(web)) {
                 hotDeploymentWatchedProducer
-                        .produce(new HotDeploymentWatchedFileBuildItem(config.webRoot + SLASH + STAR + STAR));
+                        .produce(new HotDeploymentWatchedFileBuildItem(config.webRoot() + SLASH + STAR + STAR));
                 // Find all css and js (under /app)
                 Path app = web
-                        .resolve(config.appRoot);
+                        .resolve(config.appRoot());
 
                 List<Path> cssFiles = new ArrayList<>();
                 List<Path> jsFiles = new ArrayList<>();
 
                 if (Files.exists(app)) {
                     hotDeploymentWatchedProducer
                             .produce(new HotDeploymentWatchedFileBuildItem(
-                                    config.webRoot + SLASH + config.appRoot + SLASH + STAR + STAR));
+                                    config.webRoot() + SLASH + config.appRoot() + SLASH + STAR + STAR));
                     try (Stream<Path> appstream = Files.walk(app)) {
                         appstream.forEach(path -> {
                             if (Files.isRegularFile(path) && path.toString().endsWith(DOT_CSS)) {
@@ -167,23 +167,23 @@ public void findWebDependenciesAndCreateHandler(
         if (webjarsLibInfo != null || mvnpmNameLibInfo != null) {
 
             if (webjarsLibInfo != null) {
-                if (config.versionReroute) {
+                if (config.versionReroute()) {
                     routes.produce(createRouteBuildItem(recorder, httpConfig, WEBJARS_PATH, webjarsLibInfo.nameVersionMap));
                 }
             }
             if (mvnpmNameLibInfo != null) {
-                if (config.versionReroute) {
+                if (config.versionReroute()) {
                     routes.produce(createRouteBuildItem(recorder, httpConfig, MVNPM_PATH, mvnpmNameLibInfo.nameVersionMap));
                 }
                 // Also create a importmap endpoint
                 Aggregator aggregator = new Aggregator(mvnpmNameLibInfo.jars);
-                Map<String, String> importMappings = config.importMappings;
-                if (!importMappings.containsKey(config.appRoot + SLASH)) {
+                Map<String, String> importMappings = config.importMappings();
+                if (!importMappings.containsKey(config.appRoot() + SLASH)) {
                     // Add default for app/
-                    importMappings.put(config.appRoot + SLASH, SLASH + config.appRoot + SLASH);
+                    importMappings.put(config.appRoot() + SLASH, SLASH + config.appRoot() + SLASH);
                 }
-                if (!config.importMappings.isEmpty()) {
-                    aggregator.addMappings(config.importMappings);
+                if (!config.importMappings().isEmpty()) {
+                    aggregator.addMappings(config.importMappings());
                 }
 
                 String importMap = aggregator.aggregateAsJson(false);

extensions/web-dependency-locator/runtime/pom.xml

@@ -43,9 +43,6 @@
                                     <version>${project.version}</version>
                                 </path>
                             </annotationProcessorPaths>
-                            <compilerArgs>
-                                <arg>-AlegacyConfigRoot=true</arg>
-                            </compilerArgs>
                         </configuration>
                     </execution>
                 </executions>