flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "use charset from StandardCharsets instead of 'Charset.forName' (#8779)" 

This reverts commit a74a3ad834.
This commit is contained in:
Penn (Dapeng) Zhang 2022-01-18 08:16:21 -08:00 committed by ZHANG Dapeng
parent d28f718c84
commit 3179bc3be0
15 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/jmh/java/io/grpc/StatusBenchmark.java
View File

@ -16,7 +16,7 @@
package io.grpc; package io.grpc;
import java.nio.charset.StandardCharsets; import java.nio.charset.Charset;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.BenchmarkMode;
@ -57,7 +57,7 @@ public class StatusBenchmark {
@OutputTimeUnit(TimeUnit.NANOSECONDS) @OutputTimeUnit(TimeUnit.NANOSECONDS)
public String messageDecodePlain() { public String messageDecodePlain() {
return Status.MESSAGE_KEY.parseBytes( return Status.MESSAGE_KEY.parseBytes(
"Unexpected RST in stream".getBytes(StandardCharsets.US_ASCII)); "Unexpected RST in stream".getBytes(Charset.forName("US-ASCII")));
} }
/** /**
@ -68,7 +68,7 @@ public class StatusBenchmark {
@OutputTimeUnit(TimeUnit.NANOSECONDS) @OutputTimeUnit(TimeUnit.NANOSECONDS)
public String messageDecodeEscape() { public String messageDecodeEscape() {
return Status.MESSAGE_KEY.parseBytes( return Status.MESSAGE_KEY.parseBytes(
"Some Error%10Wasabi and Horseradish are the same".getBytes(StandardCharsets.US_ASCII)); "Some Error%10Wasabi and Horseradish are the same".getBytes(Charset.forName("US-ASCII")));
} }
/** /**
@ -88,7 +88,7 @@ public class StatusBenchmark {
@BenchmarkMode(Mode.SampleTime) @BenchmarkMode(Mode.SampleTime)
@OutputTimeUnit(TimeUnit.NANOSECONDS) @OutputTimeUnit(TimeUnit.NANOSECONDS)
public Status codeDecode() { public Status codeDecode() {
return Status.CODE_KEY.parseBytes("15".getBytes(StandardCharsets.US_ASCII)); return Status.CODE_KEY.parseBytes("15".getBytes(Charset.forName("US-ASCII")));
} }
} }

4
api/src/main/java/io/grpc/DecompressorRegistry.java
View File

@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import java.nio.charset.StandardCharsets; import java.nio.charset.Charset;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -85,7 +85,7 @@ public final class DecompressorRegistry {
decompressors = Collections.unmodifiableMap(newDecompressors); decompressors = Collections.unmodifiableMap(newDecompressors);
advertisedDecompressors = ACCEPT_ENCODING_JOINER.join(getAdvertisedMessageEncodings()) advertisedDecompressors = ACCEPT_ENCODING_JOINER.join(getAdvertisedMessageEncodings())
.getBytes(StandardCharsets.US_ASCII); .getBytes(Charset.forName("US-ASCII"));
} }
private DecompressorRegistry() { private DecompressorRegistry() {

3
api/src/main/java/io/grpc/InternalMetadata.java
View File

@ -20,7 +20,6 @@ import com.google.common.io.BaseEncoding;
import io.grpc.Metadata.AsciiMarshaller; import io.grpc.Metadata.AsciiMarshaller;
import io.grpc.Metadata.BinaryStreamMarshaller; import io.grpc.Metadata.BinaryStreamMarshaller;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
/** /**
* Internal {@link Metadata} accessor. This is intended for use by io.grpc.internal, and the * Internal {@link Metadata} accessor. This is intended for use by io.grpc.internal, and the
@ -43,7 +42,7 @@ public final class InternalMetadata {
* Copy of StandardCharsets, which is only available on Java 1.7 and above. * Copy of StandardCharsets, which is only available on Java 1.7 and above.
*/ */
@Internal @Internal
public static final Charset US_ASCII = StandardCharsets.US_ASCII; public static final Charset US_ASCII = Charset.forName("US-ASCII");
/** /**
* An instance of base64 encoder that omits padding. * An instance of base64 encoder that omits padding.

4
api/src/test/java/io/grpc/StatusTest.java
View File

@ -21,8 +21,6 @@ import static org.junit.Assert.assertSame;
import io.grpc.Status.Code; import io.grpc.Status.Code;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;
@ -30,7 +28,7 @@ import org.junit.runners.JUnit4;
/** Unit tests for {@link Status}. */ /** Unit tests for {@link Status}. */
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public class StatusTest { public class StatusTest {
private final Charset ascii = StandardCharsets.US_ASCII; private final Charset ascii = Charset.forName("US-ASCII");
@Test @Test
public void verifyExceptionMessage() { public void verifyExceptionMessage() {

4
core/src/main/java/io/grpc/internal/ClientCallImpl.java
View File

@ -53,7 +53,7 @@ import io.perfmark.Link;
import io.perfmark.PerfMark; import io.perfmark.PerfMark;
import io.perfmark.Tag; import io.perfmark.Tag;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.Charset;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@ -71,7 +71,7 @@ final class ClientCallImpl<ReqT, RespT> extends ClientCall<ReqT, RespT> {
private static final Logger log = Logger.getLogger(ClientCallImpl.class.getName()); private static final Logger log = Logger.getLogger(ClientCallImpl.class.getName());
private static final byte[] FULL_STREAM_DECOMPRESSION_ENCODINGS private static final byte[] FULL_STREAM_DECOMPRESSION_ENCODINGS
= "gzip".getBytes(StandardCharsets.US_ASCII); = "gzip".getBytes(Charset.forName("US-ASCII"));
private final MethodDescriptor<ReqT, RespT> method; private final MethodDescriptor<ReqT, RespT> method;
private final Tag tag; private final Tag tag;

3
core/src/main/java/io/grpc/internal/GrpcUtil.java
View File

@ -55,7 +55,6 @@ import java.net.SocketAddress;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@ -76,7 +75,7 @@ public final class GrpcUtil {
private static final Logger log = Logger.getLogger(GrpcUtil.class.getName()); private static final Logger log = Logger.getLogger(GrpcUtil.class.getName());
public static final Charset US_ASCII = StandardCharsets.US_ASCII; public static final Charset US_ASCII = Charset.forName("US-ASCII");
/** /**
* {@link io.grpc.Metadata.Key} for the timeout header. * {@link io.grpc.Metadata.Key} for the timeout header.

10
cronet/src/main/java/io/grpc/cronet/CronetClientStream.java
View File

@ -44,7 +44,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.nio.Buffer; import java.nio.Buffer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets; import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -408,10 +408,10 @@ class CronetClientStream extends AbstractClientStream {
// String and byte array. // String and byte array.
byte[][] serializedHeaders = TransportFrameUtil.toHttp2Headers(headers); byte[][] serializedHeaders = TransportFrameUtil.toHttp2Headers(headers);
for (int i = 0; i < serializedHeaders.length; i += 2) { for (int i = 0; i < serializedHeaders.length; i += 2) {
String key = new String(serializedHeaders[i], StandardCharsets.UTF_8); String key = new String(serializedHeaders[i], Charset.forName("UTF-8"));
// TODO(ericgribkoff): log an error or throw an exception // TODO(ericgribkoff): log an error or throw an exception
if (isApplicationHeader(key)) { if (isApplicationHeader(key)) {
String value = new String(serializedHeaders[i + 1], StandardCharsets.UTF_8); String value = new String(serializedHeaders[i + 1], Charset.forName("UTF-8"));
builder.addHeader(key, value); builder.addHeader(key, value);
} }
} }
@ -588,8 +588,8 @@ class CronetClientStream extends AbstractClientStream {
byte[][] headerValues = new byte[headerList.size()][]; byte[][] headerValues = new byte[headerList.size()][];
for (int i = 0; i < headerList.size(); i += 2) { for (int i = 0; i < headerList.size(); i += 2) {
headerValues[i] = headerList.get(i).getBytes(StandardCharsets.UTF_8); headerValues[i] = headerList.get(i).getBytes(Charset.forName("UTF-8"));
headerValues[i + 1] = headerList.get(i + 1).getBytes(StandardCharsets.UTF_8); headerValues[i + 1] = headerList.get(i + 1).getBytes(Charset.forName("UTF-8"));
} }
Metadata metadata = Metadata metadata =
InternalMetadata.newMetadata(TransportFrameUtil.toRawSerializedHeaders(headerValues)); InternalMetadata.newMetadata(TransportFrameUtil.toRawSerializedHeaders(headerValues));

12
cronet/src/test/java/io/grpc/cronet/CronetClientStreamTest.java
View File

@ -46,7 +46,7 @@ import io.grpc.testing.TestMethodDescriptors;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.nio.Buffer; import java.nio.Buffer;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets; import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -168,7 +168,7 @@ public final class CronetClientStreamTest {
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
requests[i] = new String("request" + String.valueOf(i)); requests[i] = new String("request" + String.valueOf(i));
buffers[i] = allocator.allocate(requests[i].length()); buffers[i] = allocator.allocate(requests[i].length());
buffers[i].write(requests[i].getBytes(StandardCharsets.UTF_8), 0, requests[i].length()); buffers[i].write(requests[i].getBytes(Charset.forName("UTF-8")), 0, requests[i].length());
// The 3rd and 5th writeFrame calls have flush=true. // The 3rd and 5th writeFrame calls have flush=true.
clientStream.abstractClientStreamSink().writeFrame(buffers[i], false, i == 2 || i == 4, 1); clientStream.abstractClientStreamSink().writeFrame(buffers[i], false, i == 2 || i == 4, 1);
} }
@ -261,7 +261,7 @@ public final class CronetClientStreamTest {
callback.onReadCompleted( callback.onReadCompleted(
cronetStream, cronetStream,
info, info,
createMessageFrame(new String("response1").getBytes(StandardCharsets.UTF_8)), createMessageFrame(new String("response1").getBytes(Charset.forName("UTF-8"))),
false); false);
// Haven't request any message, so no callback is called here. // Haven't request any message, so no callback is called here.
verify(clientListener, times(0)).messagesAvailable(isA(MessageProducer.class)); verify(clientListener, times(0)).messagesAvailable(isA(MessageProducer.class));
@ -293,7 +293,7 @@ public final class CronetClientStreamTest {
CronetWritableBufferAllocator allocator = new CronetWritableBufferAllocator(); CronetWritableBufferAllocator allocator = new CronetWritableBufferAllocator();
String request = new String("request"); String request = new String("request");
WritableBuffer writableBuffer = allocator.allocate(request.length()); WritableBuffer writableBuffer = allocator.allocate(request.length());
writableBuffer.write(request.getBytes(StandardCharsets.UTF_8), 0, request.length()); writableBuffer.write(request.getBytes(Charset.forName("UTF-8")), 0, request.length());
clientStream.abstractClientStreamSink().writeFrame(writableBuffer, false, true, 1); clientStream.abstractClientStreamSink().writeFrame(writableBuffer, false, true, 1);
ArgumentCaptor<ByteBuffer> bufferCaptor = ArgumentCaptor.forClass(ByteBuffer.class); ArgumentCaptor<ByteBuffer> bufferCaptor = ArgumentCaptor.forClass(ByteBuffer.class);
verify(cronetStream, times(1)).write(bufferCaptor.capture(), isA(Boolean.class)); verify(cronetStream, times(1)).write(bufferCaptor.capture(), isA(Boolean.class));
@ -312,7 +312,7 @@ public final class CronetClientStreamTest {
callback.onReadCompleted( callback.onReadCompleted(
cronetStream, cronetStream,
info, info,
createMessageFrame(new String("response").getBytes(StandardCharsets.UTF_8)), createMessageFrame(new String("response").getBytes(Charset.forName("UTF-8"))),
false); false);
verify(clientListener, times(1)).messagesAvailable(isA(MessageProducer.class)); verify(clientListener, times(1)).messagesAvailable(isA(MessageProducer.class));
verify(cronetStream, times(2)).read(isA(ByteBuffer.class)); verify(cronetStream, times(2)).read(isA(ByteBuffer.class));
@ -688,7 +688,7 @@ public final class CronetClientStreamTest {
.newBidirectionalStreamBuilder( .newBidirectionalStreamBuilder(
isA(String.class), isA(BidirectionalStream.Callback.class), isA(Executor.class)); isA(String.class), isA(BidirectionalStream.Callback.class), isA(Executor.class));
byte[] msg = "request".getBytes(StandardCharsets.UTF_8); byte[] msg = "request".getBytes(Charset.forName("UTF-8"));
stream.writeMessage(new ByteArrayInputStream(msg)); stream.writeMessage(new ByteArrayInputStream(msg));
// We still haven't built the stream or sent anything. // We still haven't built the stream or sent anything.
verify(cronetStream, times(0)).write(isA(ByteBuffer.class), isA(Boolean.class)); verify(cronetStream, times(0)).write(isA(ByteBuffer.class), isA(Boolean.class));

3
examples/src/main/java/io/grpc/examples/advanced/JsonMarshaller.java
View File

@ -30,7 +30,6 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader; import java.io.Reader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
/** /**
* A {@link Marshaller} for JSON. This marshals in the Protobuf 3 format described here: * A {@link Marshaller} for JSON. This marshals in the Protobuf 3 format described here:
@ -59,7 +58,7 @@ final class JsonMarshaller {
public static <T extends Message> Marshaller<T> jsonMarshaller( public static <T extends Message> Marshaller<T> jsonMarshaller(
final T defaultInstance, final Parser parser, final Printer printer) { final T defaultInstance, final Parser parser, final Printer printer) {
final Charset charset = StandardCharsets.UTF_8; final Charset charset = Charset.forName("UTF-8");
return new Marshaller<T>() { return new Marshaller<T>() {
@Override @Override

4
examples/src/main/java/io/grpc/examples/routeguide/RouteGuideUtil.java
View File

@ -22,7 +22,7 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader; import java.io.Reader;
import java.net.URL; import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.Charset;
import java.util.List; import java.util.List;
/** /**
@ -58,7 +58,7 @@ public class RouteGuideUtil {
public static List<Feature> parseFeatures(URL file) throws IOException { public static List<Feature> parseFeatures(URL file) throws IOException {
InputStream input = file.openStream(); InputStream input = file.openStream();
try { try {
Reader reader = new InputStreamReader(input, StandardCharsets.UTF_8); Reader reader = new InputStreamReader(input, Charset.forName("UTF-8"));
try { try {
FeatureDatabase.Builder database = FeatureDatabase.newBuilder(); FeatureDatabase.Builder database = FeatureDatabase.newBuilder();
JsonFormat.parser().merge(reader, database); JsonFormat.parser().merge(reader, database);

3
interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java
View File

@ -40,7 +40,6 @@ import io.grpc.okhttp.OkHttpChannelBuilder;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -51,7 +50,7 @@ import javax.annotation.Nullable;
*/ */
public class TestServiceClient { public class TestServiceClient {
private static final Charset UTF_8 = StandardCharsets.UTF_8; private static final Charset UTF_8 = Charset.forName("UTF-8");
/** /**
* The main application allowing this client to be launched from the command line. * The main application allowing this client to be launched from the command line.

4
interop-testing/src/test/java/io/grpc/testing/integration/CompressionTest.java
View File

@ -52,7 +52,7 @@ import io.grpc.testing.integration.Messages.SimpleRequest;
import io.grpc.testing.integration.Messages.SimpleResponse; import io.grpc.testing.integration.Messages.SimpleResponse;
import io.grpc.testing.integration.TestServiceGrpc.TestServiceBlockingStub; import io.grpc.testing.integration.TestServiceGrpc.TestServiceBlockingStub;
import io.grpc.testing.integration.TransportCompressionTest.Fzip; import io.grpc.testing.integration.TransportCompressionTest.Fzip;
import java.nio.charset.StandardCharsets; import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@ -312,6 +312,6 @@ public class CompressionTest {
} }
private static void assertEqualsString(String expected, byte[] actual) { private static void assertEqualsString(String expected, byte[] actual) {
assertEquals(expected, new String(actual, StandardCharsets.US_ASCII)); assertEquals(expected, new String(actual, Charset.forName("US-ASCII")));
} }
} }

4
okhttp/src/test/java/io/grpc/okhttp/OkHttpClientStreamTest.java
View File

@ -42,7 +42,7 @@ import io.grpc.okhttp.internal.framed.FrameWriter;
import io.grpc.okhttp.internal.framed.Header; import io.grpc.okhttp.internal.framed.Header;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.Charset;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.junit.Before; import org.junit.Before;
@ -243,7 +243,7 @@ public class OkHttpClientStreamTest {
eq(false), eq(false), eq(3), eq(0), headersCaptor.capture()); eq(false), eq(false), eq(3), eq(0), headersCaptor.capture());
verify(transport, times(0)).streamReadyToStart(isA(OkHttpClientStream.class)); verify(transport, times(0)).streamReadyToStart(isA(OkHttpClientStream.class));
byte[] msg = "request".getBytes(StandardCharsets.UTF_8); byte[] msg = "request".getBytes(Charset.forName("UTF-8"));
stream.writeMessage(new ByteArrayInputStream(msg)); stream.writeMessage(new ByteArrayInputStream(msg));
stream.halfClose(); stream.halfClose();
verify(transport).streamReadyToStart(eq(stream)); verify(transport).streamReadyToStart(eq(stream));

3
okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Util.java vendored
View File

@ -27,7 +27,6 @@ import java.lang.reflect.Array;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
@ -48,7 +47,7 @@ public final class Util {
public static final String[] EMPTY_STRING_ARRAY = new String[0]; public static final String[] EMPTY_STRING_ARRAY = new String[0];
/** A cheap and type-safe constant for the UTF-8 Charset. */ /** A cheap and type-safe constant for the UTF-8 Charset. */
public static final Charset UTF_8 = StandardCharsets.UTF_8; public static final Charset UTF_8 = Charset.forName("UTF-8");
private Util() { private Util() {
} }

3
services/src/test/java/io/grpc/protobuf/services/BinlogHelperTest.java
View File

@ -80,7 +80,6 @@ import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@ -95,7 +94,7 @@ import org.mockito.ArgumentMatchers;
/** Tests for {@link BinlogHelper}. */ /** Tests for {@link BinlogHelper}. */
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
public final class BinlogHelperTest { public final class BinlogHelperTest {
private static final Charset US_ASCII = StandardCharsets.US_ASCII; private static final Charset US_ASCII = Charset.forName("US-ASCII");
private static final BinlogHelper HEADER_FULL = new Builder().header(Integer.MAX_VALUE).build(); private static final BinlogHelper HEADER_FULL = new Builder().header(Integer.MAX_VALUE).build();
private static final BinlogHelper HEADER_256 = new Builder().header(256).build(); private static final BinlogHelper HEADER_256 = new Builder().header(256).build();
private static final BinlogHelper MSG_FULL = new Builder().msg(Integer.MAX_VALUE).build(); private static final BinlogHelper MSG_FULL = new Builder().msg(Integer.MAX_VALUE).build();