@@ -2169,14 +2169,7 @@ public static Map<String, Object> fromXmlMap(final String xml) {
21692169 @ SuppressWarnings ("unchecked" )
21702170 public static Map <String , Object > fromXmlMap (final String xml , final Xml .FromType fromType ) {
21712171 final Object object = Xml .fromXml (xml , fromType );
2172- final Map <String , Object > result ;
2173- if (object instanceof Map ) {
2174- result = (Map <String , Object >) object ;
2175- } else {
2176- result = newLinkedHashMap ();
2177- result .put ("value" , object );
2178- }
2179- return result ;
2172+ return getStringObjectMap (object );
21802173 }
21812174
21822175 @ SuppressWarnings ("unchecked" )
@@ -2224,6 +2217,10 @@ public Object fromJson() {
22242217 @ SuppressWarnings ("unchecked" )
22252218 public static Map <String , Object > fromJsonMap (final String string ) {
22262219 final Object object = Json .fromJson (string );
2220+ return getStringObjectMap (object );
2221+ }
2222+
2223+ private static Map <String , Object > getStringObjectMap (Object object ) {
22272224 final Map <String , Object > result ;
22282225 if (object instanceof Map ) {
22292226 result = (Map <String , Object >) object ;
0 commit comments