Fix ConfigMappings, Optional in Group in Map. (#494)

smallrye · Jan 27, 2021 · 8e0aa94 · 8e0aa94
1 parent 54829e1
commit 8e0aa94
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/implementation/src/main/java/io/smallrye/config/ConfigMappingProvider.java b/implementation/src/main/java/io/smallrye/config/ConfigMappingProvider.java
@@ -320,13 +320,13 @@ private void processLazyGroupInGroup(ArrayDeque<String> currentPath,
                         if (primitiveProperty.hasDefaultValue()) {
                             defaultValues.findOrAdd(currentPath).putRootValue(primitiveProperty.getDefaultValue());
                         }
-                    } else if (property.isLeaf()) {
-                        LeafProperty leafProperty = property.asLeaf();
+                    } else if (property.isLeaf() && optional) {
+                        LeafProperty leafProperty = property.asOptional().getNestedProperty().asLeaf();
                         if (leafProperty.hasDefaultValue()) {
                             defaultValues.findOrAdd(currentPath).putRootValue(leafProperty.getDefaultValue());
                         }
                     } else {
-                        LeafProperty leafProperty = property.asOptional().getNestedProperty().asLeaf();
+                        LeafProperty leafProperty = property.asLeaf();
                         if (leafProperty.hasDefaultValue()) {
                             defaultValues.findOrAdd(currentPath).putRootValue(leafProperty.getDefaultValue());
                         }

diff --git a/implementation/src/test/java/io/smallrye/config/ConfigMappingInterfaceTest.java b/implementation/src/test/java/io/smallrye/config/ConfigMappingInterfaceTest.java
@@ -240,6 +240,9 @@ void optionals() {
                 put("server.port", "8080");
                 put("optional", "optional");
                 put("optional.int", "9");
+                put("info.name", "server");
+                put("info.login", "login");
+                put("info.password", "password");
             }
         };
 
@@ -257,6 +260,13 @@ void optionals() {
         assertEquals("optional", optionals.optional().get());
         assertTrue(optionals.optionalInt().isPresent());
         assertEquals(9, optionals.optionalInt().getAsInt());
+
+        assertFalse(optionals.info().isEmpty());
+        assertEquals("server", optionals.info().get("info").name());
+        assertTrue(optionals.info().get("info").login().isPresent());
+        assertEquals("login", optionals.info().get("info").login().get());
+        assertTrue(optionals.info().get("info").password().isPresent());
+        assertEquals("password", optionals.info().get("info").password().get());
     }
 
     @Test
@@ -607,6 +617,17 @@ public interface Optionals {
 
         @WithName("optional.int")
         OptionalInt optionalInt();
+
+        @WithParentName
+        Map<String, Info> info();
+
+        interface Info {
+            String name();
+
+            Optional<String> login();
+
+            Optional<String> password();
+        }
     }
 
     public interface CollectionTypes {