diff --git a/src/main/java/com/threerings/getdown/data/Digest.java b/src/main/java/com/threerings/getdown/data/Digest.java index 9aff446..a98b476 100644 --- a/src/main/java/com/threerings/getdown/data/Digest.java +++ b/src/main/java/com/threerings/getdown/data/Digest.java @@ -19,6 +19,7 @@ import com.threerings.getdown.util.Config; import com.threerings.getdown.util.ProgressObserver; import static com.threerings.getdown.Log.log; +import static java.nio.charset.StandardCharsets.UTF_8; /** * Manages the digest.txt file and the computing and processing of digests for an @@ -111,7 +112,7 @@ public class Digest } // finally compute and append the digest for the file contents MessageDigest md = getMessageDigest(version); - byte[] contents = data.toString().getBytes("UTF-8"); + byte[] contents = data.toString().getBytes(UTF_8); String filename = digestFile(version); pout.println(filename + " = " + StringUtil.hexlate(md.digest(contents))); } @@ -168,7 +169,7 @@ public class Digest // we've reached the end, validate our contents MessageDigest md = getMessageDigest(version); - byte[] contents = data.toString().getBytes("UTF-8"); + byte[] contents = data.toString().getBytes(UTF_8); String hash = StringUtil.hexlate(md.digest(contents)); if (!hash.equals(_metaDigest)) { String err = MessageUtil.tcompose("m.invalid_digest_file", _metaDigest, hash); diff --git a/src/main/java/com/threerings/getdown/tools/Digester.java b/src/main/java/com/threerings/getdown/tools/Digester.java index 9904bd8..e1fa2ab 100644 --- a/src/main/java/com/threerings/getdown/tools/Digester.java +++ b/src/main/java/com/threerings/getdown/tools/Digester.java @@ -23,6 +23,8 @@ import com.threerings.getdown.data.Digest; import com.threerings.getdown.data.Resource; import com.threerings.getdown.util.Base64; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Handles the generation of the digest.txt file. */ @@ -120,7 +122,7 @@ public class Digester // Write out the signature String signed = Base64.encodeToString(sig.sign(), Base64.DEFAULT); - signatureOutput.write(signed.getBytes("utf8")); + signatureOutput.write(signed.getBytes(UTF_8)); } } } diff --git a/src/main/java/com/threerings/getdown/tools/JarDiff.java b/src/main/java/com/threerings/getdown/tools/JarDiff.java index 5b75b70..addb024 100644 --- a/src/main/java/com/threerings/getdown/tools/JarDiff.java +++ b/src/main/java/com/threerings/getdown/tools/JarDiff.java @@ -45,6 +45,8 @@ import java.io.*; import java.util.*; import java.util.jar.*; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * JarDiff is able to create a jar file containing the delta between two jar files (old and new). * The delta jar file can then be applied to the old jar file to reconstruct the new jar file. @@ -229,7 +231,7 @@ public class JarDiff implements JarDiffCodes } jos.putNextEntry(new JarEntry(INDEX_NAME)); - byte[] bytes = writer.toString().getBytes("UTF-8"); + byte[] bytes = writer.toString().getBytes(UTF_8); jos.write(bytes, 0, bytes.length); } diff --git a/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java b/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java index e43b4fc..bcd0bfe 100644 --- a/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java +++ b/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java @@ -27,6 +27,8 @@ import java.util.jar.JarOutputStream; import com.threerings.getdown.util.ProgressObserver; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Applies a jardiff patch to a jar file. */ @@ -178,7 +180,7 @@ public class JarDiffPatcher implements JarDiffCodes } LineNumberReader indexReader = - new LineNumberReader(new InputStreamReader(is, "UTF-8")); + new LineNumberReader(new InputStreamReader(is, UTF_8)); String line = indexReader.readLine(); if (line == null || !line.equals(VERSION_HEADER)) { throw new IOException("jardiff.error.badheader: " + line); diff --git a/src/main/java/com/threerings/getdown/util/Base64.java b/src/main/java/com/threerings/getdown/util/Base64.java index 611d7ec..ee3aa42 100644 --- a/src/main/java/com/threerings/getdown/util/Base64.java +++ b/src/main/java/com/threerings/getdown/util/Base64.java @@ -16,7 +16,7 @@ package com.threerings.getdown.util; -import java.io.UnsupportedEncodingException; +import static java.nio.charset.StandardCharsets.US_ASCII; /** * Utilities for encoding and decoding the Base64 representation of @@ -452,12 +452,7 @@ public class Base64 { * adheres to RFC 2045. */ public static String encodeToString(byte[] input, int flags) { - try { - return new String(encode(input, flags), "US-ASCII"); - } catch (UnsupportedEncodingException e) { - // US-ASCII is guaranteed to be available. - throw new AssertionError(e); - } + return new String(encode(input, flags), US_ASCII); } /** @@ -473,12 +468,7 @@ public class Base64 { * adheres to RFC 2045. */ public static String encodeToString(byte[] input, int offset, int len, int flags) { - try { - return new String(encode(input, offset, len, flags), "US-ASCII"); - } catch (UnsupportedEncodingException e) { - // US-ASCII is guaranteed to be available. - throw new AssertionError(e); - } + return new String(encode(input, offset, len, flags), US_ASCII); } /** diff --git a/src/main/java/com/threerings/getdown/util/ConnectionUtil.java b/src/main/java/com/threerings/getdown/util/ConnectionUtil.java index d2b7a14..2c82a35 100644 --- a/src/main/java/com/threerings/getdown/util/ConnectionUtil.java +++ b/src/main/java/com/threerings/getdown/util/ConnectionUtil.java @@ -10,10 +10,11 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; import java.net.URLDecoder; - import com.threerings.getdown.data.SysProps; import com.threerings.getdown.util.Base64; +import static java.nio.charset.StandardCharsets.UTF_8; + public class ConnectionUtil { /** @@ -49,7 +50,7 @@ public class ConnectionUtil // Remove any percent-encoding in the username/password userInfo = URLDecoder.decode(userInfo, "UTF-8"); // Now base64 encode the auth info and make it a single line - String encoded = Base64.encodeToString(userInfo.getBytes("UTF-8"), Base64.DEFAULT). + String encoded = Base64.encodeToString(userInfo.getBytes(UTF_8), Base64.DEFAULT). replaceAll("\\n","").replaceAll("\\r", ""); conn.setRequestProperty("Authorization", "Basic " + encoded); }