Sync with underscore-java.

Author: javadev

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

@@ -2581,6 +2581,10 @@ public static String jsonToXml(
         return Xml.toXml((List) object, identStep);
     }
 
+    public static String jsonToXml(String json, Xml.XmlStringBuilder.Step identStep) {
+        return jsonToXml(json, identStep, null, ROOT);
+    }
+
     public static String jsonToXml(String json, Mode mode) {
         return jsonToXml(json, Xml.XmlStringBuilder.Step.TWO_SPACES, mode, ROOT);
     }
@@ -2635,6 +2639,10 @@ public static String xmlToJson(String xml) {
         return xmlToJson(xml, Json.JsonStringBuilder.Step.TWO_SPACES, null);
     }
 
+    public static String xmlToJson(String xml, Json.JsonStringBuilder.Step identStep) {
+        return xmlToJson(xml, identStep, null);
+    }
+
     public static String xmlToJson(String xml, Mode mode) {
         return xmlToJson(xml, Json.JsonStringBuilder.Step.TWO_SPACES, mode);
     }

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

@@ -654,6 +654,16 @@ void xmlToJson() {
                         + "  \"#omit-xml-declaration\": \"yes\"\n"
                         + "}",
                 U.xmlToJson("<root><element>1</element><element>2</element></root>"));
+        assertEquals(
+                "{\n"
+                        + "  \"root\": [\n"
+                        + "    \"1\",\n"
+                        + "    \"2\"\n"
+                        + "  ],\n"
+                        + "  \"#omit-xml-declaration\": \"yes\"\n"
+                        + "}",
+                U.xmlToJson("<root><element>1</element><element>2</element></root>",
+                    Json.JsonStringBuilder.Step.TWO_SPACES));
         assertEquals(
                 "{\n"
                         + "  \"root\": [\n"
@@ -917,6 +927,9 @@ void jsonToXml() {
         assertEquals(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<a></a>",
                 U.jsonToXml("{\n  \"a\": {\n  }\n}"));
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<a></a>",
+                U.jsonToXml("{\n  \"a\": {\n  }\n}", Xml.XmlStringBuilder.Step.TWO_SPACES));
         assertEquals(
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<a></a>",
                 U.chain("{\n  \"a\": {\n  }\n}").jsonToXml().item());

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

@@ -32,6 +32,10 @@
 
 import com.github.underscore.Json.JsonStringBuilder;
 import com.github.underscore.Xml.XmlStringBuilder;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -3424,6 +3428,26 @@ void fromJsonMap() {
         assertEquals("{}", U.fromJsonMap(stringJson2).toString());
     }
 
+    @Test
+    void fromJsonStackoverflowObject() throws IOException {
+        String stringJson = new String(Files.readAllBytes(Paths.get("src/test/resources/wellFormedObject.json")));
+        try {
+            U.fromJsonMap(stringJson);
+        } catch (Throwable throwable) {
+            assertTrue(throwable instanceof StackOverflowError);
+        }
+    }
+
+    @Test
+    void fromJsonStackoverflowArray() throws IOException {
+        String stringJson = new String(Files.readAllBytes(Paths.get("src/test/resources/wellFormedArray.json")));
+        try {
+            U.fromJsonMap(stringJson);
+        } catch (Throwable throwable) {
+            assertTrue(throwable instanceof StackOverflowError);
+        }
+    }
+
     @Test
     void testDecodeParseXmlErr13() {
         assertThrows(IllegalArgumentException.class, () -> U.fromXml("[\"abc\u0010\"]"));