Merge pull request #45548 from radcortez/override-build-defaults-in-r…

…untime Avoid NPE when recording ConfigValue
quarkusio · Jan 14, 2025 · 546d44d · 546d44d
2 parents 43f9421 + b8e5816
commit 546d44d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/...yment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java b/...yment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java
@@ -638,22 +638,22 @@ ReadResult run() {
                     unknownBuildProperties.remove(property);
                     ConfigValue value = config.getConfigValue(property);
                     if (value.getRawValue() != null) {
-                        allBuildTimeValues.put(value.getNameProfiled(), value);
+                        allBuildTimeValues.put(value.getNameProfiled(), value.noProblems().withValue(value.getRawValue()));
                     }
                 }
                 if (buildTimeRunTimeNames.contains(name)) {
                     unknownBuildProperties.remove(property);
                     ConfigValue value = config.getConfigValue(property);
                     if (value.getRawValue() != null) {
-                        allBuildTimeValues.put(value.getNameProfiled(), value);
-                        buildTimeRunTimeValues.put(value.getNameProfiled(), value);
+                        allBuildTimeValues.put(value.getNameProfiled(), value.noProblems().withValue(value.getRawValue()));
+                        buildTimeRunTimeValues.put(value.getNameProfiled(), value.noProblems().withValue(value.getRawValue()));
                     }
                 }
                 if (runTimeNames.contains(name)) {
                     unknownBuildProperties.remove(property);
                     ConfigValue value = runtimeConfig.getConfigValue(property);
                     if (value.getRawValue() != null) {
-                        runTimeValues.put(value.getNameProfiled(), value);
+                        runTimeValues.put(value.getNameProfiled(), value.noProblems().withValue(value.getRawValue()));
                     }
                 }
             }

diff --git a/...est-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfigMappingTest.java b/...est-extension/extension/deployment/src/test/java/io/quarkus/extest/ConfigMappingTest.java
@@ -12,17 +12,13 @@
 import io.quarkus.extest.runtime.config.TestMappingBuildTimeRunTime;
 import io.quarkus.extest.runtime.config.TestMappingRunTime;
 import io.quarkus.test.QuarkusUnitTest;
-import io.smallrye.config.SmallRyeConfig;
 
 public class ConfigMappingTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addAsResource("application.properties"));
 
-    @Inject
-    SmallRyeConfig config;
-
     @Inject
     TestMappingBuildTimeRunTime mappingBuildTimeRunTime;
     @Inject

diff --git a/...n/runtime/src/main/java/io/quarkus/extest/runtime/config/TestMappingBuildTimeRunTime.java b/...n/runtime/src/main/java/io/quarkus/extest/runtime/config/TestMappingBuildTimeRunTime.java
@@ -1,8 +1,11 @@
 package io.quarkus.extest.runtime.config;
 
+import java.util.Optional;
+
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 
 @ConfigMapping(prefix = "quarkus.mapping.btrt")
 @ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
@@ -12,6 +15,12 @@ public interface TestMappingBuildTimeRunTime {
      */
     String value();
 
+    /**
+     * A expression value
+     */
+    @WithDefault("${quarkus.mapping.btrt.expression.value}")
+    Optional<String> expression();
+
     /**
      * A nested Group.
      */