JSONObject extends HashMap and JSONArray extends ArrayList passed all tests

samarjit · samarjit · commit 039f7946d789 · 2012-12-03T11:20:33.000+08:00
need to add two test cases for just discovered json array and json object
diff --git a/.classpath b/.classpath
@@ -4,12 +4,5 @@
 	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="F:/temp/maven-3.0/mvnrepository/com/google/code/gson/gson/2.1/gson-2.1.jar"/>
-	<classpathentry kind="lib" path="F:/temp/maven-3.0/mvnrepository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar"/>
-	<classpathentry kind="lib" path="F:/temp/maven-3.0/mvnrepository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="F:/temp/maven-3.0/mvnrepository/commons-lang/commons-lang/2.5/commons-lang-2.5.jar"/>
-	<classpathentry kind="lib" path="F:/temp/maven-3.0/mvnrepository/net/sf/json-lib/json-lib/2.4/json-lib-2.4-jdk15.jar"/>
-	<classpathentry kind="lib" path="F:/temp/maven-3.0/mvnrepository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar"/>
-	<classpathentry kind="lib" path="F:/temp/maven-3.0/mvnrepository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/src/main/java/MyTest.java b/src/main/java/MyTest.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 
 import org.json.JSONArray;
+import org.json.JSONML;
 import org.json.JSONObject;
 
 
@@ -40,6 +41,15 @@ public static void main(String[] args) {
         
 		System.out.println(jsonobject.toString());
 
+		 String string = "<recipe name=\"bread\" prep_time=\"5 mins\" cook_time=\"3 hours\"> <title>Basic bread</title> <ingredient amount=\"8\" unit=\"dL\">Flour</ingredient> <ingredient amount=\"10\" unit=\"grams\">Yeast</ingredient> <ingredient amount=\"4\" unit=\"dL\" state=\"warm\">Water</ingredient> <ingredient amount=\"1\" unit=\"teaspoon\">Salt</ingredient> <instructions> <step>Mix all ingredients together.</step> <step>Knead thoroughly.</step> <step>Cover with a cloth, and leave for one hour in warm room.</step> <step>Knead again.</step> <step>Place in a bread baking tin.</step> <step>Cover with a cloth, and leave for one hour in warm room.</step> <step>Bake in the oven at 180(degrees)C for 30 minutes.</step> </instructions> </recipe> ";
+
+        jsonobject = JSONML.toJSONObject(string);
+       
+		System.out.println(jsonobject.toString());
+		System.out.println( JSONML.toString(jsonobject));
+		
+		jsonarray = JSONML.toJSONArray(string);
+		System.out.println(jsonarray);
 	}
 
 }
diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java
@@ -30,7 +30,6 @@ of this software and associated documentation files (the "Software"), to deal
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -586,6 +585,18 @@ public JSONArray put(Collection value) {
         super.add(new JSONArray(value));
         return this;
     }
+    
+    /**
+     * Put a value in the JSONArray, where the value will be a
+     * JSONArray which is produced from a Collection.
+     * Do not wrap JSONArray, pass by value
+     * @param value A Collection value.
+     * @return      this.
+     */
+    public JSONArray put(JSONArray value) {
+    	super.add(value);
+    	return this;
+    }
 
 
     /**
@@ -638,6 +649,20 @@ public JSONArray put(Map value) {
         super.add(new JSONObject(value));
         return this;
     }
+    
+    /**
+     * samarjit for jsonobject same ref rather than a copy, in earlier
+     * version this jsonarray.put usually went to jsonarray.put(Object)
+     * Put a value in the JSONArray, where the value will be a
+     * JSONObject which is produced from a Map.
+     * @param value A Map value.
+     * @return      this.
+     */
+    public JSONArray put(JSONObject value) {
+    	if(value == null )value = new JSONObject();
+    	super.add(value);
+    	return this;
+    }
 
 
     /**
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
@@ -240,18 +240,32 @@ public JSONObject(JSONTokener x) throws JSONException {
      * @throws JSONException
      */
     public JSONObject(Map map) {
-       super(map == null? new JSONObject():map );
+//       super(map == null? new JSONObject():map ); //dont it needs to be wrapped
     	//this.map = new HashMap();
-//        if (map != null) {
-//            Iterator i = map.entrySet().iterator();
-//            while (i.hasNext()) {
-//                Map.Entry e = (Map.Entry)i.next();
-//                Object value = e.getValue();
-//                if (value != null) {
-//                    super.put(e.getKey(), wrap(value));
-//                }
-//            }
-//        }
+        if (map != null) {
+            Iterator i = map.entrySet().iterator();
+            while (i.hasNext()) {
+                Map.Entry e = (Map.Entry)i.next();
+                Object value = e.getValue();
+                if (value != null) {
+                    super.put(e.getKey(), wrap(value));
+                }
+            }
+        }
+    }
+
+    /**
+     * Put a key/value pair in the JSONObject, where the value will be a
+     * JSONObject which is produced from a Map.
+     * For put(k,JSONObject value) would be call by ref. unlike wrapped Map as above. 
+     * @param key   A key string.
+     * @param value A Map value.
+     * @return      this.
+     * @throws JSONException
+     */
+    public JSONObject put(String key, JSONObject value) throws JSONException {
+    	super.put(key,value);
+    	return this;
     }
 
 
