Relocate property keys with multiple profiles

Signed-off-by: Emanuel Alves <[email protected]>
smallrye · Sep 15, 2023 · 88b8c82 · 88b8c82
1 parent e06b7b7
commit 88b8c82
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/implementation/src/main/java/io/smallrye/config/ProfileConfigSourceInterceptor.java b/implementation/src/main/java/io/smallrye/config/ProfileConfigSourceInterceptor.java
@@ -93,7 +93,13 @@ private String normalizeName(final String name) {
     }
 
     public static List<String> convertProfile(final String profile) {
-        List<String> profiles = newCollectionConverter(newTrimmingConverter(STRING_CONVERTER), ArrayList::new).convert(profile);
+        final String value;
+        if (profile.charAt(0) == '"' && profile.charAt(profile.length() - 1) == '"') {
+            value = profile.substring(2, profile.length() - 1);
+        } else {
+            value = profile;
+        }
+        List<String> profiles = newCollectionConverter(newTrimmingConverter(STRING_CONVERTER), ArrayList::new).convert(value);
         return profiles != null ? profiles : Collections.emptyList();
     }
 }
diff --git a/implementation/src/main/java/io/smallrye/config/SmallRyeConfigBuilder.java b/implementation/src/main/java/io/smallrye/config/SmallRyeConfigBuilder.java
@@ -249,6 +249,16 @@ public ConfigSourceInterceptor getInterceptor(final ConfigSourceInterceptorConte
                             multipleProfileProperties
                                     .add(new MultipleProfileProperty(name, name.substring(profileSegment.length()), profiles));
                         }
+                    } else if (name.length() > 1 && name.charAt(0) == '"' && name.charAt(1) == '%') {
+                        String segments = name.substring(name.indexOf('"', 1) + 1);
+                        NameIterator ni = new NameIterator(name);
+                        String profileSegment = ni.getNextSegment();
+                        List<String> profiles = convertProfile(profileSegment.substring(1));
+
+                        if (profiles.size() > 1) {
+                            multipleProfileProperties
+                                    .add(new MultipleProfileProperty(name, segments, profiles));
+                        }
                     }
                 }
 

diff --git a/implementation/src/test/java/io/smallrye/config/ProfileConfigSourceInterceptorTest.java b/implementation/src/test/java/io/smallrye/config/ProfileConfigSourceInterceptorTest.java
@@ -220,6 +220,29 @@ void multipleProfiles() {
         assertEquals("5678", config.getRawValue("my.prop"));
     }
 
+    @Test
+    void multipleProfilesWithDynamicKey() {
+        SmallRyeConfig config = new SmallRyeConfigBuilder()
+                .withSources(config(SMALLRYE_CONFIG_PROFILE, "\"%common,prof\"", "config_ordinal", "1000"))
+                .withSources(config("%common.common.prop", "1234", "%prof.my.prop", "5678"))
+                .addDefaultInterceptors()
+                .build();
+
+        assertEquals("1234", config.getRawValue("common.prop"));
+        assertEquals("5678", config.getRawValue("my.prop"));
+    }
+
+    @Test
+    void relocatePropertyKeysWithMultipleProfiles() {
+        SmallRyeConfig config = new SmallRyeConfigBuilder()
+                .withSources(config(SMALLRYE_CONFIG_PROFILE, "common", "config_ordinal", "1000"))
+                .withSources(config("\"%common,another\".my.prop", "1234"))
+                .addDefaultInterceptors()
+                .build();
+
+        assertEquals("1234", config.getRawValue("my.prop"));
+    }
+
     @Test
     void multipleProfilesDocs() {
         SmallRyeConfig config = new SmallRyeConfigBuilder()