JAVA-2360: Format binary subtype as a two-digit padded hexadecimal string

Author: jyemin

bson/src/main/org/bson/json/JsonWriter.java

@@ -154,7 +154,7 @@ protected void doWriteBinaryData(final BsonBinary binary) {
                 default:
                     writeStartDocument();
                     writeString("$binary", printBase64Binary(binary.getData()));
-                    writeString("$type", Integer.toHexString(binary.getType() & 0xFF));
+                    writeString("$type", String.format("%02X", binary.getType()));
                     writeEndDocument();
             }
         } catch (IOException e) {

bson/src/test/unit/org/bson/json/JsonWriterTest.java

@@ -409,16 +409,16 @@ public void testArray() {
     public void testBinaryStrict() {
         List<TestData<BsonBinary>> tests = asList(new TestData<BsonBinary>(new BsonBinary(new byte[0]),
                                                                    "{ \"$binary\" : \"\", "
-                                                                   + "\"$type\" : \"0\" }"),
+                                                                   + "\"$type\" : \"00\" }"),
                                               new TestData<BsonBinary>(new BsonBinary(new byte[]{1}),
                                                                    "{ \"$binary\" : \"AQ==\", "
-                                                                   + "\"$type\" : \"0\" }"),
+                                                                   + "\"$type\" : \"00\" }"),
                                               new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2}),
                                                                    "{ \"$binary\" : \"AQI=\", "
-                                                                   + "\"$type\" : \"0\" }"),
+                                                                   + "\"$type\" : \"00\" }"),
                                               new TestData<BsonBinary>(new BsonBinary(new byte[]{1, 2, 3}),
                                                                    "{ \"$binary\" : \"AQID\", "
-                                                                   + "\"$type\" : \"0\" }"),
+                                                                   + "\"$type\" : \"00\" }"),
                                               new TestData<BsonBinary>(new BsonBinary((byte) 0x80, new byte[]{1, 2, 3}),
                                                                    "{ \"$binary\" : \"AQID\", "
                                                                    + "\"$type\" : \"80\" }"));

driver-core/src/test/unit/com/mongodb/connection/PlainAuthenticatorUnitTest.java

@@ -67,7 +67,7 @@ private void validateMessages() {
         String command = MessageHelper.decodeCommandAsJson(sent.get(0));
         String expectedCommand = "{ \"saslStart\" : 1, "
                                  + "\"mechanism\" : \"PLAIN\", "
-                                 + "\"payload\" : { \"$binary\" : \"dXNlcgB1c2VyAHBlbmNpbA==\", \"$type\" : \"0\" } }";
+                                 + "\"payload\" : { \"$binary\" : \"dXNlcgB1c2VyAHBlbmNpbA==\", \"$type\" : \"00\" } }";
 
         assertEquals(expectedCommand, command);
     }

driver-core/src/test/unit/com/mongodb/connection/ScramSha1SaslAuthenticatorTest.java

@@ -160,18 +160,18 @@ private void validateMessages() {
         String expectedFirstCommand = "{ \"saslStart\" : 1, "
                 + "\"mechanism\" : \"SCRAM-SHA-1\", "
                 + "\"payload\" : { \"$binary\" : \"biwsbj11c2VyLHI9ZnlrbytkMmxiYkZnT05Sdjlxa3hkYXdM\", "
-                + "\"$type\" : \"0\" } }";
+                + "\"$type\" : \"00\" } }";
 
         String secondCommand = MessageHelper.decodeCommandAsJson(sent.get(1));
         String expectedSecondCommand = "{ \"saslContinue\" : 1, "
                 + "\"conversationId\" : 1, "
                 + "\"payload\" : { \"$binary\" : \"Yz1iaXdzLHI9ZnlrbytkMmxiYkZnT05Sdjlxa3hkYXdMSG8rVmdrN3F2VU9LVXd"
-                + "1V0xJV2c0bC85U3JhR01IRUUscD1NQzJUOEJ2Ym1XUmNrRHc4b1dsNUlWZ2h3Q1k9\", \"$type\" : \"0\" } }";
+                + "1V0xJV2c0bC85U3JhR01IRUUscD1NQzJUOEJ2Ym1XUmNrRHc4b1dsNUlWZ2h3Q1k9\", \"$type\" : \"00\" } }";
 
         String thirdCommand = MessageHelper.decodeCommandAsJson(sent.get(2));
         String expectedThirdCommand = "{ \"saslContinue\" : 1, "
                 + "\"conversationId\" : 1, "
-                + "\"payload\" : { \"$binary\" : \"dj1VTVdlSTI1SkQxeU5ZWlJNcFo0Vkh2aFo5ZTA9\", \"$type\" : \"0\" } }";
+                + "\"payload\" : { \"$binary\" : \"dj1VTVdlSTI1SkQxeU5ZWlJNcFo0Vkh2aFo5ZTA9\", \"$type\" : \"00\" } }";
 
         assertEquals(expectedFirstCommand, firstCommand);
         assertEquals(expectedSecondCommand, secondCommand);