Added support for UUID (binary, subtype 3)

scotthernandez · scotthernandez · commit 07a294ae468e · 2010-05-30T22:30:26.000-07:00
diff --git a/src/main/org/bson/BSON.java b/src/main/org/bson/BSON.java
@@ -2,11 +2,10 @@
 
 package org.bson;
 
+import java.nio.charset.*;
 import java.util.*;
 import java.util.regex.*;
-import java.nio.charset.*;
 
-import org.bson.io.*;
 import org.bson.util.*;
 
 public class BSON {
@@ -45,6 +44,7 @@ public class BSON {
     
     public static final byte B_FUNC = 1;
     public static final byte B_BINARY = 2;
+    public static final byte B_UUID = 3;
 
     // ---- regular expression handling ----
     
diff --git a/src/main/org/bson/BSONCallback.java b/src/main/org/bson/BSONCallback.java
@@ -2,8 +2,6 @@
 
 package org.bson;
 
-import java.io.*;
-
 import org.bson.types.*;
 
 public interface BSONCallback {
@@ -41,4 +39,8 @@ public interface BSONCallback {
      */
     void gotBinaryArray( String name , byte[] b );
     void gotBinary( String name , byte type , byte[] data );
+    /**
+     * subtype 3
+     */
+    void gotUUID( String name , long part1, long part2);
 }
diff --git a/src/main/org/bson/BSONDecoder.java b/src/main/org/bson/BSONDecoder.java
@@ -2,9 +2,10 @@
 
 package org.bson;
 
+import static org.bson.BSON.*;
+
 import java.io.*;
 
-import static org.bson.BSON.*;
 import org.bson.io.*;
 import org.bson.types.*;
 
@@ -218,6 +219,14 @@ void _binary( String name )
             _in.fill( data );
             _callback.gotBinaryArray( name , data );
             return;
+        case B_UUID:
+        	if ( totalLen != 132 )
+                throw new IllegalArgumentException( "bad data size subtype 3 len: " + totalLen + " != 16");
+        		
+        	long part1 = _in.readLong();
+        	long part2 = _in.readLong();
+        	_callback.gotUUID(name, part1, part2);
+        	return;	
         }
         
         byte[] data = new byte[totalLen];
diff --git a/src/main/org/bson/BSONEncoder.java b/src/main/org/bson/BSONEncoder.java
@@ -164,6 +164,8 @@ else if ( val instanceof byte[] )
             putBinary( name , (byte[])val );
         else if ( val instanceof Binary )
             putBinary( name , (Binary)val );
+        else if ( val instanceof UUID )
+            putUUID( name , (UUID)val );
         else if ( val.getClass().isArray() )
             putIterable( name , Arrays.asList( (Object[])val ) );
 
@@ -286,6 +288,13 @@ protected void putBinary( String name , Binary val ){
         _buf.write( val.getData() );
     }
     
+    protected void putUUID( String name , UUID val ){
+        _put( BINARY , name );
+        _buf.writeInt( 4 + 64*2);
+        _buf.write( B_UUID );
+        _buf.writeLong( val.getMostSignificantBits());
+        _buf.writeLong( val.getLeastSignificantBits());
+    }
 
     protected void putSymbol( String name , Symbol s ){
         _putString(name, s.getSymbol(), SYMBOL);
diff --git a/src/main/org/bson/BasicBSONCallback.java b/src/main/org/bson/BasicBSONCallback.java
@@ -2,7 +2,6 @@
 
 package org.bson;
 
-import java.io.*;
 import java.util.*;
 import java.util.regex.*;
 
@@ -130,6 +129,10 @@ public void gotBinaryArray( String name , byte[] b ){
     public void gotBinary( String name , byte type , byte[] data ){
         _put( name , new Binary( type , data ) );
     }
+    
+    public void gotUUID( String name , long part1, long part2){
+        _put( name , new UUID(part1, part2) );
+    }
 
     protected void _put( String name , Object o ){
         cur().put( name , BSON.applyDecodingHooks( o ) );
diff --git a/src/test/com/mongodb/JavaClientTest.java b/src/test/com/mongodb/JavaClientTest.java
@@ -18,16 +18,15 @@
 package com.mongodb;
 
 import java.io.*;
+import java.nio.*;
 import java.util.*;
 import java.util.regex.*;
-import java.nio.*;
-
-import org.testng.annotations.Test;
-
-import com.mongodb.util.*;
 
 import org.bson.*;
 import org.bson.types.*;
+import org.testng.annotations.*;
+
+import com.mongodb.util.*;
 
 public class JavaClientTest extends TestCase {
     
@@ -184,6 +183,17 @@ public void testBinary()
         }
         
     }
+    @Test
+    public void testUUID()
+        throws MongoException {
+        DBCollection c = _db.getCollection( "testUUID" );
+        c.drop();
+        c.save( BasicDBObjectBuilder.start().add( "a" , new UUID(1,2)).get() );
+        
+        DBObject out = c.findOne();
+        UUID b = (UUID)(out.get( "a" ) );
+        assertEquals( new UUID(1,2), b);
+    }
 
     @Test
     public void testEval()
