Merge pull request quarkusio#36803 from snazy/appl-props-in-root

Gradle plugin: use full URI for configuration source locations
yrodiere · Nov 2, 2023 · 6932a4c · 6932a4c
2 parents 77da3ea + a1f3057
commit 6932a4c
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/...adle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java b/...adle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/EffectiveConfig.java
@@ -7,6 +7,8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -139,21 +141,26 @@ List<URL> applicationPropsSources() {
 
     static void configSourcesForApplicationProperties(Set<File> sourceDirectories, Consumer<URL> sourceUrls,
             Consumer<ConfigSource> configSourceConsumer, int ordinal, String[] fileExtensions) {
-        URL[] resourceUrls = sourceDirectories.stream().map(File::toURI)
-                .map(u -> {
-                    try {
-                        return u.toURL();
-                    } catch (MalformedURLException e) {
-                        throw new RuntimeException(e);
-                    }
-                })
-                .toArray(URL[]::new);
-
-        for (URL resourceUrl : resourceUrls) {
-            URLClassLoader classLoader = new URLClassLoader(new URL[] { resourceUrl });
-            CombinedConfigSourceProvider configSourceProvider = new CombinedConfigSourceProvider(sourceUrls, ordinal,
-                    fileExtensions);
-            configSourceProvider.getConfigSources(classLoader).forEach(configSourceConsumer);
+        for (var sourceDir : sourceDirectories) {
+            var sourceDirPath = sourceDir.toPath();
+            var locations = new ArrayList<String>();
+            for (String file : fileExtensions) {
+                Path resolved = sourceDirPath.resolve(file);
+                if (Files.exists(resolved)) {
+                    locations.add(resolved.toUri().toString());
+                }
+            }
+            if (!locations.isEmpty()) {
+                URLClassLoader classLoader;
+                try {
+                    classLoader = new URLClassLoader(new URL[] { sourceDir.toURI().toURL() });
+                } catch (MalformedURLException e) {
+                    throw new RuntimeException(e);
+                }
+                CombinedConfigSourceProvider configSourceProvider = new CombinedConfigSourceProvider(sourceUrls, ordinal,
+                        fileExtensions, locations);
+                configSourceProvider.getConfigSources(classLoader).forEach(configSourceConsumer);
+            }
         }
     }
 
@@ -204,11 +211,13 @@ static final class CombinedConfigSourceProvider extends AbstractLocationConfigSo
         private final Consumer<URL> sourceUrls;
         private final int ordinal;
         private final String[] fileExtensions;
+        private final List<String> locations;
 
-        CombinedConfigSourceProvider(Consumer<URL> sourceUrls, int ordinal, String[] fileExtensions) {
+        CombinedConfigSourceProvider(Consumer<URL> sourceUrls, int ordinal, String[] fileExtensions, List<String> locations) {
             this.sourceUrls = sourceUrls;
             this.ordinal = ordinal;
             this.fileExtensions = fileExtensions;
+            this.locations = locations;
         }
 
         @Override
@@ -225,8 +234,7 @@ protected ConfigSource loadConfigSource(final URL url, final int ordinal) throws
 
         @Override
         public List<ConfigSource> getConfigSources(final ClassLoader classLoader) {
-            // Note:
-            return loadConfigSources(getFileExtensions(), ordinal, classLoader);
+            return loadConfigSources(locations.toArray(new String[0]), ordinal, classLoader);
         }
     }
 }