JAVA-377: driver cannot BSON encode / decode the MinKey / MaxKey types

Author: agirbal

src/main/com/mongodb/util/JSON.java

@@ -218,7 +218,16 @@ public static void serialize( Object o , StringBuilder buf ){
             serialize( temp, buf );
             return;
         }
-        
+
+        if ( o instanceof MinKey ){
+            serialize( new BasicDBObject("$minKey", 1), buf );
+            return;
+        }
+        if ( o instanceof MaxKey ){
+            serialize( new BasicDBObject("$maxKey", 1), buf );
+            return;
+        }
+
         throw new RuntimeException( "json can't serialize type : " + o.getClass() );
     }
 

src/main/com/mongodb/util/JSONCallback.java

@@ -88,6 +88,20 @@ public Object objectDone(){
 		} else {
 		    setRoot(o);
 		}
+	    } else if ( b.containsField( "$minKey" ) ) {
+                o = new MinKey();
+		if (!isStackEmpty()) {
+		    cur().put( name, o );
+		} else {
+		    setRoot(o);
+		}
+	    } else if ( b.containsField( "$maxKey" ) ) {
+                o = new MaxKey();
+		if (!isStackEmpty()) {
+		    cur().put( name, o );
+		} else {
+		    setRoot(o);
+		}
 	    } else if ( b.containsField( "$uuid" ) ) {
                 o = UUID.fromString((String)b.get("$uuid"));
 		if (!isStackEmpty()) {

src/main/org/bson/BSONEncoder.java

@@ -207,6 +207,10 @@ else if (val instanceof DBRefBase) {
             temp.put("$id", ((DBRefBase)val).getId());
             putObject( name, temp );
         }
+        else if ( val instanceof MinKey )
+            putMinKey( name );
+        else if ( val instanceof MaxKey )
+            putMaxKey( name );
         else if ( putSpecial( name , val ) ){
             // no-op
         }
@@ -378,6 +382,14 @@ private void putPattern( String name, Pattern p ) {
         _put( regexFlags( p.flags() ) );
     }
 
+    private void putMinKey( String name ) {
+        _put( MINKEY , name );
+    }
+
+    private void putMaxKey( String name ) {
+        _put( MAXKEY , name );
+    }
+
 
     // ----------------------------------------------
 

src/main/org/bson/BasicBSONCallback.java

@@ -84,10 +84,10 @@ public void gotUndefined( String name ){
     }
 
     public void gotMinKey( String name ){
-        cur().put( name , "MinKey" );
+        cur().put( name , new MinKey() );
     }
     public void gotMaxKey( String name ){
-        cur().put( name , "MaxKey" );
+        cur().put( name , new MaxKey() );
     }
 
     public void gotBoolean( String name , boolean v ){

src/test/com/mongodb/JavaClientTest.java

@@ -200,6 +200,20 @@ public void testBinary()
         }
 
     }
+
+    @Test
+    public void testMinMaxKey()
+        throws MongoException {
+        DBCollection c = _db.getCollection( "testMinMaxKey" );
+        c.drop();
+        c.save( BasicDBObjectBuilder.start().add( "min" , new MinKey() ).add( "max" , new MaxKey() ).get() );
+
+        DBObject out = c.findOne();
+        MinKey min = (MinKey)(out.get( "min" ) );
+        MaxKey max = (MaxKey)(out.get( "max" ) );
+        assertTrue( JSON.serialize(min).contains("$minKey") );
+        assertTrue( JSON.serialize(max).contains("$maxKey") );
+    }
 
     @Test
     public void testBinaryOld()