more cleaning prep

erh · erh · commit f8727b895dbb · 2010-05-06T14:34:44.000-04:00
diff --git a/src/main/com/mongodb/Bytes.java b/src/main/com/mongodb/Bytes.java
@@ -125,20 +125,5 @@ public static byte getType( Object o ){
         return 0;
     }
 
-    public static byte[] encode( DBObject o ){
-        ByteEncoder e = ByteEncoder.get();
-        e.putObject( o );
-        byte b[] = e.getBytes();
-        e.done();
-        return b;
-    }
-    
-    public static DBObject decode( byte[] b ){
-        ByteBuffer bb = ByteBuffer.wrap( b );
-        bb.order( Bytes.ORDER );
-        ByteDecoder d = new ByteDecoder( bb );
-        return d.readObject();
-    }
-
     static final ObjectId COLLECTION_REF_ID = new ObjectId( -1 , -1 , -1 );
 }
diff --git a/src/main/com/mongodb/DBMessage.java b/src/main/com/mongodb/DBMessage.java
@@ -42,23 +42,6 @@ enum State { BUILDING , SENDING , READABLE , DONE }
     
     static AtomicInteger ID = new AtomicInteger(1);
     static int HEADER_LENGTH = 16;
-
-    DBMessage( int operation ){
-        _len = 0;
-        _id = ID.getAndIncrement();
-        _responseTo = 0;
-        _operation = operation;
-
-        _encoder = ByteEncoder.get();
-        _buf = _encoder._buf;
-
-        _buf.putInt( 0 ); // saving space for len
-        _buf.putInt( _id );
-        _buf.putInt( _responseTo );
-        _buf.putInt( _operation );
-        
-        _state = State.BUILDING;
-    }
     
     DBMessage( ByteBuffer buf ){
         _buf = buf;
@@ -69,7 +52,6 @@ enum State { BUILDING , SENDING , READABLE , DONE }
         _operation = buf.getInt();
         
         _state = State.READABLE;
-        _encoder = null;
     }
 
     ByteBuffer forBuilding(){
@@ -121,6 +103,5 @@ public String toString(){
     final int _responseTo;
     final int _operation;
 
-    final ByteEncoder _encoder;
     final ByteBuffer _buf;
 }
diff --git a/src/main/org/bson/BSON.java b/src/main/org/bson/BSON.java
@@ -6,6 +6,8 @@
 import java.util.regex.*;
 import java.nio.charset.*;
 
+import org.bson.io.*;
+
 public class BSON {
 
     // ---- basics ----
@@ -200,5 +202,29 @@ public static void clearAllHooks(){
         Collections.synchronizedMap( new HashMap<Byte,List<Transformer>>() );
     
     static protected Charset _utf8 = Charset.forName( "UTF-8" );
+    
+    // ----- static encode/decode -----
+    
+    public static byte[] encode( BSONObject o ){
+        BSONEncoder e = _staticEncoder.get();
+        return e.encode( o );
+    }
+    
+    public static BSONObject decode( byte[] b ){
+        BSONDecoder d = _staticDecoder.get();
+        return d.readObject( b );
+    }
+
+    static ThreadLocal<BSONEncoder> _staticEncoder = new ThreadLocal<BSONEncoder>(){
+        protected BSONEncoder initialValue(){
+            return new BSONEncoder();
+        }
+    };
+
+    static ThreadLocal<BSONDecoder> _staticDecoder = new ThreadLocal<BSONDecoder>(){
+        protected BSONDecoder initialValue(){
+            return new BSONDecoder();
+        }
+    };
 
 }
diff --git a/src/main/org/bson/BSONDecoder.java b/src/main/org/bson/BSONDecoder.java
@@ -10,6 +10,22 @@
 
 public class BSONDecoder {
     
+    public BSONObject readObject( byte[] b ){
+        try {
+            return readObject( new ByteArrayInputStream( b ) );
+        }
+        catch ( IOException ioe ){
+            throw new RuntimeException( "should be impossible" , ioe );
+        }
+    }
+
+    public BSONObject readObject( InputStream in )
+        throws IOException {
+        BasicBSONCallback c = new BasicBSONCallback();
+        decode( in , c );
+        return c.get();
+    }
+
     public int decode( InputStream in , BSONCallback callback )
         throws IOException {
         return decode( new Input( in ) , callback );
diff --git a/src/main/org/bson/BSONEncoder.java b/src/main/org/bson/BSONEncoder.java
@@ -25,6 +25,14 @@ public BSONEncoder(){
 
     }
 
+    public byte[] encode( BSONObject o ){
+        BasicOutputBuffer buf = new BasicOutputBuffer();
+        set( buf );
+        putObject( o );
+        done();
+        return buf.toByteArray();
+    }
+
     public void set( OutputBuffer out ){
         if ( _buf != null )
             throw new IllegalStateException( "in the middle of something" );
