avoid unnecessary map lookups JAVA-69

erh · erh · commit e69e2e5e1857 · 2009-12-21T15:14:07.000-05:00
diff --git a/src/main/com/mongodb/BasicDBList.java b/src/main/com/mongodb/BasicDBList.java
@@ -79,8 +79,8 @@ public Object put( int key, Object v ) {
     }
 
     public void putAll( Map m ){
-        for ( Object k : m.keySet() ){
-            put( k.toString() , m.get( k ) );
+    	for ( Map.Entry entry : (Set<Map.Entry>)m.entrySet() ){
+            put( entry.getKey().toString() , entry.getValue() );
         }
     } 
     
diff --git a/src/main/com/mongodb/BasicDBObject.java b/src/main/com/mongodb/BasicDBObject.java
@@ -154,8 +154,8 @@ public Object put( String key , Object val ){
     }
 
     public void putAll( Map m ){
-        for ( Object k : m.keySet() ){
-            put( k.toString() , m.get( k ) );
+        for ( Map.Entry entry : (Set<Map.Entry>)m.entrySet() ){
+            put( entry.getKey().toString() , entry.getValue() );
         }
     } 
     
diff --git a/src/main/com/mongodb/ByteEncoder.java b/src/main/com/mongodb/ByteEncoder.java
@@ -322,8 +322,8 @@ private void putMap( String name , Map m ){
         final int sizePos = _buf.position();
         _buf.putInt( 0 );
         
-        for ( Object key : m.keySet() )
-            _putObjectField( key.toString() , m.get( key ) );
+        for ( Map.Entry entry : (Set<Map.Entry>)m.entrySet() )
+            _putObjectField( entry.getKey().toString() , entry.getValue() );
 
         _buf.put( EOO );
         _buf.putInt( sizePos , _buf.position() - sizePos );
diff --git a/src/main/com/mongodb/ReflectionDBObject.java b/src/main/com/mongodb/ReflectionDBObject.java
@@ -49,8 +49,8 @@ public Object put( String key , Object v ){
     }
 
     public void putAll( Map m ){
-        for ( Object k : m.keySet() ){
-            put( k.toString() , m.get( k ) );
+        for ( Map.Entry entry : (Set<Map.Entry>)m.entrySet() ){
+            put( entry.getKey().toString() , entry.getValue() );
         }
     } 
     
diff --git a/src/main/com/mongodb/util/JSON.java b/src/main/com/mongodb/util/JSON.java
@@ -114,13 +114,13 @@ public static void serialize( Object o , StringBuilder buf ){
             
             Map m = (Map)o;
             
-            for ( Object name : m.keySet() ){
+            for ( Map.Entry entry : (Set<Map.Entry>)m.entrySet() ){
                 if ( first ) first = false;
                 else buf.append( " , " );
                 
-                string( buf , name.toString() );
+                string( buf , entry.getKey().toString() );
                 buf.append( " : " );
-                serialize( m.get( name ) , buf );
+                serialize( entry.getValue() , buf );
             }
             
             buf.append( "}" );

Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ public Object put( int key, Object v ) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public void putAll( Map m ){`
`82`		`- for ( Object k : m.keySet() ){`
`83`		`- put( k.toString() , m.get( k ) );`
	`82`	`+ for ( Map.Entry entry : (Set<Map.Entry>)m.entrySet() ){`
	`83`	`+ put( entry.getKey().toString() , entry.getValue() );`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,8 @@ public Object put( String key , Object val ){`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`public void putAll( Map m ){`
`157`		`- for ( Object k : m.keySet() ){`
`158`		`- put( k.toString() , m.get( k ) );`
	`157`	`+ for ( Map.Entry entry : (Set<Map.Entry>)m.entrySet() ){`
	`158`	`+ put( entry.getKey().toString() , entry.getValue() );`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ public Object put( String key , Object v ){`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public void putAll( Map m ){`
`52`		`- for ( Object k : m.keySet() ){`
`53`		`- put( k.toString() , m.get( k ) );`
	`52`	`+ for ( Map.Entry entry : (Set<Map.Entry>)m.entrySet() ){`
	`53`	`+ put( entry.getKey().toString() , entry.getValue() );`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`