Improve U.fromXml(string) and U.toXml(map) methods.

Author: javadev

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

@@ -171,13 +171,7 @@ private static void writeXml(Collection collection, XmlStringBuilder builder, St
                         .append("<" + (name == null ? ELEMENT_TEXT : XmlValue.escapeName(name, namespaces)) + ">"
                         + NULL + "</" + (name == null ? ELEMENT_TEXT : XmlValue.escapeName(name, namespaces)) + ">");
                 } else {
-                    if (value instanceof Map && ((Map) value).size() == 1
-                        && (String.valueOf(((Map.Entry) ((Map) value).entrySet().iterator()
-                            .next()).getKey()).startsWith(TEXT)
-                        || String.valueOf(((Map.Entry) ((Map) value).entrySet().iterator()
-                            .next()).getKey()).startsWith(COMMENT)
-                        || String.valueOf(((Map.Entry) ((Map) value).entrySet().iterator()
-                            .next()).getKey()).startsWith(CDATA))) {
+                    if (value instanceof Map && ((Map) value).size() == 1) {
                         XmlObject.writeXml((Map) value, null, builder, localParentTextFound, namespaces);
                         if (String.valueOf(((Map.Entry) ((Map) value).entrySet().iterator()
                             .next()).getKey()).startsWith(TEXT)) {
@@ -778,17 +772,12 @@ private static void addText(final Map<String, Object> map, final String name, fi
         final int index = objects.size();
         while (true) {
             final Map.Entry lastElement = (Map.Entry) map.entrySet().toArray()[lastIndex];
-            if (String.valueOf(lastElement.getKey()).startsWith(TEXT)
-                || String.valueOf(lastElement.getKey()).startsWith(COMMENT)
-                || String.valueOf(lastElement.getKey()).startsWith(CDATA)) {
-                final Map<String, Object> text = U.newLinkedHashMap();
-                text.put(String.valueOf(lastElement.getKey()), map.remove(lastElement.getKey()));
-                objects.add(index, text);
-            } else {
-                if (name.equals(String.valueOf(lastElement.getKey()))) {
-                    break;
-                }
+            if (name.equals(String.valueOf(lastElement.getKey()))) {
+                break;
             }
+            final Map<String, Object> text = U.newLinkedHashMap();
+            text.put(String.valueOf(lastElement.getKey()), map.remove(lastElement.getKey()));
+            objects.add(index, text);
             lastIndex -= 1;
         }
         objects.add(getValue(value));

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

@@ -1506,12 +1506,14 @@ public void toJsonFromXml11() {
                 + "        \"#comment\": \"d\"\n"
                 + "      },\n"
                 + "      {\n"
+                + "        \"e\": {\n"
+                + "        }\n"
+                + "      },\n"
+                + "      {\n"
                 + "        \"#comment1\": \"d\"\n"
                 + "      },\n"
                 + "      \"c\"\n"
                 + "    ],\n"
-                + "    \"e\": {\n"
-                + "    },\n"
                 + "    \"#comment\": \"d\"\n"
                 + "  }\n"
                 + "}",
@@ -1910,15 +1912,13 @@ public void toXmlFromJson18() {
         + "  }\n"
         + "}";
         assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        + "<a>\n"
-        + "  <b></b>\n"
-        + "  <!--c-->\n"
-        + "1\n"
-        + "  <![CDATA[2]]>\n"
-        + "  <b>\n"
-        + "    <a>1</a>\n"
-        + "  </b>\n"
-        + "</a>",
+                + "<a>\n"
+                + "  <b></b>\n"
+                + "  <!--c-->\n"
+                + "1\n"
+                + "  <![CDATA[2]]>\n"
+                + "  <a>1</a>\n"
+                + "</a>",
             U.toXml((Map<String, Object>) U.fromJson(json)));
     }