Merge pull request #50200 from radcortez/srconfig-3.14.0

gastaldi · web-flow · commit b17a99f844fb · 2025-09-22T10:52:13.000-03:00
Update Smallrye Config to 3.14.0
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -47,7 +47,7 @@
         <microprofile-lra.version>2.0.1</microprofile-lra.version>
         <microprofile-openapi.version>4.0.2</microprofile-openapi.version>
         <smallrye-common.version>2.13.9</smallrye-common.version>
-        <smallrye-config.version>3.13.4</smallrye-config.version>
+        <smallrye-config.version>3.14.0</smallrye-config.version>
         <smallrye-health.version>4.2.0</smallrye-health.version>
         <smallrye-metrics.version>4.0.0</smallrye-metrics.version>
         <smallrye-open-api.version>4.0.12</smallrye-open-api.version>
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
@@ -387,7 +387,7 @@ public Set<String> getPropertyNames() {
                 @Override
                 public String getValue(final String propertyName) {
                     // Required because some interceptors call getValue when iterating names
-                    return config.getRawValue(propertyName);
+                    return config.getConfigValue(propertyName).getValue();
                 }
             };
 
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/ConfigMappingUtils.java
@@ -130,6 +130,8 @@ private static void processConfigClass(
                     .build());
             reflectiveMethods.produce(new ReflectiveMethodBuildItem(ConfigMappingUtils.class.getName(),
                     mappingMetadata.getClassName(), "getProperties", new String[0]));
+            reflectiveMethods.produce(new ReflectiveMethodBuildItem(ConfigMappingUtils.class.getName(),
+                    mappingMetadata.getClassName(), "getSecrets", new String[0]));
 
             configComponentInterfaces.add(mappingMetadata.getInterfaceType());
 
diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java
@@ -112,7 +112,7 @@ public Set<String> getPropertyNames() {
 
                     @Override
                     public String getValue(final String propertyName) {
-                        return config.getRawValue(propertyName);
+                        return config.getConfigValue(propertyName).getValue();
                     }
 
                     @Override
diff --git a/core/runtime/src/test/java/io/quarkus/runtime/configuration/ConfigProfileTestCase.java b/core/runtime/src/test/java/io/quarkus/runtime/configuration/ConfigProfileTestCase.java
@@ -1,7 +1,6 @@
 package io.quarkus.runtime.configuration;
 
 import static io.quarkus.runtime.configuration.ConfigUtils.emptyConfigBuilder;
-import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -84,7 +83,7 @@ void overriddenProfileHigherOrdinal() {
                     .withSources(new PropertiesConfigSource(maps("%foo.foo", "profile"), "source", 100))
                     .build();
 
-            assertEquals("default", config.getRawValue("foo"));
+            assertEquals("default", config.getConfigValue("foo").getValue());
         } finally {
             System.clearProperty("quarkus.profile");
         }
@@ -96,7 +95,7 @@ void profileNoErrorOnExpansion() {
         try {
             final SmallRyeConfig config = configBuilder("foo", "${noExpansionAvailable}", "%foo.foo", "profile").build();
 
-            assertEquals("profile", config.getRawValue("foo"));
+            assertEquals("profile", config.getConfigValue("foo").getValue());
         } finally {
             System.clearProperty("quarkus.profile");
         }
@@ -123,7 +122,7 @@ public void profileOnly() {
         try {
             final SmallRyeConfig config = buildConfig("my.prop", "1", "%prof.my.prop", "2");
 
-            assertEquals("2", config.getRawValue("my.prop"));
+            assertEquals("2", config.getConfigValue("my.prop").getValue());
         } finally {
             System.clearProperty("quarkus.profile");
         }
@@ -135,7 +134,7 @@ public void fallback() {
         try {
             final SmallRyeConfig config = buildConfig("my.prop", "1");
 
-            assertEquals("1", config.getRawValue("my.prop"));
+            assertEquals("1", config.getConfigValue("my.prop").getValue());
         } finally {
             System.clearProperty("quarkus.profile");
         }
@@ -148,7 +147,7 @@ public void expressions() {
         try {
             final SmallRyeConfig config = buildConfig("my.prop", "1", "%prof.my.prop", "${my.prop}");
 
-            assertThrows(IllegalArgumentException.class, () -> config.getRawValue("my.prop"));
+            assertThrows(IllegalArgumentException.class, () -> config.getConfigValue("my.prop"));
         } finally {
             System.clearProperty("quarkus.profile");
             System.clearProperty("my.prop");
@@ -164,7 +163,7 @@ public void profileExpressions() {
                     "%prof.my.prop", "${%prof.my.prop.profile}",
                     "%prof.my.prop.profile", "2");
 
-            assertEquals("2", config.getRawValue("my.prop"));
+            assertEquals("2", config.getConfigValue("my.prop").getValue());
         } finally {
             System.clearProperty("quarkus.profile");
             System.clearProperty("%prof.my.prop.profile");
@@ -196,7 +195,7 @@ public void noConfigProfile() {
                         new ExpressionConfigSourceInterceptor())
                 .build();
 
-        assertEquals("2", config.getRawValue("my.prop"));
+        assertEquals("2", config.getConfigValue("my.prop").getValue());
     }
 
     @Test
@@ -210,7 +209,7 @@ public void priorityProfile() {
                             100))
                     .build();
 
-            assertEquals("higher-profile", config.getRawValue("my.prop"));
+            assertEquals("higher-profile", config.getConfigValue("my.prop").getValue());
         } finally {
             System.clearProperty("quarkus.profile");
         }
@@ -227,7 +226,7 @@ public void priorityOverrideProfile() {
                             100))
                     .build();
 
-            assertEquals("higher", config.getRawValue("my.prop"));
+            assertEquals("higher", config.getConfigValue("my.prop").getValue());
         } finally {
             System.clearProperty("quarkus.profile");
         }
@@ -245,7 +244,7 @@ public void priorityProfileOverOriginal() {
                             100))
                     .build();
 
