Prefer StandardCharsets.UTF_8 to Charset.forName("UTF-8")

jyemin · jyemin · commit c52ff8085217 · 2022-01-17T18:09:27.000-05:00
diff --git a/bson/src/main/org/bson/io/ByteBufferBsonInput.java b/bson/src/main/org/bson/io/ByteBufferBsonInput.java
@@ -21,7 +21,7 @@
 import org.bson.types.ObjectId;
 
 import java.nio.ByteOrder;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import static java.lang.String.format;
 
@@ -31,7 +31,6 @@
  * @since 3.0
  */
 public class ByteBufferBsonInput implements BsonInput {
-    private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
 
     private static final String[] ONE_BYTE_ASCII_STRINGS = new String[Byte.MAX_VALUE + 1];
 
@@ -143,7 +142,7 @@ private String readString(final int size) {
                 throw new BsonSerializationException("Found a BSON string that is not null-terminated");
             }
             if (asciiByte < 0) {
-                return UTF8_CHARSET.newDecoder().replacement();
+                return StandardCharsets.UTF_8.newDecoder().replacement();
             }
             return ONE_BYTE_ASCII_STRINGS[asciiByte];  // this will throw if asciiByte is negative
         } else {
@@ -153,7 +152,7 @@ private String readString(final int size) {
             if (nullByte != 0) {
                 throw new BsonSerializationException("Found a BSON string that is not null-terminated");
             }
-            return new String(bytes, UTF8_CHARSET);
+            return new String(bytes, StandardCharsets.UTF_8);
         }
     }
 
diff --git a/bson/src/test/unit/org/bson/io/BasicOutputBufferTest.java b/bson/src/test/unit/org/bson/io/BasicOutputBufferTest.java
@@ -20,6 +20,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import static org.junit.Assert.assertArrayEquals;
@@ -42,7 +43,7 @@ public void shouldEncodeAllCodePointsThatAreLettersOrDigits() throws IOException
 
             // then
             byte[] bytes = getBytes(bsonOutput);
-            assertArrayEquals("failed with code point " + codePoint, str.getBytes("UTF-8"), Arrays.copyOfRange(bytes, 0, bytes.length - 1));
+            assertArrayEquals("failed with code point " + codePoint, str.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(bytes, 0, bytes.length - 1));
         }
     }
 
