JAVA-820. Added support for checking of bad keys within documents contained in a List.

Author: jyemin

src/main/com/mongodb/DBCollection.java

@@ -1407,28 +1407,34 @@ private void _checkKeys( DBObject o ) {
             return;
 
         for ( String s : o.keySet() ){
-            validateKey ( s );
-            Object inner = o.get( s );
-            if ( inner instanceof DBObject ) {
-                _checkKeys( (DBObject)inner );
-            } else if ( inner instanceof Map ) {
-                _checkKeys( (Map<String, Object>)inner );
-            }
+            validateKey( s );
+            _checkValue( o.get( s ) );
         }
     }
 
     /**
      * Checks key strings for invalid characters.
      */
     private void _checkKeys( Map<String, Object> o ) {
-        for ( String s : o.keySet() ){
-            validateKey ( s );
-            Object inner = o.get( s );
-            if ( inner instanceof DBObject ) {
-                _checkKeys( (DBObject)inner );
-            } else if ( inner instanceof Map ) {
-                _checkKeys( (Map<String, Object>)inner );
-            }
+        for ( Map.Entry<String, Object> cur : o.entrySet() ){
+            validateKey( cur.getKey() );
+            _checkValue( cur.getValue() );
+        }
+    }
+
+    private void _checkValues( final List list ) {
+        for ( Object cur : list ) {
+            _checkValue( cur );
+        }
+    }
+
+    private void _checkValue(final Object value) {
+        if ( value instanceof DBObject ) {
+            _checkKeys( (DBObject)value );
+        } else if ( value instanceof Map ) {
+            _checkKeys( (Map<String, Object>)value );
+        } else if ( value instanceof List ) {
+            _checkValues((List) value);
         }
     }
 

src/test/com/mongodb/JavaClientTest.java

@@ -1133,6 +1133,12 @@ public void testBadKey(){
             fail("Bad key was accepted");
         } catch (IllegalArgumentException e) {}
 
+        try {
+            final List<BasicDBObject> list = Arrays.asList(new BasicDBObject("$a", 1));
+            c.save(new BasicDBObject("a", list));
+            fail("Bad key was accepted");
+        } catch (IllegalArgumentException e) {}
+
 //        try {
 //            c.save(new BasicDBObject("a", Arrays.asList(new BasicDBObject("$a", 1))));
 //            fail("Bad key was accepted");