Merge pull request quarkusio#35322 from radcortez/config-builder

Use SmallRyeConfigBuilder Customizer to generate Quarkus configuration

Author: gsmet

bom/application/pom.xml

@@ -50,8 +50,8 @@
         <microprofile-jwt.version>2.1</microprofile-jwt.version>
         <microprofile-lra.version>2.0</microprofile-lra.version>
         <microprofile-openapi.version>3.1.1</microprofile-openapi.version>
-        <smallrye-common.version>2.1.2</smallrye-common.version>
-        <smallrye-config.version>3.3.4</smallrye-config.version>
+        <smallrye-common.version>2.2.0</smallrye-common.version>
+        <smallrye-config.version>3.4.1</smallrye-config.version>
         <smallrye-health.version>4.0.4</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>3.6.2</smallrye-open-api.version>

core/deployment/src/main/java/io/quarkus/deployment/ExtensionLoader.java

@@ -47,7 +47,6 @@
 
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
-import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.logging.Logger;
 import org.wildfly.common.function.Functions;
 
@@ -136,16 +135,8 @@ public static Consumer<BuildChainBuilder> loadStepsFrom(ClassLoader classLoader,
 
         final BuildTimeConfigurationReader reader = new BuildTimeConfigurationReader(classLoader);
         final SmallRyeConfig src = reader.initConfiguration(launchMode, buildSystemProps, appModel.getPlatformProperties());
-
         // install globally
         QuarkusConfigFactory.setConfig(src);
-        final ConfigProviderResolver cpr = ConfigProviderResolver.instance();
-        try {
-            cpr.releaseConfig(cpr.getConfig());
-        } catch (IllegalStateException ignored) {
-            // just means no config was installed, which is fine
-        }
-
         final BuildTimeConfigurationReader.ReadResult readResult = reader.readConfiguration(src);
         final BooleanSupplierFactoryBuildItem bsf = new BooleanSupplierFactoryBuildItem(readResult, launchMode, devModeType);
 

core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigMappingBuildItem.java

@@ -4,6 +4,7 @@
 
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.runtime.annotations.StaticInitSafe;
+import io.smallrye.config.ConfigMappings.ConfigClassWithPrefix;
 
 public final class ConfigMappingBuildItem extends MultiBuildItem {
     private final Class<?> configClass;
@@ -26,6 +27,10 @@ public boolean isStaticInitSafe() {
         return configClass.isAnnotationPresent(StaticInitSafe.class);
     }
 
+    public ConfigClassWithPrefix toConfigClassWithPrefix() {
+        return new ConfigClassWithPrefix(configClass, prefix);
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {

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

@@ -470,7 +470,6 @@ final class ReadOperation {
         final SmallRyeConfig config;
         final ConfigTrackingInterceptor buildConfigTracker;
         final Set<String> processedNames = new HashSet<>();
-
         final Map<Class<?>, Object> objectsByClass = new HashMap<>();
         final Map<String, String> allBuildTimeValues = new TreeMap<>();
         final Map<String, String> buildTimeRunTimeValues = new TreeMap<>();
@@ -510,6 +509,7 @@ ReadResult run() {
 
             allBuildTimeValues.putAll(getDefaults(buildTimePatternMap));
             buildTimeRunTimeValues.putAll(getDefaults(buildTimeRunTimePatternMap));
+            runTimeDefaultValues.putAll(getDefaults(runTimePatternMap));
 
             SmallRyeConfig runtimeDefaultsConfig = getConfigForRuntimeDefaults();
             Set<String> registeredRoots = allRoots.stream().map(RootDefinition::getName).collect(toSet());

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

@@ -1,5 +1,6 @@
 package io.quarkus.deployment.configuration;
 
+import static io.smallrye.config.ConfigMappings.ConfigClassWithPrefix.configClassWithPrefix;
 import static org.jboss.jandex.AnnotationTarget.Kind.CLASS;
 
 import java.util.ArrayList;
@@ -32,6 +33,7 @@
 import io.smallrye.config.ConfigMappingInterface.Property;
 import io.smallrye.config.ConfigMappingLoader;
 import io.smallrye.config.ConfigMappingMetadata;
+import io.smallrye.config.ConfigMappings.ConfigClassWithPrefix;
 
 public class ConfigMappingUtils {
 
@@ -58,33 +60,42 @@ public static void processConfigClasses(
             Class<?> configClass = toClass(target.asClass().name());
             String prefix = Optional.ofNullable(annotationPrefix).map(AnnotationValue::asString).orElse("");
             Kind configClassKind = getConfigClassType(instance);
-            processConfigClass(configClass, configClassKind, prefix, true, combinedIndex, generatedClasses, reflectiveClasses,
-                    configClasses);
+            processConfigClass(configClassWithPrefix(configClass, prefix), configClassKind, true, combinedIndex,
+                    generatedClasses, reflectiveClasses, configClasses);
         }
     }
 
+    public static void processConfigMapping(
+            CombinedIndexBuildItem combinedIndex,
+            BuildProducer<GeneratedClassBuildItem> generatedClasses,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
+            BuildProducer<ConfigClassBuildItem> configClasses) {
+        processConfigClasses(combinedIndex, generatedClasses, reflectiveClasses, configClasses, CONFIG_MAPPING_NAME);
+    }
+
     public static void processExtensionConfigMapping(
-            Class<?> configClass,
-            String prefix,
+            ConfigClassWithPrefix configClass,
             CombinedIndexBuildItem combinedIndex,
             BuildProducer<GeneratedClassBuildItem> generatedClasses,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
             BuildProducer<ConfigClassBuildItem> configClasses) {
 
-        processConfigClass(configClass, Kind.MAPPING, prefix, false, combinedIndex, generatedClasses, reflectiveClasses,
+        processConfigClass(configClass, Kind.MAPPING, false, combinedIndex, generatedClasses, reflectiveClasses,
                 configClasses);
     }
 
     private static void processConfigClass(
-            Class<?> configClass,
+            ConfigClassWithPrefix configClassWithPrefix,
             Kind configClassKind,
-            String prefix,
             boolean isApplicationClass,
             CombinedIndexBuildItem combinedIndex,
             BuildProducer<GeneratedClassBuildItem> generatedClasses,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
             BuildProducer<ConfigClassBuildItem> configClasses) {
 
+        Class<?> configClass = configClassWithPrefix.getKlass();
+        String prefix = configClassWithPrefix.getPrefix();
+
         List<ConfigMappingMetadata> configMappingsMetadata = ConfigMappingLoader.getConfigMappingsMetadata(configClass);
         Set<String> generatedClassesNames = new HashSet<>();
         configMappingsMetadata.forEach(mappingMetadata -> {