This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_3_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e4ffcf687753e1793f13ea581bfeceaf0f2fa829 Author: Daniel Sun <[email protected]> AuthorDate: Sat Apr 11 23:03:37 2020 +0800 Trivial refactoring: Standard Charset object can be used (cherry picked from commit 1d6fe880bbadda5e541ec1a312df4f656a3e4063) --- .../java/org/apache/groovy/json/internal/BaseJsonParser.java | 3 ++- .../src/main/java/org/apache/groovy/json/internal/CharBuf.java | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java index eab7894..5bc4d62 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java @@ -30,6 +30,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.concurrent.ConcurrentHashMap; /** @@ -70,7 +71,7 @@ public abstract class BaseJsonParser implements JsonParser { protected static final boolean internKeys = Boolean.parseBoolean(System.getProperty("groovy.json.internKeys", "false")); protected static final ConcurrentHashMap<String, String> internedKeysCache; - private static final Charset UTF_8 = Charset.forName("UTF-8"); + private static final Charset UTF_8 = StandardCharsets.UTF_8; protected String charset = UTF_8.name(); diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java index 57f3583..8c0c09c 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java @@ -21,10 +21,10 @@ package org.apache.groovy.json.internal; import groovy.json.JsonException; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.io.Writer; import java.math.BigDecimal; import java.math.BigInteger; +import java.nio.charset.StandardCharsets; public class CharBuf extends Writer implements CharSequence { @@ -44,12 +44,8 @@ public class CharBuf extends Writer implements CharSequence { public CharBuf(byte[] bytes) { this.buffer = null; - try { - String str = new String(bytes, "UTF-8"); - __init__(FastStringUtils.toCharArray(str)); - } catch (UnsupportedEncodingException e) { - Exceptions.handle(e); - } + String str = new String(bytes, StandardCharsets.UTF_8); + __init__(FastStringUtils.toCharArray(str)); } public static CharBuf createExact(final int capacity) {
