toMap()

kristina · kristina · commit 80fe16843816 · 2009-04-21T13:40:57.000-04:00
diff --git a/src/main/com/mongodb/BasicDBList.java b/src/main/com/mongodb/BasicDBList.java
@@ -80,6 +80,16 @@ public Set<String> keySet(){
         return s;
     }
 
+    public Map toMap() {
+        Map m = new HashMap();
+        Iterator i = this.keySet().iterator();
+        while (i.hasNext()) {
+            Object s = i.next();
+            m.put(s, this.get(s+""));
+        }
+        return m;
+    }
+
     int _getInt( String s ){
         try {
             return Integer.parseInt( s );
diff --git a/src/main/com/mongodb/BasicDBObject.java b/src/main/com/mongodb/BasicDBObject.java
@@ -61,12 +61,11 @@ public BasicDBObject(Map m) {
 
     /**
      * Converts a DBObject to a map.
-     * @param obj object to convert
      * @return the DBObject
      */
-    public static Map toMap(DBObject obj) {
+    public Map toMap() {
         Map m = new HashMap();
-        m.putAll((HashMap)obj);
+        m.putAll((HashMap)this);
         return m;
     }
 
diff --git a/src/main/com/mongodb/DBObject.java b/src/main/com/mongodb/DBObject.java
@@ -36,6 +36,12 @@ public interface DBObject {
      */
     public Object get( String key );
 
+    /**
+     * Returns a map representing this DBObject.
+     * @return the map
+     */
+    public Map toMap();
+
     /** Remove a field with a given name from this object.
      * @param key The name of the field to remove
      * @return The value removed from this object
diff --git a/src/main/com/mongodb/RawDBObject.java b/src/main/com/mongodb/RawDBObject.java
@@ -52,6 +52,15 @@ public Object get( String key ){
         return e.getObject();
     }
 
+    public Map toMap() {
+        Map m = new HashMap();
+        Iterator i = this.keySet().iterator();
+        while (i.hasNext()) {
+            Object s = i.next();
+            m.put(s, this.get(s+""));
+        }
+        return m;
+    }
 
     public Object put( String key , Object v ){
         throw new RuntimeException( "read only" );
diff --git a/src/main/com/mongodb/ReflectionDBObject.java b/src/main/com/mongodb/ReflectionDBObject.java
@@ -53,6 +53,16 @@ public boolean isPartialObject(){
         return false;
     }
 
+    public Map toMap() {
+       Map m = new HashMap();
+       Iterator i = this.keySet().iterator();
+       while (i.hasNext()) {
+           Object s = i.next();
+           m.put(s, this.get(s+""));
+       }
+       return m;
+    }
+
     public void markAsPartialObject(){
         throw new RuntimeException( "ReflectionDBObjects can't be partial" );
     }
diff --git a/src/test/com/mongodb/DBObjectTest.java b/src/test/com/mongodb/DBObjectTest.java
@@ -52,6 +52,13 @@ public void testDBObjectBuilder() {
 
     }
 
+    @Test(groups = {"basic"})
+    public void testToMap() {
+        Map m = BasicDBObjectBuilder.start().add("y", "z").add("z","a").get().toMap();
+        assertEquals(m.get("y"), "z");
+        assertEquals(m.get("z"), "a");
+    }
+
     public static void main( String args[] ) {
         (new DBObjectTest()).runConsole();
     }

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,13 @@ public void testDBObjectBuilder() {`
`52`	`52`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ @Test(groups = {"basic"})`
	`56`	`+ public void testToMap() {`
	`57`	`+ Map m = BasicDBObjectBuilder.start().add("y", "z").add("z","a").get().toMap();`
	`58`	`+ assertEquals(m.get("y"), "z");`
	`59`	`+ assertEquals(m.get("z"), "a");`
	`60`	`+ }`
	`61`	`+`
`55`	`62`	`public static void main( String args[] ) {`
`56`	`63`	`(new DBObjectTest()).runConsole();`
`57`	`64`	`}`