Add processing instruction node support in U.fromXml(string) and U.toXml(map).

Author: javadev

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

@@ -612,9 +612,13 @@ public static void writeXml(Object value, String name, XmlStringBuilder builder,
                         + (addArray ? ARRAY_TRUE : "") + " string=\"true\"/>");
                 } else {
                     builder.append("<" + XmlValue.escapeName(name, namespaces)
-                        + (addArray ? ARRAY_TRUE : "") + ">");
+                        + (addArray ? ARRAY_TRUE : "") + (name.startsWith("?") ? " " : ">"));
                     builder.append(escape((String) value));
-                    builder.append("</" + XmlValue.escapeName(name, namespaces) + ">");
+                    if (name.startsWith("?")) {
+                        builder.append("?>");
+                    } else {
+                        builder.append("</" + XmlValue.escapeName(name, namespaces) + ">");
+                    }
                 }
             } else {
                 processArrays(value, builder, name, parentTextFound, namespaces, addArray);
@@ -709,7 +713,7 @@ public static String escapeName(String name, Set<String> namespaces) {
             }
             final StringBuilder result = new StringBuilder();
             char ch = name.charAt(0);
-            if (com.sun.org.apache.xerces.internal.util.XMLChar.isNameStart(ch) && ch != ':') {
+            if (com.sun.org.apache.xerces.internal.util.XMLChar.isNameStart(ch) && ch != ':' || ch == '?') {
                 result.append(ch);
             } else {
                 result.append("__").append(Base32.encode(Character.toString(ch))).append("__");
@@ -989,7 +993,12 @@ private static Object createMap(final org.w3c.dom.Node node,
         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 String name;
+            if (currentNode.getNodeType() == org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE) {
+                name = "?" + currentNode.getNodeName();
+            } else {
+                name = currentNode.getNodeName();
+            }
             final Object value;
             if (currentNode.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE) {
                 sourceIndex[0] = source.indexOf("<" + name, sourceIndex[0]) + name.length() + 1;

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

@@ -2127,6 +2127,19 @@ public void toJsonFromXml23() {
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root><a></a><a></a></root>")));
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void toJsonFromXml24() {
+        final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<a>\n  <?b c=\"d\"?>\n</a>";
+        final String json = "{\n"
+            + "  \"a\": {\n"
+            + "    \"?b\": \"c=\\\"d\\\"\"\n"
+            + "  }\n"
+            + "}";
+        assertEquals(json, U.toJson((Map<String, Object>) U.fromXml(xml)));
+        assertEquals(xml, U.toXml((Map<String, Object>) U.fromJson(json)));
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     public void toXmlFromJson() {