Remove and Add after matching Environment Variables (#1365)

Author: radcortez

implementation/src/main/java/io/smallrye/config/EnvConfigSource.java

@@ -179,8 +179,8 @@ private boolean matchEnvWithProperty(final String prefix, final String property,
         if (prefixDashes[0] == 0 && nameDashes[0] == 0) {
             // Properties are equals, but may contain Map key uppercases, so replace
             if (EnvName.equals(activeEnvName, property)) {
-                envVars.getNames().add(property);
                 envVars.getNames().remove(envName);
+                envVars.getNames().add(property);
             }
             return false;
         }
@@ -200,14 +200,14 @@ private boolean matchEnvWithProperty(final String prefix, final String property,
 
         // Properties are equals, but may contain Map key uppercases, so replace
         if (EnvName.equals(property, dashedEnvName)) {
-            envVars.getNames().add(property);
             envVars.getNames().remove(envName);
+            envVars.getNames().add(property);
             return true;
         }
 
         if (!activeEnvName.contentEquals(sb)) {
-            envVars.getNames().add(dashedEnvName);
             envVars.getNames().remove(envName);
+            envVars.getNames().add(dashedEnvName);
             return true;
         }
         return false;

implementation/src/test/java/io/smallrye/config/EnvConfigSourceTest.java

@@ -31,6 +31,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -43,6 +44,7 @@
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.junit.jupiter.api.Test;
 
+import io.smallrye.config.ConfigSourceFactory.ConfigurableConfigSourceFactory;
 import io.smallrye.config.EnvConfigSource.EnvName;
 
 /**
@@ -520,7 +522,7 @@ interface Nested {
 
     @Test
     void mappingFactory() {
-        ConfigSourceFactory.ConfigurableConfigSourceFactory<MappingFactory> sourceFactory = new ConfigSourceFactory.ConfigurableConfigSourceFactory<>() {
+        ConfigurableConfigSourceFactory<MappingFactory> sourceFactory = new ConfigurableConfigSourceFactory<>() {
             @Override
             public Iterable<ConfigSource> getConfigSources(final ConfigSourceContext context, final MappingFactory mapping) {
                 assertEquals("value", mapping.aValue());
@@ -801,6 +803,32 @@ interface Nested {
         }
     }
 
+    @Test
+    void matchEnvVarWithFactory() {
+        SmallRyeConfig config = new SmallRyeConfigBuilder()
+                .withSources(new MatchEnvVarConfigSourceFactory())
+                .withSources(new EnvConfigSource(Map.of(
+                        "MAP_KEY", "value"), 300))
+                .withMapping(MatchEnvVarWithFactory.class)
+                .build();
+
+        MatchEnvVarWithFactory mapping = config.getConfigMapping(MatchEnvVarWithFactory.class);
+
+        assertEquals("value", mapping.map().get("key"));
+    }
+
+    @ConfigMapping(prefix = "")
+    interface MatchEnvVarWithFactory {
+        Map<String, String> map();
+    }
+
+    static class MatchEnvVarConfigSourceFactory implements ConfigurableConfigSourceFactory<MatchEnvVarWithFactory> {
+        @Override
+        public Iterable<ConfigSource> getConfigSources(final ConfigSourceContext context, final MatchEnvVarWithFactory config) {
+            return Collections.emptyList();
+        }
+    }
+
     private static boolean envSourceEquals(String name, String lookup) {
         return BOOLEAN_CONVERTER.convert(new EnvConfigSource(Map.of(name, "true"), 100).getValue(lookup));
     }