fix: handle empty nested maps in yaml

Author: SethFalco

deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/MapUtils.java

@@ -171,8 +171,15 @@ private static <V> void addIterable(final Iterable<V> value,
         {
             if (o instanceof Map)
             {
+                final Map map = (Map) o;
+
+                if (map.isEmpty())
+                {
+                    continue;
+                }
+
                 final String keyPrefix = (indexed) ? key + "[" + index++ + "]" : key;
-                flattenMapProperties((Map) o, output, indexed, keyPrefix);
+                flattenMapProperties((Map) map, output, indexed, keyPrefix);
             }
             else
             {

deltaspike/core/api/src/test/java/org/apache/deltaspike/core/util/MapUtilsTest.java

@@ -160,6 +160,8 @@ public void testFlattenWithObjectArrayLists()
     }
 
     /**
+     * Ignore nested null values.
+     *
      * application:
      *   name: More Apps
      *   messages:
@@ -201,8 +203,8 @@ public void testFlattenWithObjectArrayListsWithNull()
 
         Assert.assertEquals(3, result.size());
         Assert.assertEquals("More Apps", result.get("application.name"));
-        Assert.assertEquals("one,null,three", result.get("application.messages.source"));
-        Assert.assertEquals("two,null,four", result.get("application.messages.target"));
+        Assert.assertEquals("one,three", result.get("application.messages.source"));
+        Assert.assertEquals("two,four", result.get("application.messages.target"));
     }
 
     /**
@@ -246,6 +248,51 @@ public void testFlattenWithObjectArrayIndexed()
         Assert.assertEquals("four", result.get("application.messages[1].target"));
     }
 
+    /**
+     * Ignore nested null values.
+     *
+     * application:
+     *   name: More Apps
+     *   messages:
+     *     - source: one
+     *       target: two
+     *     - source: null
+     *       target: null
+     *     - source: three
+     *       target: four
+     */
+    @Test
+    public void testFlattenWithObjectArrayIndexedWithNull()
+    {
+        Map<String, String> message1 = new HashMap<>();
+        message1.put("source", "one");
+        message1.put("target", "two");
+
+        Map<String, String> message2 = new HashMap<>();
+        message2.put("source", "three");
+        message2.put("target", "four");
+
+        List<Map<String, String>> messages = new ArrayList<>();
+        messages.add(message1);
+        messages.add(message2);
+
+        Map<String, Object> application = new HashMap<>();
+        application.put("name", "More Apps");
+        application.put("messages", messages);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("application", application);
+
+        Map<String, String> result = MapUtils.flattenMapProperties(map, true);
+
+        Assert.assertEquals(5, result.size());
+        Assert.assertEquals("More Apps", result.get("application.name"));
+        Assert.assertEquals("one", result.get("application.messages[0].source"));
+        Assert.assertEquals("two", result.get("application.messages[0].target"));
+        Assert.assertEquals("three", result.get("application.messages[1].source"));
+        Assert.assertEquals("four", result.get("application.messages[1].target"));
+    }
+
     /**
      * application:
      *   name: Null App

…pike/yaml/test/YamlConfigSourceTest.java …pike/yaml/impl/YamlConfigSourceTest.javadeltaspike/modules/yaml/impl/src/test/java/org/apache/deltaspike/yaml/test/YamlConfigSourceTest.java renamed to deltaspike/modules/yaml/impl/src/test/java/org/apache/deltaspike/yaml/impl/YamlConfigSourceTest.java deltaspike/modules/yaml/impl/src/test/java/org/apache/deltaspike/yaml/test/YamlConfigSourceTest.java renamed to deltaspike/modules/yaml/impl/src/test/java/org/apache/deltaspike/yaml/impl/YamlConfigSourceTest.java

@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.deltaspike.yaml.test;
+package org.apache.deltaspike.yaml.impl;
 
-import org.apache.deltaspike.yaml.impl.YamlConfigSource;
 import org.junit.Assert;
 import org.junit.Test;