[JAVA-151]: Dot allowed in key names

Author: agirbal

src/main/com/mongodb/DBApiLayer.java

@@ -287,6 +287,13 @@ Iterator<DBObject> __find( DBObject ref , DBObject fields , int numToSkip , int
         public WriteResult update( DBObject query , DBObject o , boolean upsert , boolean multi , com.mongodb.WriteConcern concern )
             throws MongoException {
 
+            if (o != null && !o.keySet().isEmpty()) {
+                // if 1st key doesnt start with $, then object will be inserted as is, need to check it
+                String key = o.keySet().iterator().next();
+                if (key.charAt(0) != '$')
+                    _checkObject(o, false, false);
+            }
+
             if ( willTrace() ) trace( "update: " + _fullNameSpace + " " + JSON.serialize( query ) );
 
             OutMessage om = new OutMessage( _mongo , 2001 );

src/main/com/mongodb/DBCollection.java

@@ -310,8 +310,13 @@ public DBObject findAndModify(DBObject query, DBObject fields, DBObject sort, bo
         if (remove)
             cmd.append( "remove", remove );
         else {
-            if (update != null && !update.keySet().isEmpty())
+            if (update != null && !update.keySet().isEmpty()) {
+                // if 1st key doesnt start with $, then object will be inserted as is, need to check it
+                String key = update.keySet().iterator().next();
+                if (key.charAt(0) != '$')
+                    _checkObject(update, false, false);
                 cmd.append( "update", update );
+            }
             if (returnNew)
                 cmd.append( "new", returnNew );
             if (upsert)

src/test/com/mongodb/JavaClientTest.java

@@ -705,7 +705,38 @@ public void testGetCollectionFromString(){
         assertEquals( "foo.bar.zoo.dork" , c.getName() );
 
     }
-    
+
+    @Test
+    public void testBadKey(){
+        DBCollection c = _db.getCollectionFromString( "foo" );
+        assertEquals( "foo" , c.getName() );
+
+        try {
+            c.insert(new BasicDBObject("a.b", 1));
+            assertTrue(false, "Bad key was accepted");
+        } catch (Exception e) {}
+        try {
+            c.insert(new BasicDBObject("$a", 1));
+            assertTrue(false, "Bad key was accepted");
+        } catch (Exception e) {}
+
+        try {
+            c.save(new BasicDBObject("a.b", 1));
+            assertTrue(false, "Bad key was accepted");
+        } catch (Exception e) {}
+        try {
+            c.save(new BasicDBObject("$a", 1));
+            assertTrue(false, "Bad key was accepted");
+        } catch (Exception e) {}
+
+        c.insert(new BasicDBObject("a", 1));
+        try {
+            c.update(new BasicDBObject("a", 1), new BasicDBObject("a.b", 1));
+            assertTrue(false, "Bad key was accepted");
+        } catch (Exception e) {}
+        c.update(new BasicDBObject("a", 1), new BasicDBObject("$set", new BasicDBObject("a.b", 1)));
+    }
+
     final Mongo _mongo;
     final DB _db;