Use StandardCharsets.UTF_8 whenever using the UTF-8 encoding

jline · Sep 20, 2017 · e39fb9a · e39fb9a
1 parent 587120f
commit e39fb9a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/reader/src/test/java/org/jline/keymap/BindingReaderTest.java b/reader/src/test/java/org/jline/keymap/BindingReaderTest.java
@@ -52,7 +52,7 @@ public void setUp() throws Exception {
 
     @Test
     public void testBindingReaderNoUnicode() {
-        in.setIn(new ByteArrayInputStream("\uD834\uDD21abc".getBytes(Charset.forName("UTF-8"))));
+        in.setIn(new ByteArrayInputStream("\uD834\uDD21abc".getBytes(StandardCharsets.UTF_8)));
         BindingReader reader = new BindingReader(terminal.reader());
         KeyMap<Binding> keyMap = new KeyMap<>();
         keyMap.bind(new Reference("foo"), "b");
@@ -63,7 +63,7 @@ public void testBindingReaderNoUnicode() {
 
     @Test
     public void testBindingReaderUnicode() {
-        in.setIn(new ByteArrayInputStream("\uD834\uDD21abc".getBytes(Charset.forName("UTF-8"))));
+        in.setIn(new ByteArrayInputStream("\uD834\uDD21abc".getBytes(StandardCharsets.UTF_8)));
         BindingReader reader = new BindingReader(terminal.reader());
         KeyMap<Binding> keyMap = new KeyMap<>();
         keyMap.setUnicode(new Reference("insert"));

diff --git a/reader/src/test/java/org/jline/reader/impl/MultiByteCharTest.java b/reader/src/test/java/org/jline/reader/impl/MultiByteCharTest.java
@@ -13,6 +13,7 @@
 import java.io.PipedOutputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.jline.utils.InputStreamReader;
 import org.junit.Test;
@@ -27,8 +28,8 @@ public void testInputStreamReader() throws IOException {
 
         PipedOutputStream pos = new PipedOutputStream();
         PipedInputStream pis = new PipedInputStream(pos);
-        pos.write(str.getBytes(Charset.forName("UTF-8")));
-        Reader r = new InputStreamReader(pis, Charset.forName("UTF-8"));
+        pos.write(str.getBytes(StandardCharsets.UTF_8));
+        Reader r = new InputStreamReader(pis, StandardCharsets.UTF_8);
         int c0 = r.read();
         int c1 = r.read();
         int c2 = r.read();

diff --git a/reader/src/test/java/org/jline/reader/impl/ReaderTestSupport.java b/reader/src/test/java/org/jline/reader/impl/ReaderTestSupport.java
@@ -187,7 +187,7 @@ public TestBuffer(char[] chars) {
         @Override
         public String toString() {
             try {
-                return out.toString("UTF-8");
+                return out.toString(StandardCharsets.UTF_8.name());
             } catch (UnsupportedEncodingException e) {
                 throw new RuntimeException(e);
             }
@@ -282,7 +282,7 @@ public TestBuffer down() {
         }
 
         public TestBuffer append(final String str) {
-            for (byte b : str.getBytes(Charset.forName("UTF-8"))) {
+            for (byte b : str.getBytes(StandardCharsets.UTF_8)) {
                 append(b);
             }
             return this;

diff --git a/reader/src/test/java/org/jline/reader/impl/TerminalReaderTest.java b/reader/src/test/java/org/jline/reader/impl/TerminalReaderTest.java
@@ -10,6 +10,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
 
 import org.jline.keymap.KeyMap;
 import org.jline.reader.Binding;
@@ -49,7 +50,7 @@ public void testReadline() throws Exception {
 
     @Test
     public void testReadlineWithUnicode() throws Exception {
-        System.setProperty("input.encoding", "UTF-8");
+        System.setProperty("input.encoding", StandardCharsets.UTF_8.name());
         assertLine("\u6771\u00E9\u00E8", new TestBuffer("\u6771\u00E9\u00E8\n"));
     }
 

diff --git a/terminal/src/main/java/org/jline/utils/InfoCmp.java b/terminal/src/main/java/org/jline/utils/InfoCmp.java
@@ -12,6 +12,7 @@
 import java.io.IOError;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.function.Supplier;
 import java.util.regex.Matcher;
@@ -514,7 +515,7 @@ public static Capability byName(String name) {
     public static Map<String, Capability> getCapabilitiesByName() {
         Map<String, Capability> capabilities = new LinkedHashMap<>();
         try (InputStream is = InfoCmp.class.getResourceAsStream("capabilities.txt");
-             BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"))) {
+             BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
             br.lines().map(String::trim)
                     .filter(s -> !s.startsWith("#"))
                     .filter(s -> !s.isEmpty())
@@ -605,7 +606,7 @@ public static void parseInfoCmp(
 
     static String loadDefaultInfoCmp(String name) {
         try (InputStream is = InfoCmp.class.getResourceAsStream(name + ".caps");
-             BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"))) {
+             BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
             return br.lines().collect(Collectors.joining("\n", "", "\n"));
         } catch (IOException e) {
             throw new IOError(e);

diff --git a/terminal/src/test/java/org/jline/utils/WriterOutputStreamTest.java b/terminal/src/test/java/org/jline/utils/WriterOutputStreamTest.java
@@ -12,6 +12,7 @@
 
 import java.io.StringWriter;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import static org.junit.Assert.assertEquals;
 
@@ -20,8 +21,8 @@ public class WriterOutputStreamTest {
     @Test
     public void testWideChar() throws Exception {
         StringWriter sw = new StringWriter();
-        WriterOutputStream wos = new WriterOutputStream(sw, Charset.forName("UTF-8"));
-        byte[] bytes = "㐀".getBytes("UTF-8");
+        WriterOutputStream wos = new WriterOutputStream(sw, StandardCharsets.UTF_8);
+        byte[] bytes = "㐀".getBytes(StandardCharsets.UTF_8);
         for (byte b : bytes) {
             wos.write(b);
         }