Get correct map key for config maps of maps, with tests.

Fixes #5982

core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java

@@ -459,9 +459,9 @@ private Map<String, Object> getMap(MapContainer matched, NameIterator ni) {
                 ni.previous();
                 // now the cursor is before our map key and after the enclosing map key
                 Map<String, Object> map = getMap((MapContainer) parent, ni);
+                String key = ni.getPreviousSegment();
                 ni.next();
                 // cursor restored
-                String key = ni.getPreviousSegment();
                 Map<String, Object> instance = getAsMap(map, key);
                 if (instance == null) {
                     instance = new HashMap<>();

core/test-extension/deployment/src/main/java/io/quarkus/extest/deployment/TestProcessor.java

@@ -20,6 +20,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.BooleanSupplier;
 
@@ -458,6 +459,16 @@ void registerFinalFieldReflectionObject(BuildProducer<ReflectiveClassBuildItem>
         classes.produce(finalField);
     }
 
+    @BuildStep
+    void checkMapMap(TestBuildAndRunTimeConfig btrt, TestBuildTimeConfig bt, BuildProducer<ReflectiveClassBuildItem> unused) {
+        if (!Objects.equals("1234", btrt.mapMap.get("outer-key").get("inner-key"))) {
+            throw new AssertionError("BTRT map map failed");
+        }
+        if (!Objects.equals("1234", bt.mapMap.get("outer-key").get("inner-key"))) {
+            throw new AssertionError("BT map map failed");
+        }
+    }
+
     @BuildStep(onlyIf = Never.class)
     void neverRunThisOne() {
         throw new IllegalStateException("Not supposed to run!");

core/test-extension/deployment/src/main/resources/application.properties

@@ -113,3 +113,8 @@ quarkus.btrt.my-enums=optional,enum-one,enum-two
 
 ### anonymous root property
 quarkus.test-property=foo
+
+### map of map of strings
+quarkus.rt.map-map.outer-key.inner-key=1234
+quarkus.btrt.map-map.outer-key.inner-key=1234
+quarkus.bt.map-map.outer-key.inner-key=1234

core/test-extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java

@@ -268,4 +268,26 @@ public void testConversionUsingConvertWith() {
         List<Integer> actualMapValues = new ArrayList<>(configuredBean.getRunTimeConfig().mapOfNumbers.values());
         Assertions.assertEquals(mapValues, actualMapValues);
     }
+
+    @Test
+    public void testBtrtMapOfMap() {
+        Map<String, Map<String, String>> mapMap = configuredBean.getBuildTimeConfig().mapMap;
+        Assertions.assertFalse(mapMap.containsKey("inner-key"));
+        Assertions.assertTrue(mapMap.containsKey("outer-key"));
+        Map<String, String> map = mapMap.get("outer-key");
+        Assertions.assertTrue(map.containsKey("inner-key"));
+        Assertions.assertFalse(map.containsKey("outer-key"));
+        Assertions.assertEquals("1234", map.get("inner-key"));
+    }
+
+    @Test
+    public void testRtMapOfMap() {
+        Map<String, Map<String, String>> mapMap = configuredBean.getRunTimeConfig().mapMap;
+        Assertions.assertFalse(mapMap.containsKey("inner-key"));
+        Assertions.assertTrue(mapMap.containsKey("outer-key"));
+        Map<String, String> map = mapMap.get("outer-key");
+        Assertions.assertTrue(map.containsKey("inner-key"));
+        Assertions.assertFalse(map.containsKey("outer-key"));
+        Assertions.assertEquals("1234", map.get("inner-key"));
+    }
 }

core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/MapMapConfig.java

@@ -0,0 +1,17 @@
+package io.quarkus.extest.runtime.config;
+
+import java.util.Map;
+
+import io.quarkus.runtime.annotations.ConfigPhase;
+import io.quarkus.runtime.annotations.ConfigRoot;
+
+/**
+ *
+ */
+@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED, name = "mm-root")
+public class MapMapConfig {
+    //### map of map of strings
+    //quarkus.mm-root.map.inner-key.outer-key=1234
+
+    Map<String, Map<String, String>> map;
+}

core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/TestBuildAndRunTimeConfig.java

@@ -38,6 +38,8 @@ public class TestBuildAndRunTimeConfig {
     @ConvertWith(WholeNumberConverter.class)
     public Map<String, Integer> mapOfNumbers;
 
+    public Map<String, Map<String, String>> mapMap;
+
     /**
      * Enum object
      */

core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/TestBuildTimeConfig.java

@@ -1,5 +1,7 @@
 package io.quarkus.extest.runtime.config;
 
+import java.util.Map;
+
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
@@ -25,6 +27,8 @@ public class TestBuildTimeConfig {
     @ConfigItem
     public AllValuesConfig allValues;
 
+    public Map<String, Map<String, String>> mapMap;
+
     public TestBuildTimeConfig() {
 
     }

core/test-extension/runtime/src/main/java/io/quarkus/extest/runtime/config/TestRunTimeConfig.java

@@ -107,6 +107,8 @@ public class TestRunTimeConfig {
     @ConvertWith(WholeNumberConverter.class)
     public Map<String, Integer> mapOfNumbers;
 
+    public Map<String, Map<String, String>> mapMap;
+
     @Override
     public String toString() {
         return "TestRunTimeConfig{" +