Add support for CDATA section in toXml(map).

Author: javadev

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

@@ -2075,7 +2075,9 @@ public static void writeXml(Map map, String name, XmlStringBuilder builder, bool
                     }
                     elems.add(new XmlStringBuilderWithoutHeader(ident).append(escape(value)));
                 } else if ("#comment".equals(escape(String.valueOf(entry.getKey())))) {
-                    addComment(entry, ident, index, entries, elems);
+                    addComment(entry, ident, index < entries.size() - 1, elems, "<!--", "-->");
+                } else if ("#cdata-section".equals(escape(String.valueOf(entry.getKey())))) {
+                    addComment(entry, ident, index < entries.size() - 1, elems, "<![CDATA[", "]]>");
                 } else if (entry.getValue() instanceof List && !((List) entry.getValue()).isEmpty()) {
                     XmlStringBuilder localBuilder = new XmlStringBuilderWithoutHeader(ident);
                     XmlArray.writeXml((List) entry.getValue(), localBuilder,
@@ -2117,25 +2119,27 @@ public static void writeXml(Map map, String name, XmlStringBuilder builder, bool
             }
         }
 
-        private static void addComment(Map.Entry entry, int ident, int index, List<Map.Entry> entries,
-                List<XmlStringBuilder> elems) {
+        private static void addComment(Map.Entry entry, int ident, boolean addNewLine,
+                List<XmlStringBuilder> elems, String openElement, String closeElement) {
             if (entry.getValue() instanceof List) {
                 for (Iterator iterator = ((List) entry.getValue()).iterator(); iterator.hasNext(); ) {
-                    XmlStringBuilder localBuilder = new XmlStringBuilderWithoutHeader(ident)
-                            .fillSpaces().append("<!--").append((String) iterator.next()).append("-->");
-                    if (iterator.hasNext() || index < entries.size() - 1) {
-                        localBuilder.newLine();
-                    }
-                    elems.add(localBuilder);
+                    addCommentValue(ident, (String) iterator.next(),
+                            iterator.hasNext() || addNewLine, elems, openElement, closeElement);
                 }
             } else {
-                XmlStringBuilder localBuilder = new XmlStringBuilderWithoutHeader(ident)
-                        .fillSpaces().append("<!--").append((String) entry.getValue()).append("-->");
-                if (index < entries.size() - 1) {
-                    localBuilder.newLine();
-                }
-                elems.add(localBuilder);
+                addCommentValue(ident, (String) entry.getValue(), addNewLine, elems,
+                        openElement, closeElement);
+            }
+        }
+
+        private static void addCommentValue(int ident, String value, boolean addNewLine,
+                List<XmlStringBuilder> elems, String openElement, String closeElement) {
+            XmlStringBuilder localBuilder = new XmlStringBuilderWithoutHeader(ident)
+                    .fillSpaces().append(openElement).append(value).append(closeElement);
+            if (addNewLine) {
+                localBuilder.newLine();
             }
+            elems.add(localBuilder);
         }
     }
 

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

@@ -1614,15 +1614,28 @@ public void toXmlFromJson8() {
     @SuppressWarnings("unchecked")
     @Test
     public void toXmlFromJson9() {
-        final String json = "{\n  \"element\": {\n    \"#comment\": [\n      \" comment1 \",\n"
-                + "      \" comment2 \"\n    ]\n  }\n}";
+        final String json = "{\n  \"element\": {\n    \"#cdata-section\": [\n      \" 1 \",\n"
+                + "      \" 2 \"\n    ]\n  }\n}";
         assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                + "<element>\n  <!-- comment1 -->\n  <!-- comment2 -->\n</element>",
+                + "<element>\n  <![CDATA[ 1 ]]>\n  <![CDATA[ 2 ]]>\n</element>",
                 U.toXml((Map<String, Object>) U.fromJson(json)));
-        final String json2 = "{\n  \"element\": {\n    \"#comment\": [\n      \" comment1 \",\n"
-                + "      \" comment2 \"\n    ]\n,    \"id\": \"1\"\n  }\n}";
+        final String json2 = "{\n  \"element\": {\n    \"#cdata-section\": [\n      \" 1 \",\n"
+                + "      \" 2 \"\n    ]\n,    \"id\": \"1\"\n  }\n}";
         assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-                + "<element>\n  <!-- comment1 -->\n  <!-- comment2 -->\n  <id>1</id>\n</element>",
+                + "<element>\n  <![CDATA[ 1 ]]>\n  <![CDATA[ 2 ]]>\n  <id>1</id>\n</element>",
+                U.toXml((Map<String, Object>) U.fromJson(json2)));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void toXmlFromJson10() {
+        final String json = "{\n  \"element\": {\n    \"#cdata-section\": \"&&\"\n  }\n}";
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                + "<element>\n  <![CDATA[&&]]>\n</element>",
+                U.toXml((Map<String, Object>) U.fromJson(json)));
+        final String json2 = "{\n  \"element\": {\n    \"#cdata-section\": \"&&\"\n,\n    \"id\": \"1\"\n  }\n}";
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                + "<element>\n  <![CDATA[&&]]>\n  <id>1</id>\n</element>",
                 U.toXml((Map<String, Object>) U.fromJson(json2)));
     }