Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions src/main/java/com/github/underscore/U.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
60 changes: 60 additions & 0 deletions src/test/java/com/github/underscore/LodashTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();
Expand Down
Loading