Replace org.bson.internal.Base64 with java.util.Base64 (#854)

JAVA-4443

Author: jyemin

bson/src/main/org/bson/internal/Base64.java

@@ -17,15 +17,16 @@
 package org.bson.json;
 
 import org.bson.BsonBinary;
-import org.bson.internal.Base64;
+
+import java.util.Base64;
 
 class ExtendedJsonBinaryConverter implements Converter<BsonBinary> {
 
     @Override
     public void convert(final BsonBinary value, final StrictJsonWriter writer) {
         writer.writeStartObject();
         writer.writeStartObject("$binary");
-        writer.writeString("base64", Base64.encode(value.getData()));
+        writer.writeString("base64", Base64.getEncoder().encodeToString(value.getData()));
         writer.writeString("subType", String.format("%02X", value.getType()));
         writer.writeEndObject();
         writer.writeEndObject();

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

@@ -28,7 +28,6 @@
 import org.bson.BsonTimestamp;
 import org.bson.BsonType;
 import org.bson.BsonUndefined;
-import org.bson.internal.Base64;
 import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
@@ -39,6 +38,7 @@
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeParseException;
+import java.util.Base64;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
@@ -704,7 +704,7 @@ private BsonBinary visitBinDataConstructor() {
         }
         verifyToken(JsonTokenType.RIGHT_PAREN);
 
-        byte[] bytes = Base64.decode(bytesToken.getValue(String.class));
+        byte[] bytes = Base64.getDecoder().decode(bytesToken.getValue(String.class));
         return new BsonBinary(subTypeToken.getValue(Integer.class).byteValue(), bytes);
     }
 
@@ -949,7 +949,7 @@ private BsonBinary visitBinDataExtendedJson(final String firstKey) {
                     byte type;
                     if (firstNestedKey.equals("base64")) {
                         verifyToken(JsonTokenType.COLON);
-                        data = Base64.decode(readStringFromExtendedJson());
+                        data = Base64.getDecoder().decode(readStringFromExtendedJson());
                         verifyToken(JsonTokenType.COMMA);
                         verifyString("subType");
                         verifyToken(JsonTokenType.COLON);
@@ -960,7 +960,7 @@ private BsonBinary visitBinDataExtendedJson(final String firstKey) {
                         verifyToken(JsonTokenType.COMMA);
                         verifyString("base64");
                         verifyToken(JsonTokenType.COLON);
-                        data = Base64.decode(readStringFromExtendedJson());
+                        data = Base64.getDecoder().decode(readStringFromExtendedJson());
                     } else {
                         throw new JsonParseException("Unexpected key for $binary: " + firstNestedKey);
                     }
@@ -991,7 +991,7 @@ private BsonBinary visitLegacyBinaryExtendedJson(final String firstKey) {
             byte type;
 
             if (firstKey.equals("$binary")) {
-                data = Base64.decode(readStringFromExtendedJson());
+                data = Base64.getDecoder().decode(readStringFromExtendedJson());
                 verifyToken(JsonTokenType.COMMA);
                 verifyString("$type");
                 verifyToken(JsonTokenType.COLON);
@@ -1001,7 +1001,7 @@ private BsonBinary visitLegacyBinaryExtendedJson(final String firstKey) {
                 verifyToken(JsonTokenType.COMMA);
                 verifyString("$binary");
                 verifyToken(JsonTokenType.COLON);
-                data = Base64.decode(readStringFromExtendedJson());
+                data = Base64.getDecoder().decode(readStringFromExtendedJson());
             }
             verifyToken(JsonTokenType.END_OBJECT);
 

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

@@ -17,14 +17,15 @@
 package org.bson.json;
 
 import org.bson.BsonBinary;
-import org.bson.internal.Base64;
+
+import java.util.Base64;
 
 class LegacyExtendedJsonBinaryConverter implements Converter<BsonBinary> {
 
     @Override
     public void convert(final BsonBinary value, final StrictJsonWriter writer) {
         writer.writeStartObject();
-        writer.writeString("$binary", Base64.encode(value.getData()));
+        writer.writeString("$binary", Base64.getEncoder().encodeToString(value.getData()));
         writer.writeString("$type", String.format("%02X", value.getType()));
         writer.writeEndObject();
     }

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

@@ -17,14 +17,15 @@
 package org.bson.json;
 
 import org.bson.BsonBinary;
-import org.bson.internal.Base64;
+
+import java.util.Base64;
 
 import static java.lang.String.format;
 
 class ShellBinaryConverter implements Converter<BsonBinary> {
     @Override
     public void convert(final BsonBinary value, final StrictJsonWriter writer) {
         writer.writeRaw(format("new BinData(%s, \"%s\")", Integer.toString(value.getType() & 0xFF),
-                Base64.encode(value.getData())));
+                Base64.getEncoder().encodeToString(value.getData())));
     }
 }

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

@@ -16,15 +16,14 @@
 
 package com.mongodb.internal.connection;
 
-import org.bson.internal.Base64;
-
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import javax.security.sasl.SaslException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -94,7 +93,7 @@ private Map<String, String> getRequestHeaders() {
         requestHeaders.put("Content-Length", String.valueOf(this.body.length()));
         requestHeaders.put("Host", this.host);
         requestHeaders.put("X-Amz-Date", this.timestamp);
-        requestHeaders.put("X-MongoDB-Server-Nonce", Base64.encode(this.nonce));
+        requestHeaders.put("X-MongoDB-Server-Nonce", Base64.getEncoder().encodeToString(this.nonce));
         requestHeaders.put("X-MongoDB-GS2-CB-Flag", "n");
         if (this.sessionToken != null) {
             requestHeaders.put("X-Amz-Security-Token", this.sessionToken);