Add $.fromXmlMakeArrays(xml) method to lodash module.

Author: javadev

src/main/java/com/github/underscore/lodash/$.java

@@ -2519,15 +2519,16 @@ private static Object getValue(final Object value) {
     }
 
     @SuppressWarnings("unchecked")
-    private static Map<String, Object> createMap(final org.w3c.dom.Node node) {
+    private static Map<String, Object> createMap(final org.w3c.dom.Node node,
+        final Function<Object, Object> nodeMapper) {
         final Map<String, Object> map = newLinkedHashMap();
         final org.w3c.dom.NodeList nodeList = node.getChildNodes();
         for (int index = 0; index < nodeList.getLength(); index++) {
             final org.w3c.dom.Node currentNode = nodeList.item(index);
             final String name = currentNode.getNodeName();
             final Object value;
             if (currentNode.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE) {
-                value = createMap(currentNode);
+                value = createMap(currentNode, nodeMapper);
             } else {
                 value = currentNode.getTextContent();
             }
@@ -2545,7 +2546,7 @@ private static Map<String, Object> createMap(final org.w3c.dom.Node node) {
                     map.put(name, objects);
                 }
             } else {
-                map.put(name, getValue(value));
+                map.put(name, nodeMapper.apply(getValue(value)));
             }
         }
         return map;
@@ -2558,7 +2559,28 @@ public static Object fromXml(final String xml) {
                 javax.xml.parsers.DocumentBuilderFactory.newInstance();
             factory.setNamespaceAware(true);
             final org.w3c.dom.Document document = factory.newDocumentBuilder().parse(stream);
-            return createMap(document);
+            return createMap(document, new Function<Object, Object>() {
+                public Object apply(Object object) {
+                    return object;
+                }
+            });
+        } catch (Exception ex) {
+            throw new IllegalArgumentException(ex);
+        }
+    }
+
+    public static Object fromXmlMakeArrays(final String xml) {
+        try {
+            final java.io.InputStream stream = new java.io.ByteArrayInputStream(xml.getBytes("UTF-8"));
+            final javax.xml.parsers.DocumentBuilderFactory factory =
+                javax.xml.parsers.DocumentBuilderFactory.newInstance();
+            factory.setNamespaceAware(true);
+            final org.w3c.dom.Document document = factory.newDocumentBuilder().parse(stream);
+            return createMap(document, new Function<Object, Object>() {
+                public Object apply(Object object) {
+                    return object instanceof List ? object : newArrayList(Arrays.asList(object));
+                }
+            });
         } catch (Exception ex) {
             throw new IllegalArgumentException(ex);
         }

src/test/java/com/github/underscore/lodash/StringTest.java

@@ -1365,6 +1365,86 @@ public void toXml() {
         + "\n</glossary>", $.toXml((Map<String, Object>) $.fromJson(string)));
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void fromXmlMakeArrays() {
+        String string =
+        "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
+        + "\n"
+        + "\n<root>"
+        + "\n    <list>"
+        + "\n        <item>"
+        + "\n            <key1>value</key1>"
+        + "\n            <key2>value</key2>"
+        + "\n            <key3>value</key3>"
+        + "\n        </item>"
+        + "\n        <item>"
+        + "\n            <key1>value</key1>"
+        + "\n            <key2>value</key2>"
+        + "\n            <key3>value</key3>"
+        + "\n        </item>"
+        + "\n    </list>"
+        + "\n    <list>"
+        + "\n        <item>"
+        + "\n            <key1>value</key1>"
+        + "\n            <key2>value</key2>"
+        + "\n            <key3>value</key3>"
+        + "\n        </item>"
+        + "\n    </list>"
+        + "\n</root>";
+        assertEquals(
+        "{\n"
+        + "  \"root\": [\n"
+        + "    {\n"
+        + "      \"list\": [\n"
+        + "        {\n"
+        + "          \"item\": [\n"
+        + "            {\n"
+        + "              \"key1\": [\n"
+        + "                \"value\"\n"
+        + "              ],\n"
+        + "              \"key2\": [\n"
+        + "                \"value\"\n"
+        + "              ],\n"
+        + "              \"key3\": [\n"
+        + "                \"value\"\n"
+        + "              ]\n"
+        + "            },\n"
+        + "            {\n"
+        + "              \"key1\": [\n"
+        + "                \"value\"\n"
+        + "              ],\n"
+        + "              \"key2\": [\n"
+        + "                \"value\"\n"
+        + "              ],\n"
+        + "              \"key3\": [\n"
+        + "                \"value\"\n"
+        + "              ]\n"
+        + "            }\n"
+        + "          ]\n"
+        + "        },\n"
+        + "        {\n"
+        + "          \"item\": [\n"
+        + "            {\n"
+        + "              \"key1\": [\n"
+        + "                \"value\"\n"
+        + "              ],\n"
+        + "              \"key2\": [\n"
+        + "                \"value\"\n"
+        + "              ],\n"
+        + "              \"key3\": [\n"
+        + "                \"value\"\n"
+        + "              ]\n"
+        + "            }\n"
+        + "          ]\n"
+        + "        }\n"
+        + "      ]\n"
+        + "    }\n"
+        + "  ]\n"
+        + "}",
+            $.toJson((Map<String, Object>) $.fromXmlMakeArrays(string)));
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     public void fromXml() {
@@ -1488,6 +1568,11 @@ public void testDecodeParseXmlErr13() {
         $.fromXml("[\"abc\u0010\"]");
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testDecodeParseXmlErr14() {
+        $.fromXmlMakeArrays("[\"abc\u0010\"]");
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     public void main() throws Exception {