JAVA-329: default binary subtype to 0 (from 2)

Author: scotthernandez

src/main/org/bson/BSONCallback.java

@@ -2,7 +2,7 @@
 
 package org.bson;
 
-import org.bson.types.*;
+import org.bson.types.ObjectId;
 
 public interface BSONCallback {
 
@@ -39,7 +39,7 @@ public interface BSONCallback {
     void gotDBRef( String name , String ns , ObjectId id );
 
     /**
-     * subtype 2
+     * subtype 2/0
      */
     void gotBinaryArray( String name , byte[] b );
     void gotBinary( String name , byte type , byte[] data );

src/main/org/bson/BSONDecoder.java

@@ -6,8 +6,9 @@
 
 import java.io.*;
 
-import org.bson.io.*;
-import org.bson.types.*;
+import org.bson.io.Bits;
+import org.bson.io.PoolOutputBuffer;
+import org.bson.types.ObjectId;
 
 public class BSONDecoder {
 
@@ -220,13 +221,8 @@ protected void _binary( String name )
         final byte bType = _in.read();
 
         switch ( bType ){
-        case B_GENERAL: {
-            final byte[] data = new byte[totalLen];
-            _in.fill( data );
-            _callback.gotBinaryArray( name , data );
-            return;
-        }
-        case B_BINARY: {
+        case B_GENERAL:
+        case B_BINARY:
             final int len = _in.readInt();
             if ( len + 4 != totalLen )
                 throw new IllegalArgumentException( "bad data size subtype 2 len: " + len + " totalLen: " + totalLen );
@@ -235,7 +231,6 @@ protected void _binary( String name )
             _in.fill( data );
             _callback.gotBinaryArray( name , data );
             return;
-        }
         case B_UUID:
             if ( totalLen != 16 )
                 throw new IllegalArgumentException( "bad data size subtype 3 len: " + totalLen + " != 16");

src/main/org/bson/BSONEncoder.java

@@ -2,21 +2,22 @@
 
 package org.bson;
 
-import com.mongodb.DBRef;
-import com.mongodb.DBRefBase;
 import static org.bson.BSON.*;
 
-import java.lang.reflect.*;
-import java.nio.*;
-import java.nio.charset.*;
+import java.lang.reflect.Array;
+import java.nio.Buffer;
 import java.util.*;
 import java.util.Map.Entry;
-import java.util.concurrent.atomic.*;
-import java.util.regex.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Pattern;
 
-import org.bson.io.*;
+import org.bson.io.BasicOutputBuffer;
+import org.bson.io.OutputBuffer;
 import org.bson.types.*;
 
+import com.mongodb.DBRefBase;
+
 /**
  * this is meant to be pooled or cached
  * there is some per instance memory for string conversion, etc...
@@ -321,7 +322,7 @@ protected void putBinary( String name , byte[] data ){
         _put( BINARY , name );
         _buf.writeInt( 4 + data.length );
 
-        _buf.write( B_BINARY );
+        _buf.write( B_GENERAL );
         _buf.writeInt( data.length );
         int before = _buf.getPosition();
         _buf.write( data );

src/test/com/mongodb/ByteTest.java

@@ -18,15 +18,13 @@
 
 import java.io.*;
 import java.util.*;
-import java.util.regex.*;
-import java.io.IOException;
+import java.util.regex.Pattern;
 
+import org.bson.*;
+import org.bson.types.ObjectId;
 import org.testng.annotations.Test;
 
-import com.mongodb.util.*;
-
-import org.bson.*;
-import org.bson.types.*;
+import com.mongodb.util.TestCase;
 
 
 @SuppressWarnings("unchecked")
@@ -182,6 +180,8 @@ public void testBinary() {
 
         BSONObject read = BSON.decode( encoded );
         byte[] b = (byte[])read.get( "bytes" );
+        
+        assertEquals(barray.length, b.length);
         for( int i=0; i<256; i++ ) {
             assertEquals( b[i], barray[i] );
         }

src/test/org/bson/BSONTest.java

@@ -18,14 +18,15 @@
 
 package org.bson;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.util.*;
 
-import org.bson.io.*;
-import org.bson.types.*;
-import org.testng.annotations.*;
-
+import org.bson.io.BasicOutputBuffer;
+import org.bson.io.OutputBuffer;
+import org.bson.types.CodeWScope;
 import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class BSONTest extends Assert {
 
@@ -128,7 +129,7 @@ public void testBinary()
           data[i] = 1;
         }
         BSONObject binary_object = new BasicBSONObject( "bin" , data);
-        _test( binary_object , 10019 , "682d9a636619b135fa9801ac42c48a10" );
+        _test( binary_object , 10019 , "71c3247d9e9a26d73bf64efc0b9fe90f" );
     }
 
     @Test