Merge pull request #7530 from geoand/dot-env-always

Make sure that DotEnvConfigSource is used for runtime properties as well
quarkusio · Mar 3, 2020 · 093094a · 093094a
2 parents f1abb07 + 5ecb677
commit 093094a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
@@ -69,7 +70,7 @@ public static SmallRyeConfigBuilder configBuilder(final boolean runTime, final b
         final ApplicationPropertiesConfigSource.InFileSystem inFileSystem = new ApplicationPropertiesConfigSource.InFileSystem();
         final ApplicationPropertiesConfigSource.InJar inJar = new ApplicationPropertiesConfigSource.InJar();
         final ApplicationPropertiesConfigSource.MpConfigInJar mpConfig = new ApplicationPropertiesConfigSource.MpConfigInJar();
-        builder.withSources(inFileSystem, inJar, mpConfig);
+        builder.withSources(inFileSystem, inJar, mpConfig, new DotEnvConfigSource());
         final ExpandingConfigSource.Cache cache = new ExpandingConfigSource.Cache();
         builder.withWrapper(ExpandingConfigSource.wrapper(cache));
         builder.withWrapper(DeploymentProfileConfigSource.wrapper());
@@ -84,7 +85,6 @@ public static SmallRyeConfigBuilder configBuilder(final boolean runTime, final b
             sources.addAll(
                     new PropertiesConfigSourceProvider("WEB-INF/classes/META-INF/microprofile-config.properties", true,
                             classLoader).getConfigSources(classLoader));
-            sources.add(new DotEnvConfigSource());
             sources.add(new EnvConfigSource());
             sources.add(new SysPropConfigSource());
             builder.withSources(sources);
@@ -121,7 +121,9 @@ public static void addSourceProviders(SmallRyeConfigBuilder builder, Collection<
         }
     }
 
-    static class EnvConfigSource implements ConfigSource {
+    static class EnvConfigSource implements ConfigSource, Serializable {
+        private static final long serialVersionUID = 8786096039970882529L;
+
         static final Pattern REP_PATTERN = Pattern.compile("[^a-zA-Z0-9_]");
 
         EnvConfigSource() {
@@ -149,6 +151,8 @@ public String getName() {
     }
 
     static class DotEnvConfigSource extends EnvConfigSource {
+        private static final long serialVersionUID = -6718168105190376482L;
+
         private final Map<String, String> values;
 
         DotEnvConfigSource() {