Add standalone="yes" support for xml.

Author: javadev

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

@@ -32,6 +32,8 @@ public final class Xml {
     private static final String CDATA = "#cdata-section";
     private static final String COMMENT = "#comment";
     private static final String ENCODING = "#encoding";
+    private static final String STANDALONE = "#standalone";
+    private static final String YES = "yes";
     private static final String TEXT = "#text";
     private static final String NUMBER = "-number";
     private static final String ELEMENT = "<" + ELEMENT_TEXT + ">";
@@ -135,9 +137,10 @@ public String toString() {
     }
 
     public static class XmlStringBuilderWithoutRoot extends XmlStringBuilder {
-        public XmlStringBuilderWithoutRoot(XmlStringBuilder.Step identStep, String encoding) {
+        public XmlStringBuilderWithoutRoot(XmlStringBuilder.Step identStep, String encoding,
+            String standalone) {
             super(new StringBuilder("<?xml version=\"1.0\" encoding=\""
-                + XmlValue.escape(encoding).replace("\"", QUOT) + "\"?>"
+                + XmlValue.escape(encoding).replace("\"", QUOT) + "\"" + standalone + "?>"
                 + (identStep == Step.COMPACT ? "" : "\n")), identStep, 0);
         }
 
@@ -839,7 +842,7 @@ public static Object getMapValue(Object map) {
     }
 
     public static String toXml(Collection collection, XmlStringBuilder.Step identStep) {
-        final XmlStringBuilder builder = new XmlStringBuilderWithoutRoot(identStep, UTF_8.name());
+        final XmlStringBuilder builder = new XmlStringBuilderWithoutRoot(identStep, UTF_8.name(), "");
         builder.append("<root");
         if (collection != null && collection.isEmpty()) {
             builder.append(" empty-array=\"true\"");
@@ -863,11 +866,22 @@ public static String toXml(Map map, XmlStringBuilder.Step identStep) {
         final XmlStringBuilder builder;
         final Map localMap;
         if (map != null && map.containsKey(ENCODING)) {
-            builder = new XmlStringBuilderWithoutRoot(identStep, String.valueOf(map.get(ENCODING)));
             localMap = (Map) U.clone(map);
             localMap.remove(ENCODING);
+            if (map.containsKey(STANDALONE)) {
+                builder = new XmlStringBuilderWithoutRoot(identStep, String.valueOf(map.get(ENCODING)),
+                " standalone=\"" + (YES.equals(map.get(STANDALONE)) ? YES : "no") + "\"");
+                localMap.remove(STANDALONE);
+            } else {
+                builder = new XmlStringBuilderWithoutRoot(identStep, String.valueOf(map.get(ENCODING)), "");
+            }
+        } else if (map != null && map.containsKey(STANDALONE)) {
+            builder = new XmlStringBuilderWithoutRoot(identStep, UTF_8.name(), " standalone=\""
+                + (YES.equals(map.get(STANDALONE)) ? YES : "no") + "\"");
+            localMap = (Map) U.clone(map);
+            localMap.remove(STANDALONE);
         } else {
-            builder = new XmlStringBuilderWithoutRoot(identStep, UTF_8.name());
+            builder = new XmlStringBuilderWithoutRoot(identStep, UTF_8.name(), "");
             localMap = map;
         }
         if (localMap == null || localMap.size() != 1
@@ -1131,6 +1145,11 @@ public Object apply(Object object) {
             }, Collections.<String, Object>emptyMap(), new int[] {1, 1, 1}, xml, new int[] {0});
             if (document.getXmlEncoding() != null && !"UTF-8".equalsIgnoreCase(document.getXmlEncoding())) {
                 ((Map) result).put(ENCODING, document.getXmlEncoding());
+                if (document.getXmlStandalone()) {
+                    ((Map) result).put(STANDALONE, YES);
+                }
+            } else if (document.getXmlStandalone()) {
+                ((Map) result).put(STANDALONE, YES);
             } else if (((Map.Entry) ((Map) result).entrySet().iterator().next()).getKey().equals("root")
                 && (((Map.Entry) ((Map) result).entrySet().iterator().next()).getValue() instanceof List
                 || ((Map.Entry) ((Map) result).entrySet().iterator().next()).getValue() instanceof Map)) {

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

@@ -2014,6 +2014,49 @@ public void toJsonFromXml20() {
         assertEquals(json6, U.toJson((Map<String, Object>) U.fromXml(xml6)));
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void toJsonFromXml21() {
+        final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<a/>";
+        final String json = "{\n"
+                + "  \"a\": {\n"
+                + "    \"-self-closing\": \"true\"\n"
+                + "  },\n"
+                + "  \"#standalone\": \"yes\"\n"
+                + "}";
+        final String xml2 = "<?xml version=\"1.0\" standalone=\"yes\"?>\n<a/>";
+        assertEquals(json, U.toJson((Map<String, Object>) U.fromXml(xml)));
+        assertEquals(xml, U.toXml((Map<String, Object>) U.fromJson(json)));
+        assertEquals(json, U.toJson((Map<String, Object>) U.fromXml(xml2)));
+        final String xml3 = "<?xml version=\"1.0\" encoding=\"windows-1251\" standalone=\"yes\"?>\n<a/>";
+        final String json3 = "{\n"
+                + "  \"a\": {\n"
+                + "    \"-self-closing\": \"true\"\n"
+                + "  },\n"
+                + "  \"#encoding\": \"windows-1251\",\n"
+                + "  \"#standalone\": \"yes\"\n"
+                + "}";
+        assertEquals(json3, U.toJson((Map<String, Object>) U.fromXml(xml3)));
+        assertEquals(xml3, U.toXml((Map<String, Object>) U.fromJson(json3)));
+        final String xml4 = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<a/>";
+        final String json4 = "{\n"
+                + "  \"a\": {\n"
+                + "    \"-self-closing\": \"true\"\n"
+                + "  },\n"
+                + "  \"#standalone\": \"no\"\n"
+                + "}";
+        assertEquals(xml4, U.toXml((Map<String, Object>) U.fromJson(json4)));
+        final String xml5 = "<?xml version=\"1.0\" encoding=\"windows-1251\" standalone=\"no\"?>\n<a/>";
+        final String json5 = "{\n"
+                + "  \"a\": {\n"
+                + "    \"-self-closing\": \"true\"\n"
+                + "  },\n"
+                + "  \"#encoding\": \"windows-1251\",\n"
+                + "  \"#standalone\": \"no\"\n"
+                + "}";
+        assertEquals(xml5, U.toXml((Map<String, Object>) U.fromJson(json5)));
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     public void toXmlFromJson() {