Use StandardCharsets.UTF_8 where possible

infinispan · Sep 13, 2018 · 5f54196 · 5f54196
1 parent b074b92
commit 5f54196
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 27 deletions.
diff --git a/cli/cli-client/src/test/java/org/infinispan/cli/BatchingTest.java b/cli/cli-client/src/test/java/org/infinispan/cli/BatchingTest.java
@@ -1,5 +1,7 @@
 package org.infinispan.cli;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -19,7 +21,7 @@ public void testStandardInput() throws Exception {
       InputStream in = System.in;
       PrintStream out = System.out;
       try {
-         bais = new ByteArrayInputStream("version;\n".getBytes("UTF-8"));
+         bais = new ByteArrayInputStream("version;\n".getBytes(UTF_8));
          baos = new ByteArrayOutputStream();
          System.setIn(bais);
          System.setOut(new PrintStream(baos));

diff --git a/cli/cli-interpreter/src/main/java/org/infinispan/cli/interpreter/codec/MemcachedCodec.java b/cli/cli-interpreter/src/main/java/org/infinispan/cli/interpreter/codec/MemcachedCodec.java
@@ -2,7 +2,6 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import org.infinispan.cli.interpreter.Interpreter;
 import org.infinispan.cli.interpreter.logging.Log;
 import org.infinispan.commons.configuration.ClassWhiteList;
 import org.infinispan.util.logging.LogFactory;
@@ -16,7 +15,7 @@
  */
 @MetaInfServices(org.infinispan.cli.interpreter.codec.Codec.class)
 public class MemcachedCodec extends AbstractCodec {
-   private static final Log log = LogFactory.getLog(Interpreter.class, Log.class);
+   private static final Log log = LogFactory.getLog(MemcachedCodec.class, Log.class);
 
    public MemcachedCodec() {
       try {
@@ -72,7 +71,5 @@ public Object decodeValue(Object value) {
       } else {
          return null;
       }
-
    }
-
 }
diff --git a/...trod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java b/...trod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Field;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
@@ -178,7 +179,7 @@ public interface HotRodConstants {
     */
    @Deprecated
    byte CLIENT_INTELLIGENCE_HASH_DISTRIBUTION_AWARE = 0x03;
-   Charset HOTROD_STRING_CHARSET = Charset.forName("UTF-8");
+   Charset HOTROD_STRING_CHARSET = StandardCharsets.UTF_8;
 
    byte[] DEFAULT_CACHE_NAME_BYTES = new byte[]{};
 

diff --git a/...lient/src/test/java/org/infinispan/client/hotrod/stress/ClientConsistentHashPerfTest.java b/...lient/src/test/java/org/infinispan/client/hotrod/stress/ClientConsistentHashPerfTest.java
@@ -1,5 +1,7 @@
 package org.infinispan.client.hotrod.stress;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import java.net.SocketAddress;
 
 import org.infinispan.client.hotrod.RemoteCache;
@@ -42,7 +44,7 @@ public void testConsistentHashPerf() throws Exception {
       byte[][] keys = new byte[NUM_KEYS][];
 
       for (int i = 0; i < NUM_KEYS; i++) {
-         keys[i] = String.valueOf(i).getBytes("UTF-8");
+         keys[i] = String.valueOf(i).getBytes(UTF_8);
       }
 
       SocketAddress aServer = null;

diff --git a/commons/src/main/java/org/infinispan/commons/dataconversion/UTF8Encoder.java b/commons/src/main/java/org/infinispan/commons/dataconversion/UTF8Encoder.java
@@ -1,6 +1,6 @@
 package org.infinispan.commons.dataconversion;
 
-import java.nio.charset.Charset;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.infinispan.commons.logging.Log;
 import org.infinispan.commons.logging.LogFactory;
@@ -14,19 +14,20 @@ public class UTF8Encoder implements Encoder {
 
    private static final Log log = LogFactory.getLog(UTF8Encoder.class);
 
-   private static final Charset CHARSET_UTF8 = Charset.forName("UTF-8");
-
    public static final UTF8Encoder INSTANCE = new UTF8Encoder();
 
    @Override
    public Object toStorage(Object content) {
-      if (content instanceof String) return String.class.cast(content).getBytes(CHARSET_UTF8);
+      if (content instanceof String) {
+         return String.class.cast(content).getBytes(UTF_8);
+      }
+
       throw log.unsupportedContent(content);
    }
 
    @Override
    public Object fromStorage(Object stored) {
-      return new String((byte[]) stored, CHARSET_UTF8);
+      return new String((byte[]) stored, UTF_8);
    }
 
    @Override
@@ -43,5 +44,4 @@ public MediaType getStorageFormat() {
    public short id() {
       return EncoderIds.UTF8;
    }
-
 }
diff --git a/commons/src/main/java/org/infinispan/commons/util/Util.java b/commons/src/main/java/org/infinispan/commons/util/Util.java
@@ -20,6 +20,7 @@
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileLock;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.text.NumberFormat;
@@ -424,7 +425,7 @@ public static byte[] readStream(InputStream is) throws IOException {
      */
     public static String read(InputStream is) throws IOException {
        try {
-          final Reader reader = new InputStreamReader(is, "UTF-8");
+          final Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
           StringWriter writer = new StringWriter();
           char[] buf = new char[1024];
           int len;

diff --git a/commons/src/test/java/org/infinispan/commons/hash/MurmurHash3Old.java b/commons/src/test/java/org/infinispan/commons/hash/MurmurHash3Old.java
@@ -1,7 +1,7 @@
 package org.infinispan.commons.hash;
 
 import java.io.ObjectInput;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Set;
 
 import org.infinispan.commons.marshall.Ids;
@@ -36,8 +36,6 @@ public static MurmurHash3Old getInstance() {
    private MurmurHash3Old() {
    }
 
-   private static final Charset UTF8 = Charset.forName("UTF-8");
-
    static class State {
       long h1;
       long h2;
@@ -391,7 +389,7 @@ public int hash(Object o) {
       else if (o instanceof long[])
          return hash((long[]) o);
       else if (o instanceof String)
-         return hash(((String) o).getBytes(UTF8));
+         return hash(((String) o).getBytes(StandardCharsets.UTF_8));
       else
          return hash(o.hashCode());
    }
@@ -415,7 +413,7 @@ public static class Externalizer extends NoStateExternalizer<MurmurHash3Old> {
       @Override
       @SuppressWarnings("unchecked")
       public Set<Class<? extends MurmurHash3Old>> getTypeClasses() {
-         return Util.<Class<? extends MurmurHash3Old>>asSet(MurmurHash3Old.class);
+         return Util.asSet(MurmurHash3Old.class);
       }
 
       @Override

diff --git a/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java b/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java
@@ -6,7 +6,7 @@
 import static org.infinispan.profiling.testinternals.Generator.getRandomByteArray;
 import static org.infinispan.profiling.testinternals.Generator.getRandomString;
 
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.NumberFormat;
 import java.util.Arrays;
 import java.util.Collection;
@@ -225,8 +225,6 @@ private String padDouble(double d) {
 
 class SuperFastHash implements Hash {
 
-   public static final Charset CHARSET_UTF8 = Charset.forName("UTF-8");
-
    @Override
    public int hash(int hashcode) {
       byte[] b = new byte[4];
@@ -242,7 +240,7 @@ public int hash(Object o) {
       if (o instanceof byte[])
          return hash((byte[]) o);
       else if (o instanceof String)
-         return hash(((String) o).getBytes(CHARSET_UTF8));
+         return hash(((String) o).getBytes(StandardCharsets.UTF_8));
       else
          return hash(o.hashCode());
    }

diff --git a/...ts-interop-it/src/test/java/org/infinispan/it/endpoints/EndpointInteroperabilityTest.java b/...ts-interop-it/src/test/java/org/infinispan/it/endpoints/EndpointInteroperabilityTest.java
@@ -177,7 +177,7 @@ public void testStringKeysAndByteArrayValue() throws Exception {
    public void testIntegerKeysAndByteArrayValue() throws Exception {
       String integerKeyType = "application/x-java-object; type=java.lang.Integer";
       byte[] value = {12};
-      byte[] otherValue = "random".getBytes("UTF-8");
+      byte[] otherValue = "random".getBytes(UTF_8);
 
       // Write <Integer, byte[]> via Hot Rod (the HR client is configured with the default marshaller)
       defaultMarshalledRemoteCache.put(10, value);
@@ -360,7 +360,7 @@ private String getEndpoint(String cache) {
 
    private String asString(Object content) throws Exception {
       if (content instanceof byte[]) {
-         return new String((byte[]) content, "UTF-8");
+         return new String((byte[]) content, UTF_8);
       }
       return content.toString();
    }

diff --git a/persistence/rest/src/main/java/org/infinispan/persistence/rest/RestStore.java b/persistence/rest/src/main/java/org/infinispan/persistence/rest/RestStore.java
@@ -3,6 +3,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
@@ -360,7 +361,7 @@ public Flowable<K> publishKeys(Predicate<? super K> filter) {
             Channel ch = bootstrap.connect(configuration.host(), configuration.port()).awaitUninterruptibly().channel().pipeline().addLast(
                   new HttpObjectAggregator(maxContentLength), handler).channel();
             ch.writeAndFlush(get).sync().channel().closeFuture().sync();
-            BufferedReader reader = new BufferedReader(new InputStreamReader(new ByteBufInputStream((handler.getResponse()).content()), "UTF-8"));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(new ByteBufInputStream((handler.getResponse()).content()), StandardCharsets.UTF_8));
             // Response can't be null now
             return new KeyValuePair<>(handler.getResponse(), reader);
          } catch (Throwable t) {

diff --git a/.../testsuite/src/test/java/org/infinispan/server/test/client/rest/AbstractRESTClientIT.java b/.../testsuite/src/test/java/org/infinispan/server/test/client/rest/AbstractRESTClientIT.java
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import org.apache.http.HttpResponse;
@@ -430,7 +431,7 @@ public void testNonExistentCache() throws Exception {
    @Test
    public void testByteArrayStorage() throws Exception {
       final String KEY_Z = "z";
-      byte[] data = "data".getBytes("UTF-8");
+      byte[] data = "data".getBytes(StandardCharsets.UTF_8);
 
       ByteArrayOutputStream bout = new ByteArrayOutputStream();
       ObjectOutputStream oo = new ObjectOutputStream(bout);