Apache Solr open-source search software
SOLR-16275 use standard charset instead of string forName version (#925)
Eric Pughc8bf83079671
diff --git a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.javaindex 8f156ac25da..fe4b1d8291c 100644--- a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java+++ b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java@@ -20,7 +20,7 @@ import java.io.IOException;import java.lang.invoke.MethodHandles;import java.net.URLDecoder;import java.net.URLEncoder;-import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import java.util.Collection;import java.util.HashMap;import java.util.HashSet;@@ -199,11 +199,11 @@ public class StatsUtil {output.append(c);}}- return URLEncoder.encode(output.toString(), Charset.forName("UTF-8"));+ return URLEncoder.encode(output.toString(), StandardCharsets.UTF_8);}public static String decode(String value) throws IOException {- value = URLDecoder.decode(value, Charset.forName("UTF-8"));+ value = URLDecoder.decode(value, StandardCharsets.UTF_8);StringBuilder output = new StringBuilder(value.length());for (int i = 0; i < value.length(); i++) {char c = value.charAt(i);diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.javaindex 5c664d209e8..a144b0108e6 100644--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java@@ -80,7 +80,7 @@ public class SolrRequestParsers {public static final String SIMPLE = "simple";public static final String STANDARD = "standard";- private static final Charset CHARSET_US_ASCII = Charset.forName("US-ASCII");+ private static final Charset CHARSET_US_ASCII = StandardCharsets.US_ASCII;public static final String INPUT_ENCODING_KEY = "ie";private static final byte[] INPUT_ENCODING_BYTES = INPUT_ENCODING_KEY.getBytes(CHARSET_US_ASCII);diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.javaindex 20e2e383833..d2c88ac3832 100644--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java@@ -27,6 +27,7 @@ import java.io.FileNotFoundException;import java.io.IOException;import java.lang.invoke.MethodHandles;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;import java.util.ArrayList;@@ -984,7 +985,7 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {entry+ " should've been either ADD or UPDATE_INPLACE update"+ ", while looking for id="- + new String(id.bytes, Charset.forName("UTF-8")));+ + new String(id.bytes, StandardCharsets.UTF_8));}// if this is an ADD (i.e. full document update), stop hereif ((flags & UpdateLog.ADD) == UpdateLog.ADD) {diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.javaindex 8e37f4c60fe..904e6da69e7 100644--- a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java@@ -17,6 +17,7 @@package org.apache.solr.cloud;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import java.util.NoSuchElementException;import java.util.concurrent.ExecutorService;import java.util.concurrent.Future;@@ -36,7 +37,7 @@ import org.junit.Test;public class DistributedQueueTest extends SolrTestCaseJ4 {- private static final Charset UTF8 = Charset.forName("UTF-8");+ private static final Charset UTF8 = StandardCharsets.UTF_8;protected ZkTestServer zkServer;protected SolrZkClient zkClient;diff --git a/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java b/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.javaindex 3bbade9b1ac..be182cb3fb7 100644--- a/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java@@ -18,6 +18,7 @@ package org.apache.solr.cloud;import java.lang.invoke.MethodHandles;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import java.nio.file.Path;import java.util.ArrayList;import java.util.List;@@ -38,7 +39,7 @@ public class OutOfBoxZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());- private static final Charset DATA_ENCODING = Charset.forName("UTF-8");+ private static final Charset DATA_ENCODING = StandardCharsets.UTF_8;protected ZkTestServer zkServer;diff --git a/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java b/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.javaindex 203a09bb259..143524ff575 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java@@ -44,7 +44,7 @@ public class OverriddenZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());- private static final Charset DATA_ENCODING = Charset.forName("UTF-8");+ private static final Charset DATA_ENCODING = StandardCharsets.UTF_8;protected ZkTestServer zkServer;diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCLIZkUtilsTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrCLIZkUtilsTest.javaindex 07eb7b82d62..0844a14a1b2 100644--- a/solr/core/src/test/org/apache/solr/cloud/SolrCLIZkUtilsTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCLIZkUtilsTest.java@@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream;import java.io.File;import java.io.IOException;import java.io.PrintStream;-import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;import java.nio.file.FileVisitResult;import java.nio.file.Files;@@ -422,7 +421,7 @@ public class SolrCLIZkUtilsTest extends SolrCloudTestCase {assertTrue("Should be an individual file", Files.isRegularFile(locPath));assertTrue("File should have some data", Files.size(locPath) > 100);boolean foundApache = false;- for (String line : Files.readAllLines(locPath, Charset.forName("UTF-8"))) {+ for (String line : Files.readAllLines(locPath, StandardCharsets.UTF_8)) {if (line.contains("Apache Software Foundation")) {foundApache = true;break;@@ -473,7 +472,7 @@ public class SolrCLIZkUtilsTest extends SolrCloudTestCase {Path file = Paths.get(tmp.toAbsolutePath().toString(), "zknode.data");List<String> lines = new ArrayList<>();lines.add("{Some Arbitrary Data}");- Files.write(file, lines, Charset.forName("UTF-8"));+ Files.write(file, lines, StandardCharsets.UTF_8);// First, just copy the data up the cp7 since it's a directory.args =new String[] {diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.javaindex 8cb40dcfb17..c8611f898cc 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java@@ -32,7 +32,6 @@ import java.io.OutputStream;import java.lang.invoke.MethodHandles;import java.net.URI;import java.nio.ByteBuffer;-import java.nio.charset.Charset;import java.nio.file.Files;import java.nio.file.Path;import java.security.Principal;@@ -543,7 +542,7 @@ public class TestConfigSetsAPI extends SolrCloudTestCase {+ " },\n"+ " }";- ByteBuffer buff = Charset.forName("UTF-8").encode(payload);+ ByteBuffer buff = UTF_8.encode(payload);Map<?, ?> map =postDataAndGetResponse(cluster.getSolrClient(),diff --git a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.javaindex 7910da2f5bd..d9237a47c29 100644--- a/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java+++ b/solr/core/src/test/org/apache/solr/core/BlobRepositoryMockingTest.java@@ -35,6 +35,7 @@ import java.io.InputStreamReader;import java.io.StringWriter;import java.nio.ByteBuffer;import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import java.util.Objects;import java.util.concurrent.ConcurrentHashMap;import org.apache.solr.SolrTestCaseJ4;@@ -45,7 +46,7 @@ import org.junit.Test;public class BlobRepositoryMockingTest {- private static final Charset UTF8 = Charset.forName("UTF-8");+ private static final Charset UTF8 = StandardCharsets.UTF_8;private static final String[][] PARSED =new String[][] {{"foo", "bar", "baz"}, {"bang", "boom", "bash"}};private static final String BLOBSTR = "foo,bar,baz\nbang,boom,bash";diff --git a/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java b/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.javaindex 892c4fe0fd3..e653b1f6de3 100644--- a/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java+++ b/solr/core/src/test/org/apache/solr/handler/component/ResourceSharingTestComponent.java@@ -23,7 +23,7 @@ import java.io.BufferedReader;import java.io.InputStream;import java.io.InputStreamReader;import java.lang.invoke.MethodHandles;-import java.nio.charset.Charset;+import java.nio.charset.StandardCharsets;import java.util.HashMap;import java.util.Map;import java.util.stream.Stream;@@ -108,8 +108,7 @@ public class ResourceSharingTestComponent extends SearchComponent implements Sol// baz,bamtry (Stream<String> lines =- new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")))- .lines()) {+ new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines()) {lines.forEach(this::processSimpleCsvRow);} catch (Exception e) {log.error("failed to read dictionary {}", getResourceName());diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.javaindex f5aea418af7..6162a6885e7 100644--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java@@ -23,7 +23,6 @@ import static org.apache.solr.security.BasicAuthIntegrationTest.verifySecurityStimport java.io.IOException;import java.lang.invoke.MethodHandles;-import java.nio.charset.Charset;import java.nio.file.Files;import java.nio.file.Path;import java.nio.file.Paths;@@ -119,9 +118,7 @@ public class BasicAuthStandaloneTest extends SolrTestCaseJ4 {// Read file from SOLR_HOME and verify that it contains our new userassertTrue(- new String(- Utils.toJSON(securityConfHandler.getSecurityConfig(false).getData()),- Charset.forName("UTF-8"))+ new String(Utils.toJSON(securityConfHandler.getSecurityConfig(false).getData()), UTF_8).contains("harry"));// Edit authorizationdiff --git a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.javaindex d4624a52db4..7de4d18b501 100644--- a/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java+++ b/solr/modules/hadoop-auth/src/test/org/apache/solr/security/hadoop/HttpParamDelegationTokenPlugin.java@@ -17,7 +17,6 @@package org.apache.solr.security.hadoop;import java.io.IOException;-import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;import java.security.Principal;import java.util.Enumeration;@@ -178,7 +177,7 @@ public class HttpParamDelegationTokenPlugin extends KerberosPlugin {private static String getHttpParam(HttpServletRequest request, String param) {List<NameValuePair> pairs =- URLEncodedUtils.parse(request.getQueryString(), Charset.forName("UTF-8"));+ URLEncodedUtils.parse(request.getQueryString(), StandardCharsets.UTF_8);for (NameValuePair nvp : pairs) {if (param.equals(nvp.getName())) {return nvp.getValue();@@ -276,7 +275,7 @@ public class HttpParamDelegationTokenPlugin extends KerberosPlugin {// forwarded.List<NameValuePair> newPairs = new LinkedList<NameValuePair>();List<NameValuePair> pairs =- URLEncodedUtils.parse(request.getQueryString(), Charset.forName("UTF-8"));+ URLEncodedUtils.parse(request.getQueryString(), StandardCharsets.UTF_8);for (NameValuePair nvp : pairs) {if (!USER_PARAM.equals(nvp.getName())) {newPairs.add(nvp);diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex 669846579f3..e8ea27bec20 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -48,7 +48,6 @@ import java.lang.reflect.InvocationTargetException;import java.lang.reflect.Method;import java.net.MalformedURLException;import java.net.URL;-import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;@@ -220,7 +219,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {try (Writer writer =new OutputStreamWriter(Files.newOutputStream(coreDirectory.resolve(CORE_PROPERTIES_FILENAME)),- Charset.forName("UTF-8"))) {+ StandardCharsets.UTF_8)) {properties.store(writer, testname);}}