-            assertEquals("higher-profile", config.getRawValue("my.prop"));
+            assertEquals("higher-profile", config.getConfigValue("my.prop").getValue());
         } finally {
             System.clearProperty("quarkus.profile");
         }
@@ -257,11 +256,10 @@ public void propertyNames() {
         try {
             final SmallRyeConfig config = buildConfig("my.prop", "1", "%prof.my.prop", "2", "%prof.prof.only", "1");
 
-            assertEquals("2", config.getRawValue("my.prop"));
-            assertEquals("1", config.getRawValue("prof.only"));
+            assertEquals("2", config.getConfigValue("my.prop").getValue());
+            assertEquals("1", config.getConfigValue("prof.only").getValue());
 
-            final List<String> properties = StreamSupport.stream(config.getPropertyNames().spliterator(), false)
-                    .collect(toList());
+            final List<String> properties = StreamSupport.stream(config.getPropertyNames().spliterator(), false).toList();
             assertFalse(properties.contains("%prof.my.prop")); // We are removing profile properties in SmallRyeConfig and keep only the main name.
             assertTrue(properties.contains("my.prop"));
             assertTrue(properties.contains("prof.only"));
diff --git a/devtools/cli/src/test/java/io/quarkus/cli/config/SetConfigTest.java b/devtools/cli/src/test/java/io/quarkus/cli/config/SetConfigTest.java
@@ -34,7 +34,7 @@ void setUp() throws Exception {
     void addConfiguration() throws Exception {
         CliDriver.Result result = CliDriver.execute(tempDir, "config", "set", "foo.bar", "1234");
         assertEquals(0, result.getExitCode());
-        assertEquals("1234", config().getRawValue("foo.bar"));
+        assertEquals("1234", config().getConfigValue("foo.bar").getValue());
     }
 
     @Test
@@ -50,7 +50,7 @@ void setConfiguration() throws Exception {
         }
         CliDriver.Result result = CliDriver.execute(tempDir, "config", "set", "foo.bar", "5678");
         assertEquals(0, result.getExitCode());
-        assertEquals("5678", config().getRawValue("foo.bar"));
+        assertEquals("5678", config().getConfigValue("foo.bar").getValue());
     }
 
     @Test
@@ -61,7 +61,7 @@ void addEncryptedConfiguration() throws Exception {
         SmallRyeConfig config = config();
         assertEquals("1234", config.getConfigValue("foo.bar").getValue());
 
-        String encryption = config.getRawValue("smallrye.config.secret-handler.aes-gcm-nopadding.encryption-key");
+        String encryption = config.getConfigValue("smallrye.config.secret-handler.aes-gcm-nopadding.encryption-key").getValue();
         assertNotNull(encryption);
 
         result = CliDriver.execute(tempDir, "config", "set", "foo.baz", "5678", "-k");
diff --git a/devtools/gradle/gradle/libs.versions.toml b/devtools/gradle/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 plugin-publish = "2.0.0"
 
 kotlin = "2.2.20"
-smallrye-config = "3.13.4"
+smallrye-config = "3.14.0"
 
 junit5 = "5.13.4"
 assertj = "3.27.5"
diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryResourceTest.java
@@ -63,7 +63,7 @@ void resource() {
         final SpanData server = getSpanByKindAndParentId(spans, SERVER, "0000000000000000");
         assertEquals("GET /hello", server.getName());
         assertEquals("authservice", server.getResource().getAttribute(AttributeKey.stringKey("service.name")));
-        assertEquals(config.getRawValue("quarkus.uuid"),
+        assertEquals(config.getConfigValue("quarkus.uuid").getValue(),
                 server.getResource().getAttribute(AttributeKey.stringKey("service.instance.id")));
         assertNotNull(server.getResource().getAttribute(AttributeKey.stringKey("host.name")));
 
diff --git a/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/interceptor/WithSpanInterceptorTest.java b/extensions/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/interceptor/WithSpanInterceptorTest.java
@@ -302,7 +302,7 @@ public static class SpanRestClient {
         public void spanRestClient() {
             try (Client client = ClientBuilder.newClient()) {
                 WebTarget target = client.target(UriBuilder
-                        .fromUri(config.getRawValue("test.url"))
+                        .fromUri(config.getConfigValue("test.url").getValue())
                         .path("hello"));
                 Response response = target.request().get();
                 assertEquals(HTTP_OK, response.getStatus());
diff --git a/extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientOverrideRuntimeConfigTest.java b/extensions/resteasy-classic/resteasy-client/deployment/src/test/java/io/quarkus/restclient/configuration/RestClientOverrideRuntimeConfigTest.java
@@ -78,7 +78,7 @@ void buildTime() {
         Set<String> properties = StreamSupport.stream(config.getPropertyNames().spliterator(), false).collect(toSet());
         // MP/mp-rest/url - This one exists at build time
         assertTrue(properties.contains("BT-MP/mp-rest/url"));
-        assertEquals("from-mp", config.getRawValue("BT-MP/mp-rest/url"));
+        assertEquals("from-mp", config.getConfigValue("BT-MP/mp-rest/url").getValue());
         // quarkus.rest-client.MP.url - Is not set, and it is not recorded
         assertFalse(properties.contains("quarkus.rest-client.BT-MP.url"));
 
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLConfigMappingTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLConfigMappingTest.java
@@ -16,7 +16,7 @@ void graphQlRelocates() {
                 .withInterceptors(new SmallRyeGraphQLConfigMapping())
                 .build();
 
-        assertEquals("org.acme.CustomRuntimeException", config.getRawValue("mp.graphql.showErrorMessage"));
+        assertEquals("org.acme.CustomRuntimeException", config.getConfigValue("mp.graphql.showErrorMessage").getValue());
     }
 
     @Test
@@ -26,6 +26,6 @@ void graphQlRelocatesDiscovered() {
                 .addDiscoveredInterceptors()
                 .build();
 
-        assertEquals("org.acme.CustomRuntimeException", config.getRawValue("mp.graphql.showErrorMessage"));
+        assertEquals("org.acme.CustomRuntimeException", config.getConfigValue("mp.graphql.showErrorMessage").getValue());
     }
 }
diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/ConfigBuilderTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/ConfigBuilderTest.java
@@ -29,12 +29,12 @@ void staticConfigBuilder() {
 
     @Test
     void runTimeConfigBuilder() {
-        assertEquals("1234", config.getRawValue("additional.builder.property"));
+        assertEquals("1234", config.getConfigValue("additional.builder.property").getValue());
     }
 
     @Test
     void buildTimeConfigBuilder() {
         assertFalse(config.getConfigSource("BuildTimeConfigSource").isPresent());
-        assertEquals("1234", config.getRawValue("prop.recorded.from.btconfigsource"));
+        assertEquals("1234", config.getConfigValue("prop.recorded.from.btconfigsource").getValue());
     }
 }
diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RecorderRuntimeConfigTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RecorderRuntimeConfigTest.java
@@ -31,9 +31,9 @@ public class RecorderRuntimeConfigTest {
     @Test
     void runtimeConfig() {
         // Make sure we get the recorded property with the highest priority (the profile property with test)
-        assertEquals("from-application", config.getRawValue("recorded.property"));
-        assertEquals("from-application", config.getRawValue("recorded.profiled.property"));
-        assertEquals("from-application", config.getRawValue("quarkus.mapping.rt.record-profiled"));
+        assertEquals("from-application", config.getConfigValue("recorded.property").getValue());
+        assertEquals("from-application", config.getConfigValue("recorded.profiled.property").getValue());
+        assertEquals("from-application", config.getConfigValue("quarkus.mapping.rt.record-profiled").getValue());
         assertTrue(mappingRunTime.recordProfiled().isPresent());
         assertEquals("from-application", mappingRunTime.recordProfiled().get());
 
diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RenameConfigTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/RenameConfigTest.java
@@ -32,23 +32,23 @@ public class RenameConfigTest {
     @Test
     void rename() {
         assertEquals("1234", renameConfig.prop());
-        assertEquals("1234", config.getRawValue("quarkus.rename.prop"));
+        assertEquals("1234", config.getConfigValue("quarkus.rename.prop").getValue());
 
         assertEquals("only-in-new", renameConfig.onlyInNew());
         assertEquals("only-in-old", renameConfig.onlyInOld());
         assertEquals("new", renameConfig.inBoth());
 
         // This will always return values. It lookups on "rename" first and "rename-old" next
-        assertEquals("only-in-new", config.getRawValue("quarkus.rename.only-in-new"));
-        assertEquals("only-in-old", config.getRawValue("quarkus.rename.only-in-old"));
-        assertEquals("new", config.getRawValue("quarkus.rename.in-both"));
+        assertEquals("only-in-new", config.getConfigValue("quarkus.rename.only-in-new").getValue());
+        assertEquals("only-in-old", config.getConfigValue("quarkus.rename.only-in-old").getValue());
+        assertEquals("new", config.getConfigValue("quarkus.rename.in-both").getValue());
 
-        assertEquals("only-in-new", config.getRawValue("quarkus.rename-old.only-in-new"));
-        assertEquals("only-in-old", config.getRawValue("quarkus.rename-old.only-in-old"));
-        assertEquals("new", config.getRawValue("quarkus.rename-old.in-both"));
+        assertEquals("only-in-new", config.getConfigValue("quarkus.rename-old.only-in-new").getValue());
+        assertEquals("only-in-old", config.getConfigValue("quarkus.rename-old.only-in-old").getValue());
+        assertEquals("new", config.getConfigValue("quarkus.rename-old.in-both").getValue());
 
-        assertEquals("old-default", config.getRawValue("quarkus.rename.with-default"));
-        assertEquals("old-default", config.getRawValue("quarkus.rename-old.with-default"));
+        assertEquals("old-default", config.getConfigValue("quarkus.rename.with-default").getValue());
+        assertEquals("old-default", config.getConfigValue("quarkus.rename-old.with-default").getValue());
         assertEquals("old-default", renameConfig.withDefault());
 
         // Make sure we only record the actual properties in the sources (and not renamed properties)
@@ -65,10 +65,10 @@ void rename() {
         assertNull(buildTimeRunTimeDefaults.getValue("quarkus.rename-old.in-both"));
         // Relocate / Fallback properties, not in the source but values are not null when Config is queried
         assertNull(buildTimeRunTimeDefaults.getValue("quarkus.rename-old.prop"));
-        assertNotNull(config.getRawValue("quarkus.rename-old.prop"));
+        assertNotNull(config.getConfigValue("quarkus.rename-old.prop").getValue());
         assertNull(buildTimeRunTimeDefaults.getValue("quarkus.rename-old.only-in-new"));
-        assertNotNull(config.getRawValue("quarkus.rename-old.only-in-new"));
+        assertNotNull(config.getConfigValue("quarkus.rename-old.only-in-new").getValue());
         assertNull(buildTimeRunTimeDefaults.getValue("quarkus.rename-old.only-in-old"));
-        assertNotNull(config.getRawValue("quarkus.rename-old.only-in-old"));
+        assertNotNull(config.getConfigValue("quarkus.rename-old.only-in-old").getValue());
     }
 }
diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/SecretKeysConfigInterceptorFactory.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/config/SecretKeysConfigInterceptorFactory.java
@@ -5,11 +5,12 @@
 import io.smallrye.config.ConfigSourceInterceptor;
 import io.smallrye.config.ConfigSourceInterceptorContext;
 import io.smallrye.config.ConfigSourceInterceptorFactory;
+import io.smallrye.config.PropertyName;
 import io.smallrye.config.SecretKeysConfigSourceInterceptor;
 
 public class SecretKeysConfigInterceptorFactory implements ConfigSourceInterceptorFactory {
     @Override
     public ConfigSourceInterceptor getInterceptor(final ConfigSourceInterceptorContext configSourceInterceptorContext) {
-        return new SecretKeysConfigSourceInterceptor(Set.of("secrets.my.secret"));
+        return new SecretKeysConfigSourceInterceptor(Set.of(PropertyName.name("secrets.my.secret")));
     }
 }
diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java
@@ -112,7 +112,7 @@ public void testConfigDefaultValuesSourceOrdinal() {
         assertEquals("1234", defaultValues.getValue("my.prop"));
         assertEquals("1234", applicationProperties.getValue("my.prop"));
 
-        assertEquals("9999", config.getRawValue("my.prop"));
+        assertEquals("9999", config.getConfigValue("my.prop").getValue());
     }
 
     @Test
@@ -133,7 +133,7 @@ public void testProfileDefaultValuesSource() {
         assertNull(defaultValues.getValue("quarkus.mapping.rt.do-not-record"));
         assertNull(defaultValues.getValue("%prod.quarkus.mapping.rt.do-not-record"));
         assertNull(defaultValues.getValue("%dev.quarkus.mapping.rt.do-not-record"));
-        assertEquals("value", config.getRawValue("quarkus.mapping.rt.do-not-record"));
+        assertEquals("value", config.getConfigValue("quarkus.mapping.rt.do-not-record").getValue());
     }
 
     @Test
diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java
@@ -32,22 +32,22 @@ void doNotRecordEnvRuntimeDefaults() {
         assertTrue(defaultValues.isPresent());
         // Do not record Env values for runtime
         assertNull(defaultValues.get().getValue("quarkus.mapping.rt.do-not-record"));
-        assertEquals("value", config.getRawValue("quarkus.mapping.rt.do-not-record"));
+        assertEquals("value", config.getConfigValue("quarkus.mapping.rt.do-not-record").getValue());
         // Property available in both Env and application.properties, ok to record application.properties value
         assertEquals("from-app", defaultValues.get().getValue("bt.ok.to.record"));
         // You still get the value from Env
-        assertEquals("from-env", config.getRawValue("bt.ok.to.record"));
+        assertEquals("from-env", config.getConfigValue("bt.ok.to.record").getValue());
         // Do not record any of the other properties
         assertNull(defaultValues.get().getValue(("do.not.record")));
         assertNull(defaultValues.get().getValue(("DO_NOT_RECORD")));
-        assertEquals("value", config.getRawValue("do.not.record"));
+        assertEquals("value", config.getConfigValue("do.not.record").getValue());
     }
 
     @Test
     void doNotRecordActiveUnprofiledPropertiesDefaults() {
         Optional<ConfigSource> defaultValues = config.getConfigSource("DefaultValuesConfigSource");
         assertTrue(defaultValues.isPresent());
-        assertEquals("properties", config.getRawValue("bt.profile.record"));
+        assertEquals("properties", config.getConfigValue("bt.profile.record").getValue());
         // Property needs to be recorded as is, including the profile name
         assertEquals("properties", defaultValues.get().getValue("%test.bt.profile.record"));
         assertNull(defaultValues.get().getValue("bt.profile.record"));
@@ -65,6 +65,6 @@ void recordDefaultFromRootEvenIfInActiveProfile() {
     void recordProfile() {
         Optional<ConfigSource> defaultValues = config.getConfigSource("DefaultValuesConfigSource");
         assertTrue(defaultValues.isPresent());
-        assertEquals("record", config.getRawValue("quarkus.profile"));
+        assertEquals("record", config.getConfigValue("quarkus.profile").getValue());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ public Set<String> getPropertyNames() {`
`387`	`387`	`@Override`
`388`	`388`	`public String getValue(final String propertyName) {`
`389`	`389`	`// Required because some interceptors call getValue when iterating names`
`390`		`- return config.getRawValue(propertyName);`
	`390`	`+ return config.getConfigValue(propertyName).getValue();`
`391`	`391`	`}`
`392`	`392`	`};`
`393`	`393`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public Set<String> getPropertyNames() {`
`112`	`112`
`113`	`113`	`@Override`
`114`	`114`	`public String getValue(final String propertyName) {`
`115`		`- return config.getRawValue(propertyName);`
	`115`	`+ return config.getConfigValue(propertyName).getValue();`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`@Override`