support jsonobj to map

TangXiaoLv · TangXiaoLv · commit fce9b5b8fb09 · 2017-03-27T14:49:04.000+08:00
diff --git a/README.md b/README.md
@@ -195,7 +195,7 @@ public class RemoteModule implements IRouter {
 |List< A>|&#8652;|List< A>|`1.0.0+` Receiver must be defined as List<?> interface|
 |List< A>|&#8652;|List< B>|`1.0.0+`|
 |Json Object|&#8652;|Object|`1.0.0+`|
-|Json Object|&#8652;|Map< String,String>|Coming Soon|
+|Json Object|&rarr;|Map< String,String>|`2.0.1+`|
 |Json Array|&#8652;|List< ?>|`1.0.0+`|
 
 **Step 2:Invoke**
diff --git a/README_CN.md b/README_CN.md
@@ -195,7 +195,7 @@ public class RemoteModule implements IRouter {
 |List< A>|&#8652;|List< A>|`1.0.0+` &#25509;&#25910;&#32773;&#23450;&#20041;&#24517;&#39035;&#26159;List<?>&#25509;&#21475;&#31867;&#22411; eg:List< A>|
 |List< A>|&#8652;|List< B>|`1.0.0+`|
 |Json Object|&#8652;|Object|`1.0.0+`|
-|Json Object|&#8652;|Map< String,String>|&#21363;&#23558;&#25903;&#25345;|
+|Json Object|&rarr;|Map< String,String>|`2.0.1+`|
 |Json Array|&#8652;|List< ?>|`1.0.0+`|
 
 **&#31532;&#20108;&#27493;:&#35843;&#29992;&#21327;&#35758;**
diff --git a/androidrouter/src/androidTest/java/com/tangxiaolv/router/utils/ValueParserTest.java b/androidrouter/src/androidTest/java/com/tangxiaolv/router/utils/ValueParserTest.java
@@ -71,20 +71,6 @@ public void check_Obj_Obj() throws ValueParseException {
         assertTrue(parse instanceof B);
     }
 
-    @Test
-    public void check_Obj_Map() throws ValueParseException {
-//        A a = ObjGenerator.getA();
-//
-//        Object parse = ValueParser.parse(a, Map.class.getCanonicalName());
-//        assertTrue(parse instanceof Map);
-    }
-
-    @Test
-    public void check_Map_Obj() {
-
-
-    }
-
     @Test
     public void check_Json_Obj() throws ValueParseException {
         A a = ObjGenerator.getA();
@@ -115,7 +101,6 @@ public void check_Json_List() throws ValueParseException {
         assertNotNull(parse);
         assertTrue(parse instanceof List);
         assertTrue(((List) parse).get(0) instanceof A);
-
     }
 
     @Test
@@ -127,6 +112,14 @@ public void check_Json_Map() throws ValueParseException {
         assertTrue(parse instanceof Map);
     }
 
+    @Test
+    public void check_Obj_Map() throws ValueParseException {
+    }
+
+    @Test
+    public void check_Map_Obj() {
+    }
+
     @SuppressWarnings("all")
     public static class Mark<T> {
     }
diff --git a/androidrouter/src/main/java/com/tangxiaolv/router/utils/ValueParser.java b/androidrouter/src/main/java/com/tangxiaolv/router/utils/ValueParser.java
@@ -136,7 +136,7 @@ private static Object toArray(Object from, String expectedType) throws ValuePars
                 } else {
                     //checked string format
                     if (!isJson(from.toString())) {
-                        throw new ValueParseException("Expected array type,The input string must jsonArray.");
+                        throw new ValueParseException("Expected " + expectedType + ",But The input string isn't json.");
                     }
                     jArray = new JSONArray((String) from);
                 }
@@ -205,20 +205,30 @@ private static Object toList(Object from, String expectedType) throws ValueParse
         return from;
     }
 
-    private static Object toMap(Object from, String expectType) {
+    private static Object toMap(Object from, String expectType) throws ValueParseException {
         try {
             if (from instanceof String || from instanceof JSONObject) {
-                JSONObject jObj = from instanceof String ? new JSONObject((String) from) : (JSONObject) from;
-                HashMap<String, Object> map = new HashMap<>(jObj.length());
+                JSONObject jObj;
+                if (from instanceof JSONObject) {
+                    jObj = (JSONObject) from;
+                } else {
+                    //checked string format
+                    if (!isJson(from.toString())) {
+                        throw new ValueParseException("Expected " + expectType + ",But The input string isn't json.");
+                    }
+                    jObj = new JSONObject((String) from);
+                }
+
+                HashMap<String, String> map = new HashMap<>(jObj.length());
                 Iterator<String> it = jObj.keys();
                 while (it.hasNext()) {
                     String key = it.next();
-                    Object v = jObj.get(key);
-                    map.put(key, v);
+                    map.put(key, jObj.get(key).toString());
                 }
                 from = map;
             }
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            throw new ValueParseException("parse to " + expectType + " type fail.", e);
         }
         return from;
     }

-Original file line number
+Diff line change
 |List< A>|⇌|List< A>|`1.0.0+` Receiver must be defined as List<?> interface|
 |List< A>|⇌|List< B>|`1.0.0+`|
 |Json Object|⇌|Object|`1.0.0+`|
 -|Json Object|⇌|Map< String,String>|Coming Soon|
 +|Json Object|→|Map< String,String>|`2.0.1+`|
 |Json Array|⇌|List< ?>|`1.0.0+`|
 **Step 2:Invoke**