Sync with underscore-java.

Author: javadev

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

@@ -2760,7 +2760,11 @@ public static Map<String, Object> replaceSelfClosingWithNull(Map<String, Object>
 
     @SuppressWarnings("unchecked")
     public static Map<String, Object> replaceSelfClosingWithEmpty(Map<String, Object> map) {
-        return (Map<String, Object>) replaceSelfClosingWithValue(map, "");
+        Object result = replaceSelfClosingWithValue(map, "");
+        if (result instanceof Map) {
+            return (Map<String, Object>) result;
+        }
+        return Collections.emptyMap();
     }
 
     @SuppressWarnings("unchecked")

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

@@ -1929,8 +1929,9 @@ public static String changeXmlEncoding(
         Object result = fromXml(xml, FromType.FOR_FORMAT);
         if (result instanceof Map) {
             ((Map) result).put(ENCODING, encoding);
+            return toXml((Map) result, identStep, ROOT);
         }
-        return toXml((Map) result, identStep, ROOT);
+        return xml;
     }
 
     public static String changeXmlEncoding(String xml, String encoding) {

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

@@ -499,7 +499,8 @@ void fetchGet() {
     void downloadUrl() throws IOException {
         long result =
                 U.downloadUrl(
-                        "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json", "test.json");
+                        "https://support.oneskyapp.com/hc/en-us/article_attachments/202761627/example_1.json",
+                        "test.json");
         assertEquals(65, result);
     }
 
@@ -643,6 +644,39 @@ void fetchWrongUrlWithRetry() {
                 UnsupportedOperationException.class, () -> U.fetch("ttt", 30000, 30000, 1, 100));
     }
 
+    @Test
+    void toJson() {
+        Map<String, Object> map = U.newLinkedHashMap();
+        map.put(null, 3);
+        assertEquals("{\n  \"null\": 3\n}", U.toJson(map));
+        Map<Object, Object> map2 = U.newLinkedHashMap();
+        map2.put(1, 3);
+        assertEquals("{\n  \"1\": 3\n}", U.toJson(map2));
+        Map<Object, Object> map3 = U.newLinkedHashMap();
+        map3.put(true, 3);
+        assertEquals("{\n  \"true\": 3\n}", U.toJson(map3));
+    }
+
+    @Test
+    void toXml() {
+        Map<String, Object> map = U.newLinkedHashMap();
+        map.put(null, 3);
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<null number=\"true\">3</null>",
+                U.toXml(map));
+        Map<Object, Object> map2 = U.newLinkedHashMap();
+        map2.put(1, 3);
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                        + "<__GE__ number=\"true\">3</__GE__>",
+                U.toXml(map2));
+        Map<Object, Object> map3 = U.newLinkedHashMap();
+        map3.put(true, 3);
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<true number=\"true\">3</true>",
+                U.toXml(map3));
+    }
+
     @Test
     void xmlToJson() {
         assertEquals(
@@ -662,8 +696,9 @@ void xmlToJson() {
                         + "  ],\n"
                         + "  \"#omit-xml-declaration\": \"yes\"\n"
                         + "}",
-                U.xmlToJson("<root><element>1</element><element>2</element></root>",
-                    Json.JsonStringBuilder.Step.TWO_SPACES));
+                U.xmlToJson(
+                        "<root><element>1</element><element>2</element></root>",
+                        Json.JsonStringBuilder.Step.TWO_SPACES));
         assertEquals(
                 "{\n"
                         + "  \"root\": [\n"
@@ -743,6 +778,9 @@ void xmlToJson() {
         Map<String, Object> map = U.newLinkedHashMap();
         map.put("-self-closing", "false");
         U.replaceSelfClosingWithNull(map);
+        Map<String, Object> mapEmpty = U.newLinkedHashMap();
+        mapEmpty.put("-self-closing", "true");
+        U.replaceSelfClosingWithEmpty(mapEmpty);
         Map<String, Object> map2 = U.newLinkedHashMap();
         List<Object> list = U.newArrayList();
         list.add(U.newArrayList());
@@ -1204,8 +1242,7 @@ void changeXmlEncoding() {
                         "<?xml version=\"1.0\" encoding=\"UTF-8\"?><a>Test</a>",
                         Xml.XmlStringBuilder.Step.COMPACT,
                         "windows-1251"));
-        assertEquals(
-                "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root>null</root>",
+        assertNull(
                 U.changeXmlEncoding(null, Xml.XmlStringBuilder.Step.COMPACT, "windows-1251"));
     }