diff --git a/bson/src/test/unit/org/bson/json/JsonReaderTest.java b/bson/src/test/unit/org/bson/json/JsonReaderTest.java
@@ -32,7 +32,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -1270,8 +1270,8 @@ private void testStringAndStream(final String json, final Function<AbstractBsonR
             assertEquals(exClass, e.getClass());
         }
         try {
-            testFunc.apply(new JsonReader(new InputStreamReader(new ByteArrayInputStream(json.getBytes(Charset.forName("UTF-8"))),
-                    Charset.forName("UTF-8"))));
+            testFunc.apply(new JsonReader(new InputStreamReader(new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)),
+                    StandardCharsets.UTF_8)));
         } catch (final RuntimeException e) {
             if (exClass == null) {
                 throw e;
diff --git a/bson/src/test/unit/util/JsonPoweredTestHelper.java b/bson/src/test/unit/util/JsonPoweredTestHelper.java
@@ -28,7 +28,7 @@
 import java.io.InputStreamReader;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -95,7 +95,7 @@ private static String getFileAsString(final File file) throws IOException {
         StringBuilder stringBuilder = new StringBuilder();
         String line;
         String ls = System.getProperty("line.separator");
-        BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")));
+        BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
         try {
             while ((line = reader.readLine()) != null) {
                 stringBuilder.append(line);
diff --git a/driver-core/src/main/com/mongodb/ConnectionString.java b/driver-core/src/main/com/mongodb/ConnectionString.java
@@ -26,6 +26,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -249,8 +250,6 @@ public class ConnectionString {
     private static final String MONGODB_SRV_PREFIX = "mongodb+srv://";
     private static final Set<String> ALLOWED_OPTIONS_IN_TXT_RECORD =
             new HashSet<String>(asList("authsource", "replicaset", "loadbalanced"));
-    private static final String UTF_8 = "UTF-8";
-
     private static final Logger LOGGER = Loggers.getLogger("uri");
 
     private final MongoCredential credential;
@@ -1096,7 +1095,7 @@ private String urldecode(final String input) {
 
     private String urldecode(final String input, final boolean password) {
         try {
-            return URLDecoder.decode(input, UTF_8);
+            return URLDecoder.decode(input, StandardCharsets.UTF_8.name());
         } catch (UnsupportedEncodingException e) {
             if (password) {
                 throw new IllegalArgumentException("The connection string contained unsupported characters in the password.");
diff --git a/driver-core/src/main/com/mongodb/MongoClientSettings.java b/driver-core/src/main/com/mongodb/MongoClientSettings.java
@@ -39,7 +39,7 @@
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.codecs.jsr310.Jsr310CodecProvider;
 
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -448,7 +448,7 @@ public Builder commandListenerList(final List<CommandListener> commandListeners)
         public Builder applicationName(@Nullable final String applicationName) {
             if (applicationName != null) {
                 isTrueArgument("applicationName UTF-8 encoding length <= 128",
-                        applicationName.getBytes(Charset.forName("UTF-8")).length <= 128);
+                        applicationName.getBytes(StandardCharsets.UTF_8).length <= 128);
             }
             this.applicationName = applicationName;
             return this;
diff --git a/driver-core/src/main/com/mongodb/internal/authentication/NativeAuthenticationHelper.java b/driver-core/src/main/com/mongodb/internal/authentication/NativeAuthenticationHelper.java
@@ -22,7 +22,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import static com.mongodb.internal.HexUtils.hexMD5;
 
@@ -33,8 +33,6 @@
  */
 public final class NativeAuthenticationHelper {
 
-    private static final Charset UTF_8_CHARSET = Charset.forName("UTF-8");
-
     /**
      * Creates a hash of the given user name and password, which is the hex encoding of
      * {@code MD5( <userName> + ":mongo:" + <password> )}.
@@ -47,9 +45,9 @@ public final class NativeAuthenticationHelper {
     public static String createAuthenticationHash(final String userName, final char[] password) {
         ByteArrayOutputStream bout = new ByteArrayOutputStream(userName.length() + 20 + password.length);
         try {
-            bout.write(userName.getBytes(UTF_8_CHARSET));
-            bout.write(":mongo:".getBytes(UTF_8_CHARSET));
-            bout.write(new String(password).getBytes(UTF_8_CHARSET));
+            bout.write(userName.getBytes(StandardCharsets.UTF_8));
+            bout.write(":mongo:".getBytes(StandardCharsets.UTF_8));
+            bout.write(new String(password).getBytes(StandardCharsets.UTF_8));
         } catch (IOException ioe) {
             throw new RuntimeException("impossible", ioe);
         }
@@ -68,7 +66,7 @@ public static BsonDocument getAuthCommand(final String userName, final String au
         cmd.put("authenticate", new BsonInt32(1));
         cmd.put("user", new BsonString(userName));
         cmd.put("nonce", new BsonString(nonce));
-        cmd.put("key", new BsonString(hexMD5(key.getBytes(UTF_8_CHARSET))));
+        cmd.put("key", new BsonString(hexMD5(key.getBytes(StandardCharsets.UTF_8))));
 
         return cmd;
     }
diff --git a/driver-core/src/main/com/mongodb/internal/connection/ClientMetadataHelper.java b/driver-core/src/main/com/mongodb/internal/connection/ClientMetadataHelper.java
@@ -25,7 +25,7 @@
 import org.bson.codecs.EncoderContext;
 import org.bson.io.BasicOutputBuffer;
 
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import static com.mongodb.assertions.Assertions.isTrueArgument;
@@ -111,7 +111,7 @@ static BsonDocument createClientMetadataDocument(final String applicationName, f
                                                      final BsonDocument templateDocument) {
         if (applicationName != null) {
             isTrueArgument("applicationName UTF-8 encoding length <= 128",
-                    applicationName.getBytes(Charset.forName("UTF-8")).length <= 128);
+                    applicationName.getBytes(StandardCharsets.UTF_8).length <= 128);
         }
 
         BsonDocument document = templateDocument.clone();
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/JsonPoweredTestHelper.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/JsonPoweredTestHelper.java
@@ -29,7 +29,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URISyntaxException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -49,7 +49,7 @@ private static String getFileAsString(final File file) throws IOException {
         StringBuilder stringBuilder = new StringBuilder();
         String line;
         String ls = System.getProperty("line.separator");
-        BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")));
+        BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
         try {
             while ((line = reader.readLine()) != null) {
                 stringBuilder.append(line);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`import org.bson.types.ObjectId;`
`22`	`22`
`23`	`23`	`import java.nio.ByteOrder;`
`24`		`-import java.nio.charset.Charset;`
	`24`	`+import java.nio.charset.StandardCharsets;`
`25`	`25`
`26`	`26`	`import static java.lang.String.format;`
`27`	`27`
`@@ -31,7 +31,6 @@`
`31`	`31`	`* @since 3.0`
`32`	`32`	`*/`
`33`	`33`	`public class ByteBufferBsonInput implements BsonInput {`
`34`		`- private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");`
`35`	`34`
`36`	`35`	`private static final String[] ONE_BYTE_ASCII_STRINGS = new String[Byte.MAX_VALUE + 1];`
`37`	`36`
`@@ -143,7 +142,7 @@ private String readString(final int size) {`
`143`	`142`	`throw new BsonSerializationException("Found a BSON string that is not null-terminated");`
`144`	`143`	`}`
`145`	`144`	`if (asciiByte < 0) {`
`146`		`- return UTF8_CHARSET.newDecoder().replacement();`
	`145`	`+ return StandardCharsets.UTF_8.newDecoder().replacement();`
`147`	`146`	`}`
`148`	`147`	`return ONE_BYTE_ASCII_STRINGS[asciiByte]; // this will throw if asciiByte is negative`
`149`	`148`	`} else {`
`@@ -153,7 +152,7 @@ private String readString(final int size) {`
`153`	`152`	`if (nullByte != 0) {`
`154`	`153`	`throw new BsonSerializationException("Found a BSON string that is not null-terminated");`
`155`	`154`	`}`
`156`		`- return new String(bytes, UTF8_CHARSET);`
	`155`	`+ return new String(bytes, StandardCharsets.UTF_8);`
`157`	`156`	`}`
`158`	`157`	`}`
`159`	`158`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`import java.io.ByteArrayOutputStream;`
`22`	`22`	`import java.io.IOException;`
	`23`	`+import java.nio.charset.StandardCharsets;`
`23`	`24`	`import java.util.Arrays;`
`24`	`25`
`25`	`26`	`import static org.junit.Assert.assertArrayEquals;`
`@@ -42,7 +43,7 @@ public void shouldEncodeAllCodePointsThatAreLettersOrDigits() throws IOException`
`42`	`43`
`43`	`44`	`// then`
`44`	`45`	`byte[] bytes = getBytes(bsonOutput);`
`45`		`- assertArrayEquals("failed with code point " + codePoint, str.getBytes("UTF-8"), Arrays.copyOfRange(bytes, 0, bytes.length - 1));`
	`46`	`+ assertArrayEquals("failed with code point " + codePoint, str.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(bytes, 0, bytes.length - 1));`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`