Reading and writing binary representation of ObjectId now just uses byte arrays produced and consumed by ObjectId class

Author: jyemin

bson/src/main/org/bson/BSONBinaryWriter.java

@@ -192,11 +192,7 @@ public void writeObjectId(final ObjectId objectId) {
         buffer.write(BsonType.OBJECT_ID.getValue());
         writeCurrentName();
 
-        // TODO: Should this be pushed down into the buffer?
-        buffer.writeIntBE(objectId.time());
-        buffer.writeIntBE(objectId.machine());
-        buffer.writeIntBE(objectId.inc());
-
+        buffer.write(objectId.toByteArray());
         setState(getNextState());
     }
 

bson/src/main/org/bson/io/ByteBufferInput.java

@@ -80,7 +80,7 @@ public String readString() {
 
     @Override
     public ObjectId readObjectId() {
-        return new ObjectId(readBigEndianInt(), readBigEndianInt(), readBigEndianInt());
+        return new ObjectId(readBytes(12));
     }
 
     @Override
@@ -97,12 +97,11 @@ public String readCString() {
         buffer.position(mark);
 
         final byte[] bytes = readBytes(size);
-        readByte();  // read the trailing null bytes
+        readByte();  // read the trailing null byte
 
         return new String(bytes, UTF8_CHARSET);
     }
 
-
     private void readUntilNullByte() {
         //CHECKSTYLE:OFF
         while (buffer.get() != 0) {
@@ -120,13 +119,4 @@ public void skipCString() {
     public void skip(final int numBytes) {
         buffer.position(buffer.position() + numBytes);
     }
-
-    private int readBigEndianInt() {
-        int x = 0;
-        x |= (0xFF & buffer.get()) << 24;
-        x |= (0xFF & buffer.get()) << 16;
-        x |= (0xFF & buffer.get()) << 8;
-        x |= (0xFF & buffer.get());
-        return x;
-    }
 }

bson/src/main/org/bson/io/OutputBuffer.java

@@ -77,13 +77,6 @@ public void writeInt(final int x) {
         write(x >> 24);
     }
 
-    public void writeIntBE(final int x) {
-        write(x >> 24);
-        write(x >> 16);
-        write(x >> 8);
-        write(x);
-    }
-
     /**
      * Backpatches the size of a document or string by writing the size into the four bytes starting at getPosition() -
      * size.