update resolveValue, add get method.

Author: webee

README.md

@@ -15,6 +15,6 @@ To install the library add:
         maven { url "https://jitpack.io" }
    }
    dependencies {
-         compile 'com.github.webee:java-json-api:v1.2.0'
+         compile 'com.github.webee:java-json-api:v1.3.0'
    }
    ```

src/main/java/com/github/webee/json/JSONArray.java

@@ -9,6 +9,7 @@ public interface JSONArray {
 
     boolean isNull(int index);
     // get the pure java object that correspond to it's type.
+    Object[] get();
     Object get(int index);
     Boolean getBoolean(int index);
     Integer getInteger(int index);

src/main/java/com/github/webee/json/JSONObject.java

@@ -1,5 +1,6 @@
 package com.github.webee.json;
 
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -12,6 +13,7 @@ public interface JSONObject {
 
     boolean isNull(String key);
     // get the pure java object that correspond to it's type.
+    Map<String, Object> get();
     Object get(String key);
     Boolean getBoolean(String key);
     Integer getInteger(String key);

src/main/java/com/github/webee/json/Utils.java

@@ -46,7 +46,19 @@ public static Object[] arrayToObjects(JSONArray array) {
         }
         Object[] res = new Object[array.size()];
         for (int i=0; i < array.size(); i++) {
-            res[i] = array.get(i);
+            res[i] = resolveValue(array.get(i));
+        }
+
+        return res;
+    }
+
+    public static Object[] arrayToObjects(Object[] array) {
+        if (array == null) {
+            return null;
+        }
+        Object[] res = new Object[array.length];
+        for (int i=0; i < array.length; i++) {
+            res[i] = resolveValue(array[i]);
         }
 
         return res;
@@ -63,7 +75,19 @@ public static Map<String, Object> objectToMap(JSONObject object) {
         }
         Map<String, Object> res = new HashMap<>();
         for (String key : object.keySet()) {
-            res.put(key, object.get(key));
+            res.put(key, resolveValue(object.get(key)));
+        }
+
+        return res;
+    }
+
+    public static Map<String, Object> objectToMap(Map<String, Object> object) {
+        if (object == null) {
+            return null;
+        }
+        Map<String, Object> res = new HashMap<>();
+        for (String key : object.keySet()) {
+            res.put(key, resolveValue(object.get(key)));
         }
 
         return res;
@@ -75,11 +99,34 @@ public static Map<String, Object> objectToMap(JSONObject object) {
      * @return pure java object.
      */
     public static Object resolveValue(Object value) {
-        if (value instanceof JSONArray) {
-            return Utils.arrayToObjects((JSONArray) value);
-        } else if (value instanceof JSONObject) {
-            return Utils.objectToMap((JSONObject) value);
+        return resolveValue(value, getType(value));
+    }
+
+    public static Object resolveValue(Object value, JSONType t) {
+        if (t == null) {
+            return null;
         }
-        return value;
+
+        switch (t) {
+            case Object:
+                if (value instanceof JSONObject) {
+                    return Utils.objectToMap((JSONObject) value);
+                } else if (value instanceof Map) {
+                    return Utils.objectToMap((Map<String, Object>) value);
+                }
+                break;
+            case Array:
+                if (value instanceof JSONArray) {
+                    return Utils.arrayToObjects((JSONArray) value);
+                } else if (value instanceof Object[]) {
+                    return Utils.arrayToObjects((Object[]) value);
+                }
+                break;
+            case Null:
+                return null;
+            default:
+                return value;
+        }
+        return null;
     }
 }