Mapping defaults to ConfigSourceContext (#1060)

smallrye · Dec 5, 2023 · 6d1db48 · 6d1db48
1 parent 851c35b
commit 6d1db48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/implementation/src/main/java/io/smallrye/config/SmallRyeConfigBuilder.java b/implementation/src/main/java/io/smallrye/config/SmallRyeConfigBuilder.java
@@ -697,6 +697,9 @@ public SmallRyeConfig build() {
                 .forEach(customizer -> customizer.configBuilder(SmallRyeConfigBuilder.this));
 
         ConfigMappingProvider mappingProvider = mappingsBuilder.build();
+        for (Map.Entry<String, String> entry : mappingProvider.getDefaultValues().entrySet()) {
+            defaultValues.putIfAbsent(entry.getKey(), entry.getValue());
+        }
         SmallRyeConfig config = new SmallRyeConfig(this);
         ConfigMappings.mapConfiguration(config, mappingProvider);
         return config;

diff --git a/implementation/src/test/java/io/smallrye/config/ConfigSourceFactoryTest.java b/implementation/src/test/java/io/smallrye/config/ConfigSourceFactoryTest.java
@@ -48,10 +48,11 @@ void expression() {
         SmallRyeConfig config = new SmallRyeConfigBuilder()
                 .addDefaultInterceptors()
                 .withSources(new ExpressionConfigSourceFactory())
-                .withSources(config("expression.value", "12${DEFAULT:}"))
-                .withSources(new EnvConfigSource(Map.of("DEFAULT", "34"), 100))
+                .withSources(new EnvConfigSource(Map.of("DEFAULT", "1234"), 100))
+                .withMapping(Expression.class)
                 .build();
 
+        assertEquals("1234", config.getConfigMapping(Expression.class).value());
         assertEquals("1234", config.getRawValue("factory.expression"));
     }