Skip to content

Commit 290536d

Browse files
committed
Add ident support for U.xmlToJson(string) and U.jsonToXml(string).
1 parent 9348dae commit 290536d

File tree

1 file changed

+14
-6
lines changed
  • src/main/java/com/github/underscore/lodash

1 file changed

+14
-6
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1812,21 +1812,29 @@ public Object fromXml() {
18121812
}
18131813

18141814
@SuppressWarnings("unchecked")
1815-
public static String jsonToXml(String json) {
1815+
public static String jsonToXml(String json, Xml.XmlStringBuilder.Step identStep) {
18161816
Object result = Json.fromJson(json);
18171817
if (result instanceof Map) {
1818-
return Xml.toXml((Map) result);
1818+
return Xml.toXml((Map) result, identStep);
18191819
}
1820-
return Xml.toXml((List) result);
1820+
return Xml.toXml((List) result, identStep);
1821+
}
1822+
1823+
public static String jsonToXml(String json) {
1824+
return jsonToXml(json, Xml.XmlStringBuilder.Step.TWO_SPACES);
18211825
}
18221826

18231827
@SuppressWarnings("unchecked")
1824-
public static String xmlToJson(String xml) {
1828+
public static String xmlToJson(String xml, Json.JsonStringBuilder.Step identStep) {
18251829
Object result = Xml.fromXml(xml);
18261830
if (result instanceof Map) {
1827-
return Json.toJson((Map) result);
1831+
return Json.toJson((Map) result, identStep);
18281832
}
1829-
return Json.toJson((List) result);
1833+
return Json.toJson((List) result, identStep);
1834+
}
1835+
1836+
public static String xmlToJson(String xml) {
1837+
return xmlToJson(xml, Json.JsonStringBuilder.Step.TWO_SPACES);
18301838
}
18311839

18321840
public static String formatJson(String json, Json.JsonStringBuilder.Step identStep) {

0 commit comments

Comments
 (0)