Fix regression in ObjectId.compareTo

Now checks the byte array unsigned int values
JAVA-1785

Author: rozza

bson/src/main/org/bson/types/ObjectId.java

@@ -405,22 +405,14 @@ public int compareTo(final ObjectId other) {
             throw new NullPointerException();
         }
 
-        int x = timestamp - other.timestamp;
-        if (x != 0) {
-            return x;
-        }
-
-        x = machineIdentifier - other.machineIdentifier;
-        if (x != 0) {
-            return x;
-        }
-
-        x = processIdentifier - other.processIdentifier;
-        if (x != 0) {
-            return x;
+        byte[] byteArray = toByteArray();
+        byte[] otherByteArray = other.toByteArray();
+        for (int i = 0; i < 12; i++) {
+            if (byteArray[i] != otherByteArray[i]) {
+                return Integer.compare(byteArray[i] & 0xff, otherByteArray[i] & 0xff);
+            }
         }
-
-        return counter - other.counter;
+        return 0;
     }
 
     @Override

bson/src/test/unit/org/bson/types/ObjectIdTest.java

@@ -113,11 +113,13 @@ public void testCompareTo() {
         assertEquals(-1, new ObjectId(0, 0, (short) 0, 0).compareTo(new ObjectId(1, 0, (short) 0, 0)));
         assertEquals(-1, new ObjectId(0, 0, (short) 0, 0).compareTo(new ObjectId(0, 1, (short) 0, 0)));
         assertEquals(-1, new ObjectId(0, 0, (short) 0, 0).compareTo(new ObjectId(0, 0, (short) 1, 0)));
+        assertEquals(-1, new ObjectId(0, 0, (short) 1, 0).compareTo(new ObjectId(0, 0, (short) -1, 0)));
         assertEquals(-1, new ObjectId(0, 0, (short) 0, 0).compareTo(new ObjectId(0, 0, (short) 0, 1)));
         assertEquals(0, new ObjectId(0, 0, (short) 0, 0).compareTo(new ObjectId(0, 0, (short) 0, 0)));
         assertEquals(1, new ObjectId(1, 0, (short) 0, 0).compareTo(new ObjectId(0, 0, (short) 0, 0)));
         assertEquals(1, new ObjectId(0, 1, (short) 0, 0).compareTo(new ObjectId(0, 0, (short) 0, 0)));
         assertEquals(1, new ObjectId(0, 0, (short) 1, 0).compareTo(new ObjectId(0, 0, (short) 0, 0)));
+        assertEquals(1, new ObjectId(0, 0, (short) -1, 0).compareTo(new ObjectId(0, 0, (short) 1, 0)));
         assertEquals(1, new ObjectId(0, 0, (short) 0, 1).compareTo(new ObjectId(0, 0, (short) 0, 0)));
     }