Sync with underscore-java

Author: javadev

.github/workflows/maven.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [17, 21, 23]
+        java: [17, 21, 23, 24]
 
     steps:
     - uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        java: [17, 21, 23]
+        java: [17, 21, 23, 24]
 
     steps:
     - uses: actions/checkout@v4
@@ -45,7 +45,7 @@ jobs:
     runs-on: macOS-latest
     strategy:
       matrix:
-        java: [17, 21, 23]
+        java: [17, 21, 23, 24]
 
     steps:
     - uses: actions/checkout@v4

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

@@ -2798,6 +2798,48 @@ public static String xmlOrJsonToJson(String xmlOrJson) {
         return xmlOrJsonToJson(xmlOrJson, Json.JsonStringBuilder.Step.TWO_SPACES);
     }
 
+    public static String mergeXmlsOrJsonsToJson(List<String> xmlsOrJsons, Json.JsonStringBuilder.Step identStep) {
+        Map<String, Object> resultJsonMap = new LinkedHashMap<>();
+        for (String xmlOrJsonToJson : xmlsOrJsons) {
+            TextType textType = getTextType(xmlOrJsonToJson);
+            final Map<String, Object> jsonOrXmlMap;
+            if (textType == TextType.JSON) {
+                jsonOrXmlMap = fromJsonMap(xmlOrJsonToJson);
+            } else if (textType == TextType.XML) {
+                jsonOrXmlMap = fromXmlMap(xmlOrJsonToJson);
+            } else {
+                continue;
+            }
+            resultJsonMap = U.update(resultJsonMap, jsonOrXmlMap);
+        }
+        return resultJsonMap.isEmpty() ? "" : Json.toJson(resultJsonMap, identStep);
+    }
+
+    public static String mergeXmlsOrJsonsToJson(List<String> xmlsOrJsons) {
+        return mergeXmlsOrJsonsToJson(xmlsOrJsons, Json.JsonStringBuilder.Step.TWO_SPACES);
+    }
+
+    public static String mergeXmlsOrJsonsToXml(List<String> xmlsOrJsons, Xml.XmlStringBuilder.Step identStep) {
+        Map<String, Object> resultXmlMap = new LinkedHashMap<>();
+        for (String xmlOrJsonToXml : xmlsOrJsons) {
+            TextType textType = getTextType(xmlOrJsonToXml);
+            final Map<String, Object> jsonOrXmlMap;
+            if (textType == TextType.JSON) {
+                jsonOrXmlMap = fromJsonMap(xmlOrJsonToXml);
+            } else if (textType == TextType.XML) {
+                jsonOrXmlMap = fromXmlMap(xmlOrJsonToXml);
+            } else {
+                continue;
+            }
+            resultXmlMap = U.update(resultXmlMap, jsonOrXmlMap);
+        }
+        return resultXmlMap.isEmpty() ? "" : Xml.toXml(resultXmlMap, identStep);
+    }
+
+    public static String mergeXmlsOrJsonsToXml(List<String> xmlsOrJsons) {
+        return mergeXmlsOrJsonsToXml(xmlsOrJsons, Xml.XmlStringBuilder.Step.TWO_SPACES);
+    }
+
     @SuppressWarnings("unchecked")
     private static String getJsonString(Json.JsonStringBuilder.Step identStep, Object object) {
         final String result;

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

@@ -199,7 +199,7 @@ void defer() {
                             return null;
                         });
         assertEquals(0, counter[0].intValue(), "incr was debounced");
-        await().atMost(120, TimeUnit.MILLISECONDS)
+        await().atMost(200, TimeUnit.MILLISECONDS)
                 .until(
                         () -> {
                             assertEquals(1, counter[0].intValue(), "incr was debounced");

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

@@ -1106,6 +1106,66 @@ void xmlOrJsonToXml() {
         assertEquals("", U.xmlOrJsonToXml(""));
     }
 
+    @Test
+    void mergeXmlsOrJsonsToJson() {
+        assertEquals(
+                "{\n"
+                        + "  \"a\": {\n"
+                        + "    \"-self-closing\": \"true\"\n"
+                        + "  },\n"
+                        + "  \"#omit-xml-declaration\": \"yes\"\n"
+                        + "}",
+                U.mergeXmlsOrJsonsToJson(List.of("<a/>")));
+        assertEquals(
+                "{\n"
+                        + "  \"a\": {\n"
+                        + "    \"-self-closing\": \"true\"\n"
+                        + "  },\n"
+                        + "  \"#omit-xml-declaration\": \"yes\",\n"
+                        + "  \"b\": {\n"
+                        + "    \"-self-closing\": \"true\"\n"
+                        + "  }\n"
+                        + "}",
+                U.mergeXmlsOrJsonsToJson(List.of("<a/>", "<b/>")));
+        assertEquals(
+                "{\n"
+                        + "  \"value\": [\n"
+                        + "  ]\n"
+                        + "}",
+                U.mergeXmlsOrJsonsToJson(
+                        List.of("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                + "<root empty-array=\"true\"></root>")));
+        assertEquals("{\n  \"a\": 1\n}", U.mergeXmlsOrJsonsToJson(List.of("{\"a\":1}")));
+        assertEquals("{\n"
+                + "  \"value\": [\n"
+                + "  ]\n"
+                + "}", U.mergeXmlsOrJsonsToJson(List.of("[]")));
+        assertEquals("", U.mergeXmlsOrJsonsToJson(List.of("")));
+    }
+
+    @Test
+    void mergeXmlsOrJsonsToXml() {
+        assertEquals("<a/>", U.mergeXmlsOrJsonsToXml(List.of("<a/>")));
+        assertEquals("<root>\n"
+                + "  <a/>\n"
+                + "  <b/>\n"
+                + "</root>", U.mergeXmlsOrJsonsToXml(List.of("<a/>", "<b/>")));
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                        + "<value empty-array=\"true\"></value>",
+                U.mergeXmlsOrJsonsToXml(
+                        List.of("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                                + "<root empty-array=\"true\"></root>")));
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<a number=\"true\">1</a>",
+                U.mergeXmlsOrJsonsToXml(List.of("{\"a\":1}")));
+        assertEquals(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                        + "<value empty-array=\"true\"></value>",
+                U.mergeXmlsOrJsonsToXml(List.of("[]")));
+        assertEquals("", U.mergeXmlsOrJsonsToXml(List.of("")));
+    }
+
     @Test
     void removeMapKey() {
         Map<String, Object> map = new LinkedHashMap<>();

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

@@ -3612,7 +3612,8 @@ void fromXmlStackoverflowObject() throws IOException {
         try {
             U.fromXmlMap(stringXml);
         } catch (Throwable throwable) {
-            assertTrue(throwable instanceof StackOverflowError);
+            assertTrue(throwable instanceof StackOverflowError
+                || throwable instanceof IllegalArgumentException);
         }
     }