JAVA-329: corrected (broken) implementation

Author: scotthernandez

src/main/org/bson/BSONCallback.java

@@ -39,9 +39,10 @@ public interface BSONCallback {
     void gotDBRef( String name , String ns , ObjectId id );
 
     /**
-     * subtype 2/0
+     * 
      */
-    void gotBinaryArray( String name , byte[] b );
+    @Deprecated
+    void gotBinaryArray( String name , byte[] data );
     void gotBinary( String name , byte type , byte[] data );
     /**
      * subtype 3

src/main/org/bson/BSONDecoder.java

@@ -221,15 +221,20 @@ protected void _binary( String name )
         final byte bType = _in.read();
 
         switch ( bType ){
-        case B_GENERAL:
+        case B_GENERAL: {
+                final byte[] data = new byte[totalLen];
+                _in.fill( data );
+                _callback.gotBinary( name, bType, data );
+                return;
+        }
         case B_BINARY:
             final int len = _in.readInt();
             if ( len + 4 != totalLen )
                 throw new IllegalArgumentException( "bad data size subtype 2 len: " + len + " totalLen: " + totalLen );
 
             final byte[] data = new byte[len];
             _in.fill( data );
-            _callback.gotBinaryArray( name , data );
+            _callback.gotBinary( name , bType , data );
             return;
         case B_UUID:
             if ( totalLen != 16 )

src/main/org/bson/BSONEncoder.java

@@ -319,24 +319,29 @@ else if ( n instanceof Float || n instanceof Double ) {
     }
 
     protected void putBinary( String name , byte[] data ){
+        putBinary( name, B_GENERAL, data );
+    }
+    
+    protected void putBinary( String name , Binary val ){
+        putBinary( name, val.getType(), val.getData() );        
+    }
+    
+    private void putBinary( String name , int type , byte[] data ){
         _put( BINARY , name );
-        _buf.writeInt( 4 + data.length );
-
-        _buf.write( B_GENERAL );
-        _buf.writeInt( data.length );
+        int totalLen = data.length;
+        
+        if (type == B_BINARY)
+            totalLen += 4;
+        
+        _buf.writeInt( totalLen );
+        _buf.write( type );
+        if (type == B_BINARY)
+            _buf.writeInt( totalLen -4 );
         int before = _buf.getPosition();
         _buf.write( data );
         int after = _buf.getPosition();
-        
         com.mongodb.util.MyAsserts.assertEquals( after - before , data.length );
     }
-
-    protected void putBinary( String name , Binary val ){
-        _put( BINARY , name );
-        _buf.writeInt( val.length() );
-        _buf.write( val.getType() );
-        _buf.write( val.getData() );
-    }
 
     protected void putUUID( String name , UUID val ){
         _put( BINARY , name );

src/main/org/bson/BasicBSONCallback.java

@@ -130,12 +130,16 @@ public void gotDBRef( String name , String ns , ObjectId id ){
         _put( name , new BasicBSONObject( "$ns" , ns ).append( "$id" , id ) );
     }
 
-    public void gotBinaryArray( String name , byte[] b ){
-        _put( name , b );
+    @Deprecated
+    public void gotBinaryArray( String name , byte[] data ){
+        gotBinary( name, BSON.B_GENERAL, data );
     }
 
     public void gotBinary( String name , byte type , byte[] data ){
-        _put( name , new Binary( type , data ) );
+        if( type == BSON.B_GENERAL )
+            _put( name , data );
+        else
+            _put( name , new Binary( type , data ) );
     }
 
     public void gotUUID( String name , long part1, long part2){

src/test/com/mongodb/ByteTest.java

@@ -176,7 +176,7 @@ public void testBinary() {
         o.put( "bytes", barray );
 
         byte[] encoded = BSON.encode( o );
-        assertEquals( 277 , encoded.length );
+        assertEquals( 273 , encoded.length );
 
         BSONObject read = BSON.decode( encoded );
         byte[] b = (byte[])read.get( "bytes" );

src/test/com/mongodb/JavaClientTest.java

@@ -23,6 +23,7 @@
 import java.util.*;
 import java.util.regex.Pattern;
 
+import org.bson.BSON;
 import org.bson.Transformer;
 import org.bson.types.*;
 import org.testng.annotations.Test;
@@ -184,7 +185,7 @@ public void testBinary()
             bb.order( Bytes.ORDER );
             bb.putInt( 5 );
             bb.put( "eliot".getBytes() );
-            out.put( "a" , new Binary( (byte)2 , raw ) );
+            out.put( "a" , "eliot".getBytes() );
             c.save( out );
 
             out = c.findOne();
@@ -198,6 +199,39 @@ public void testBinary()
             assertEquals( Util.toHex( raw ) , Util.toHex( blah.getData() ) );
         }
 
+    }
+    
+    @Test
+    public void testBinaryOld()
+        throws MongoException {
+        DBCollection c = _db.getCollection( "testBinary" );
+        c.drop();
+        c.save( BasicDBObjectBuilder.start().add( "a" , "eliot".getBytes() ).get() );
+        
+        DBObject out = c.findOne();
+        byte[] b = (byte[])(out.get( "a" ) );
+        assertEquals( "eliot" , new String( b ) );
+        
+        {
+            byte[] raw = new byte[9];
+            ByteBuffer bb = ByteBuffer.wrap( raw );
+            bb.order( Bytes.ORDER );
+            bb.putInt( 5 );
+            bb.put( "eliot".getBytes() );
+            out.put( "a" , new Binary( BSON.B_BINARY , "eliot".getBytes() ) );
+            c.save( out );
+            
+            out = c.findOne();
+            Binary blah = (Binary)(out.get( "a" ) );
+            assertEquals( "eliot" , new String( blah.getData() ) );
+
+            out.put( "a" , new Binary( (byte)111 , raw ) );
+            c.save( out );
+            blah = (Binary)c.findOne().get( "a" );
+            assertEquals( 111 , blah.getType() );
+            assertEquals( Util.toHex( raw ) , Util.toHex( blah.getData() ) );
+        }
+        
     }
     @Test
     public void testUUID()

src/test/org/bson/BSONTest.java

@@ -129,7 +129,7 @@ public void testBinary()
           data[i] = 1;
         }
         BSONObject binary_object = new BasicBSONObject( "bin" , data);
-        _test( binary_object , 10019 , "71c3247d9e9a26d73bf64efc0b9fe90f" );
+        _test( binary_object , 10015 , "1d439ba5b959ecfe297a7862bf95bc10" );
     }
 
     @Test