Replaced Quarkus Config Profiles and Expansion with SmallRye Config

bom/runtime/pom.xml

@@ -32,7 +32,7 @@
         <microprofile-opentracing-api.version>1.3.3</microprofile-opentracing-api.version>
         <microprofile-reactive-streams-operators.version>1.0.1</microprofile-reactive-streams-operators.version>
         <microprofile-rest-client.version>1.4.1</microprofile-rest-client.version>
-        <smallrye-config.version>1.7.0</smallrye-config.version>
+        <smallrye-config.version>1.8.1</smallrye-config.version>
         <smallrye-health.version>2.2.1</smallrye-health.version>
         <smallrye-metrics.version>2.4.2</smallrye-metrics.version>
         <smallrye-open-api.version>1.2.4</smallrye-open-api.version>

core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java

@@ -50,10 +50,10 @@
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import io.quarkus.runtime.configuration.ConfigUtils;
-import io.quarkus.runtime.configuration.ExpandingConfigSource;
 import io.quarkus.runtime.configuration.HyphenateEnumConverter;
 import io.quarkus.runtime.configuration.NameIterator;
 import io.smallrye.config.Converters;
+import io.smallrye.config.Expressions;
 import io.smallrye.config.SmallRyeConfig;
 
 /**
@@ -354,13 +354,9 @@ ReadResult run() {
                     matched = runTimePatternMap.match(ni);
                     if (matched != null) {
                         // it's a specified run-time default (record for later)
-                        boolean old = ExpandingConfigSource.setExpanding(false);
-                        try {
-                            specifiedRunTimeDefaultValues.put(propertyName,
-                                    config.getOptionalValue(propertyName, String.class).orElse(""));
-                        } finally {
-                            ExpandingConfigSource.setExpanding(old);
-                        }
+                        specifiedRunTimeDefaultValues.put(propertyName, Expressions.withoutExpansion(
+                                () -> config.getOptionalValue(propertyName, String.class).orElse("")));
+
                         continue;
                     }
                     // also check for the bootstrap properties since those need to be added to specifiedRunTimeDefaultValues as well
@@ -369,23 +365,13 @@ ReadResult run() {
                     matched = bootstrapPatternMap.match(ni);
                     if (matched != null) {
                         // it's a specified run-time default (record for later)
-                        boolean old = ExpandingConfigSource.setExpanding(false);
-                        try {
-                            specifiedRunTimeDefaultValues.put(propertyName,
-                                    config.getOptionalValue(propertyName, String.class).orElse(""));
-                        } finally {
-                            ExpandingConfigSource.setExpanding(old);
-                        }
+                        specifiedRunTimeDefaultValues.put(propertyName, Expressions.withoutExpansion(
+                                () -> config.getOptionalValue(propertyName, String.class).orElse("")));
                     }
                 } else {
                     // it's not managed by us; record it
-                    boolean old = ExpandingConfigSource.setExpanding(false);
-                    try {
-                        specifiedRunTimeDefaultValues.put(propertyName,
-                                config.getOptionalValue(propertyName, String.class).orElse(""));
-                    } finally {
-                        ExpandingConfigSource.setExpanding(old);
-                    }
+                    specifiedRunTimeDefaultValues.put(propertyName, Expressions.withoutExpansion(
+                            () -> config.getOptionalValue(propertyName, String.class).orElse("")));
                 }
             }
             return new ReadResult(objectsByRootClass, specifiedRunTimeDefaultValues, buildTimeRunTimeVisibleValues,

core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java

@@ -71,9 +71,8 @@ public static SmallRyeConfigBuilder configBuilder(final boolean runTime, final b
         final ApplicationPropertiesConfigSource.InJar inJar = new ApplicationPropertiesConfigSource.InJar();
         final ApplicationPropertiesConfigSource.MpConfigInJar mpConfig = new ApplicationPropertiesConfigSource.MpConfigInJar();
         builder.withSources(inFileSystem, inJar, mpConfig, new DotEnvConfigSource());
-        final ExpandingConfigSource.Cache cache = new ExpandingConfigSource.Cache();
-        builder.withWrapper(ExpandingConfigSource.wrapper(cache));
-        builder.withWrapper(DeploymentProfileConfigSource.wrapper());
+        builder.withProfile(ProfileManager.getActiveProfile());
+        builder.addDefaultInterceptors();
         final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         if (runTime) {
             builder.addDefaultSources();
@@ -92,6 +91,7 @@ public static SmallRyeConfigBuilder configBuilder(final boolean runTime, final b
         }
         if (addDiscovered) {
             builder.addDiscoveredSources();
+            builder.addDiscoveredInterceptors();
             builder.addDiscoveredConverters();
         }
         return builder;