Skip to content

Commit 5784b9a

Browse files
committed
Add U.fromXmlMap(xml, fromType).
1 parent 5026df4 commit 5784b9a

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,12 @@ public static Object fromXml(final String xml) {
19971997

19981998
@SuppressWarnings("unchecked")
19991999
public static Map<String, Object> fromXmlMap(final String xml) {
2000-
final Object object = Xml.fromXml(xml);
2000+
return fromXmlMap(xml, Xml.FromType.FOR_CONVERT);
2001+
}
2002+
2003+
@SuppressWarnings("unchecked")
2004+
public static Map<String, Object> fromXmlMap(final String xml, final Xml.FromType fromType) {
2005+
final Object object = Xml.fromXml(xml, fromType);
20012006
final Map<String, Object> result;
20022007
if (object instanceof Map) {
20032008
result = (Map<String, Object>) object;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3136,6 +3136,10 @@ public void fromXmlMap() {
31363136
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
31373137
+ "\n<root></root>";
31383138
assertEquals("{}", U.fromXmlMap(stringXml2).toString());
3139+
String stringXml3 =
3140+
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
3141+
+ "\n<root></root>";
3142+
assertEquals("{}", U.fromXmlMap(stringXml3, Xml.FromType.FOR_CONVERT).toString());
31393143
}
31403144

31413145
@Test(expected = IllegalArgumentException.class)

0 commit comments

Comments
 (0)