new methods putCollection and putMap

Author: Leonardo Lopes

src/main/java/org/json/JSONObject.java

@@ -1709,7 +1709,7 @@ public JSONObject put(String key, boolean value) throws JSONException {
      * @throws NullPointerException
      *            If the key is <code>null</code>.
      */
-    public JSONObject put(String key, Collection<?> value) throws JSONException {
+    public JSONObject putCollection(String key, Collection<?> value) throws JSONException {
         return this.put(key, new JSONArray(value));
     }
 
@@ -1795,7 +1795,7 @@ public JSONObject put(String key, long value) throws JSONException {
      * @throws NullPointerException
      *            If the key is <code>null</code>.
      */
-    public JSONObject put(String key, Map<?, ?> value) throws JSONException {
+    public JSONObject putMap(String key, Map<?, ?> value) throws JSONException {
         return this.put(key, new JSONObject(value));
     }
 
@@ -1821,14 +1821,22 @@ public JSONObject put(String key, Object value) throws JSONException {
         if (key == null) {
             throw new NullPointerException("Null key.");
         }
-        if (value != null) {
-            testValidity(value);
-            this.map.put(key, value);
-        } else {
+
+        if (value == null) {
             // just...            
             // works
             // btw idc
             this.map.put(key, JSONObject.NULL);
+        } else {
+            testValidity(value);
+
+            if (value instanceof Collection) {
+                this.putCollection(key, (Collection<?>) value);
+            } else if (value instanceof Map) {
+                this.putMap(key, (Map<?, ?>) value);
+            } else {
+                this.map.put(key, value);
+            }
         }
         return this;
     }

src/test/java/org/json/junit/JSONTest.java

@@ -11,6 +11,56 @@
 import org.junit.Test;
 
 public class JSONTest {
+    @Test
+    public void testConstructor() {
+        final JSONObject expected = new JSONObject("{\"myKey\":10}");
+
+        @SuppressWarnings("rawtypes")
+        Map myRawC = Collections.singletonMap("myKey", Integer.valueOf(10));
+        JSONObject jaRaw = new JSONObject(myRawC);
+
+        Map<String, Object> myCStrObj = Collections.singletonMap("myKey", (Object) Integer.valueOf(10));
+        JSONObject jaStrObj = new JSONObject(myCStrObj);
+
+        Map<String, Integer> myCStrInt = Collections.singletonMap("myKey", Integer.valueOf(10));
+        JSONObject jaStrInt = new JSONObject(myCStrInt);
+
+        Map<?, ?> myCObjObj = Collections.singletonMap((Object) "myKey", (Object) Integer.valueOf(10));
+        JSONObject jaObjObj = new JSONObject(myCObjObj);
+
+        assertTrue("The RAW Collection should give me the same as the Typed Collection", expected.similar(jaRaw));
+        assertTrue("The RAW Collection should give me the same as the Typed Collection", expected.similar(jaStrObj));
+        assertTrue("The RAW Collection should give me the same as the Typed Collection", expected.similar(jaStrInt));
+        assertTrue("The RAW Collection should give me the same as the Typed Collection", expected.similar(jaObjObj));
+    }
+
+    @Test
+    public void testPutMap() {
+        final JSONObject expected = new JSONObject("{\"myMap\":{\"myKey\":10}}");
+
+        @SuppressWarnings("rawtypes")
+        Map myRawC = Collections.singletonMap("myKey", Integer.valueOf(10));
+        JSONObject jaRaw = new JSONObject();
+        jaRaw.put("myMap", myRawC);
+
+        Map<String, Object> myCStrObj = Collections.singletonMap("myKey", (Object) Integer.valueOf(10));
+        JSONObject jaStrObj = new JSONObject();
+        jaStrObj.put("myMap", myCStrObj);
+
+        Map<String, Integer> myCStrInt = Collections.singletonMap("myKey", Integer.valueOf(10));
+        JSONObject jaStrInt = new JSONObject();
+        jaStrInt.put("myMap", myCStrInt);
+
+        Map<?, ?> myCObjObj = Collections.singletonMap((Object) "myKey", (Object) Integer.valueOf(10));
+        JSONObject jaObjObj = new JSONObject();
+        jaObjObj.put("myMap", myCObjObj);
+
+        assertTrue("The RAW Collection should give me the same as the Typed Collection", expected.similar(jaRaw));
+        assertTrue("The RAW Collection should give me the same as the Typed Collection", expected.similar(jaStrObj));
+        assertTrue("The RAW Collection should give me the same as the Typed Collection", expected.similar(jaStrInt));
+        assertTrue("The RAW Collection should give me the same as the Typed Collection", expected.similar(jaObjObj));
+    }
+
     @Test
     public void testMapWithNullValue() {
         Map<String, Object> map = new HashMap<String, Object>();
@@ -50,7 +100,7 @@ public void testPutNull() {
         assertTrue("jsonObject should be empty", jsonObjectRemove.isEmpty());
 
         JSONObject jsonObjectPutNull = new JSONObject(str);
-        jsonObjectPutNull.put("myKey", (Object) null);
+        jsonObjectPutNull.put("myKey", null);
         assertTrue("jsonObject should NOT be empty", !jsonObjectPutNull.isEmpty());
     }