Merge pull request payara#6550 from poikilotherm/6549-mpc-profile-npe

FISH-8317 - Microprofile Config NPE for profiled setting
Pandrex247 · May 8, 2024 · 61ad469 · 61ad469
1 parent 772f86d
commit 61ad469
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/...e/src/main/java/fish/payara/nucleus/microprofile/config/spi/ConfigExpressionResolver.java b/...e/src/main/java/fish/payara/nucleus/microprofile/config/spi/ConfigExpressionResolver.java
@@ -109,8 +109,12 @@ private ConfigValueImpl resolve(String propertyName, String propertyDefault, boo
 
         if(profile != null && result != null) {
             ConfigValueImpl resultWithoutProfile = getValue(resolveExpression(propertyName));
-            result = resultWithoutProfile.getSourceOrdinal() == result.getSourceOrdinal() ? result :
-                    (resultWithoutProfile.getSourceOrdinal() > result.getSourceOrdinal()) ? resultWithoutProfile : result;
+            // Note: In case there is a non-profiled value from a source with the same ordinal value, it will be ignored.
+            //       All spec versions including v3.1 do not include a definition for this edge case -
+            //       all sources are supposed to have a unique ordinal value.
+            if (resultWithoutProfile != null && resultWithoutProfile.getSourceOrdinal() > result.getSourceOrdinal()) {
+                result = resultWithoutProfile;
+            }
         } 
 
 

diff --git a/...c/test/java/fish/payara/nucleus/microprofile/config/spi/ConfigExpressionResolverTest.java b/...c/test/java/fish/payara/nucleus/microprofile/config/spi/ConfigExpressionResolverTest.java
@@ -45,6 +45,7 @@
 import org.junit.Test;
 
 import java.util.HashMap;
+import java.util.Set;
 
 import static fish.payara.nucleus.microprofile.config.spi.ConfigTestUtils.createSource;
 import static java.util.Collections.singleton;
@@ -55,7 +56,10 @@
 public class ConfigExpressionResolverTest {
 
     private final ConfigSource source = createSource("S1", 100, new HashMap<>());
-    private final ConfigExpressionResolver resolver = new ConfigExpressionResolver(singleton(source), "test");
+    private final ConfigSource sourceHigherOrdinal = createSource("SHO", 110, new HashMap<>());
+    private final ConfigSource sourceEqualOrdinal = createSource("SEO", 100, new HashMap<>());
+    private final ConfigSource sourceLowerOrdinal = createSource("SEO", 90, new HashMap<>());
+    private final ConfigExpressionResolver resolver = new ConfigExpressionResolver(Set.of(source, sourceHigherOrdinal, sourceEqualOrdinal, sourceLowerOrdinal), "test");
 
     @Before
     public void configureConfigProperties() {
@@ -74,6 +78,13 @@ public void configureConfigProperties() {
         source.getProperties().put("default.key.reference", "${${not.existing:key}:not.found}");
         source.getProperties().put("%test.fish.payara.badger", "mushroom");
         source.getProperties().put("fish.payara.badger", "badger");
+        source.getProperties().put("%test.fish.payara.rod", "bites");
+
+        sourceHigherOrdinal.getProperties().put("fish.payara.rod", "nobites");
+        sourceHigherOrdinal.getProperties().put("%test.fish.payara.profile-only", "gotcha");
+
+        sourceEqualOrdinal.getProperties().put("fish.payara.badger", "i-shall-be-ignored");
+        sourceLowerOrdinal.getProperties().put("fish.payara.badger", "i-shall-be-ignored");
     }
 
     @Test
@@ -180,9 +191,25 @@ public void testExpressionExpansionDisabled() {
 
     @Test
     public void testProfiles() {
+        // This test case does not only test if the profiled value is used from the same source, but also if the
+        // defined equal and lower ordinal sources are ignored
         ConfigValue result = resolver.resolve("fish.payara.badger");
         assertEquals("mushroom", result.getValue());
         assertEquals("mushroom", result.getRawValue());
     }
 
+    @Test
+    public void testProfilesOverrideProfiledValueFromSourceWithHigherOrdinal() {
+        ConfigValue result = resolver.resolve("fish.payara.rod");
+        assertEquals("nobites", result.getValue());
+        assertEquals("nobites", result.getRawValue());
+    }
+
+    @Test
+    public void testProfilesDoNotFailToLookupWhenOnlyProfiledValueExists() {
+        ConfigValue result = resolver.resolve("fish.payara.profile-only");
+        assertEquals("gotcha", result.getValue());
+        assertEquals("gotcha", result.getRawValue());
+    }
+
 }