Add attributes support for U.fromXml(string).

Author: javadev

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

@@ -2537,7 +2537,7 @@ public Object fromJson() {
 
     @SuppressWarnings("unchecked")
     private static Object getValue(final Object value) {
-        if (value instanceof Map && ((Map<String, Object>) value).entrySet().iterator().hasNext()) {
+        if (value instanceof Map && ((Map<String, Object>) value).entrySet().size() == 1) {
             final Map.Entry<String, Object> entry = ((Map<String, Object>) value).entrySet().iterator().next();
             if (entry.getKey().equals("#text") || entry.getKey().equals("element")) {
                 return entry.getValue();
@@ -2548,36 +2548,51 @@ private static Object getValue(final Object value) {
 
     @SuppressWarnings("unchecked")
     private static Map<String, Object> createMap(final org.w3c.dom.Node node,
-        final Function<Object, Object> nodeMapper) {
+        final Function<Object, Object> nodeMapper, Map<String, Object> attrMap) {
         final Map<String, Object> map = newLinkedHashMap();
+        map.putAll(attrMap);
         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;
+            final int attributesLength = currentNode.getAttributes() == null
+                    ? 0 : currentNode.getAttributes().getLength();
             if (currentNode.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE) {
-                value = createMap(currentNode, nodeMapper);
+                final Map<String, Object> attrMapLocal = newLinkedHashMap();
+                for (int indexAttr = 0; indexAttr < attributesLength; indexAttr += 1) {
+                    final org.w3c.dom.Node currentNodeAttr = currentNode.getAttributes().item(indexAttr);
+                    addNodeValue(attrMapLocal, '-' + currentNodeAttr.getNodeName(),
+                            currentNodeAttr.getTextContent(), nodeMapper);
+                }
+                value = createMap(currentNode, nodeMapper, attrMapLocal);
             } else {
                 value = currentNode.getTextContent();
             }
             if ("#text".equals(name) && value.toString().trim().isEmpty()) {
                 continue;
             }
-            if (map.containsKey(name)) {
-                final Object object = map.get(name);
-                if (object instanceof List) {
-                    ((List<Object>) object).add(getValue(value));
-                } else {
-                    final List<Object> objects = newArrayList();
-                    objects.add(object);
-                    objects.add(getValue(value));
-                    map.put(name, objects);
-                }
+            addNodeValue(map, name, value, nodeMapper);
+        }
+        return map;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void addNodeValue(final Map<String, Object> map, final String name, final Object value,
+            final Function<Object, Object> nodeMapper) {
+        if (map.containsKey(name)) {
+            final Object object = map.get(name);
+            if (object instanceof List) {
+                ((List<Object>) object).add(getValue(value));
             } else {
-                map.put(name, nodeMapper.apply(getValue(value)));
+                final List<Object> objects = newArrayList();
+                objects.add(object);
+                objects.add(getValue(value));
+                map.put(name, objects);
             }
+        } else {
+            map.put(name, nodeMapper.apply(getValue(value)));
         }
-        return map;
     }
 
     public static Object fromXml(final String xml) {
@@ -2591,7 +2606,7 @@ public static Object fromXml(final String xml) {
                 public Object apply(Object object) {
                     return object;
                 }
-            });
+            }, Collections.<String, Object>emptyMap());
         } catch (Exception ex) {
             throw new IllegalArgumentException(ex);
         }
@@ -2608,7 +2623,7 @@ public static Object fromXmlMakeArrays(final String xml) {
                 public Object apply(Object object) {
                     return object instanceof List ? object : newArrayList(Arrays.asList(object));
                 }
-            });
+            }, Collections.<String, Object>emptyMap());
         } catch (Exception ex) {
             throw new IllegalArgumentException(ex);
         }

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

@@ -800,8 +800,13 @@ public void stackoverflow4() {
         + "   <Gelco type=\"int\">26</Gelco>"
         + "</root>";
 
-        assertEquals("{root={Durapipe=1, EXPLAIN=2, woods=2, hanging=3, hastily=2, localized=1, "
-            + "Schuster=5, regularize=1, LASR=1, LAST=22, Gelch=2, Gelco=26}}", U.fromXml(xml).toString());
+        assertEquals("{root={Durapipe={-type=int, #text=1}, EXPLAIN={-type=int, #text=2}, "
+                + "woods={-type=int, #text=2}, hanging={-type=int, #text=3}, "
+                + "hastily={-type=int, #text=2}, localized={-type=int, #text=1}, "
+                + "Schuster={-type=int, #text=5}, regularize={-type=int, #text=1}, "
+                + "LASR={-type=int, #text=1}, LAST={-type=int, #text=22}, "
+                + "Gelch={-type=int, #text=2}, Gelco={-type=int, #text=26}}}",
+                U.fromXml(xml).toString());
     }
 
     @SuppressWarnings("unchecked")

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

@@ -1315,6 +1315,48 @@ public void toJsonFromXml() {
             U.toJson((Map<String, Object>) U.fromXml(xml)));
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void toJsonFromXml2() {
+        final String xml = "<widget>\n"
+                + "  <debug>on</debug>\n"
+                + "  <window title=\"Sample Konfabulator Widget\">\n"
+                + "    I just put some text here\n"
+                + "    <name>main_window</name>\n"
+                + "    <width>500</width>\n"
+                + "    <height>500</height>\n"
+                + "  </window>\n"
+                + "  <image src=\"Images/Sun.png\" name=\"sun1\">\n"
+                + "    <hOffset>250<unit>mm</unit></hOffset>\n"
+                + "    <vOffset>250</vOffset>\n"
+                + "    <alignment>center</alignment>\n"
+                + "  </image>\n"
+                + "</widget>";
+        assertEquals("{\n"
+                + "  \"widget\": {\n"
+                + "    \"debug\": \"on\",\n"
+                + "    \"window\": {\n"
+                + "      \"-title\": \"Sample Konfabulator Widget\",\n"
+                + "      \"#text\": \"\\n    I just put some text here\\n    \",\n"
+                + "      \"name\": \"main_window\",\n"
+                + "      \"width\": \"500\",\n"
+                + "      \"height\": \"500\"\n"
+                + "    },\n"
+                + "    \"image\": {\n"
+                + "      \"-name\": \"sun1\",\n"
+                + "      \"-src\": \"Images\\/Sun.png\",\n"
+                + "      \"hOffset\": {\n"
+                + "        \"#text\": \"250\",\n"
+                + "        \"unit\": \"mm\"\n"
+                + "      },\n"
+                + "      \"vOffset\": \"250\",\n"
+                + "      \"alignment\": \"center\"\n"
+                + "    }\n"
+                + "  }\n"
+                + "}",
+                U.toJson((Map<String, Object>) U.fromXml(xml)));
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     public void toXmlFromJson() {