Skip to content

Commit 2fe1a13

Browse files
klueverkluever
authored
Migrate from Charsets to StandardCharsets. (#11482)
1 parent 66075ea commit 2fe1a13

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

‎netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package io.grpc.netty;
1818

19-
import static com.google.common.base.Charsets.UTF_8;
2019
import static com.google.common.truth.Truth.assertThat;
2120
import static io.grpc.internal.ClientStreamListener.RpcProgress.MISCARRIED;
2221
import static io.grpc.internal.ClientStreamListener.RpcProgress.PROCESSED;
@@ -30,6 +29,7 @@
3029
import static io.grpc.netty.Utils.TE_HEADER;
3130
import static io.grpc.netty.Utils.TE_TRAILERS;
3231
import static io.netty.handler.codec.http2.Http2CodecUtil.DEFAULT_PRIORITY_WEIGHT;
32+
import static java.nio.charset.StandardCharsets.UTF_8;
3333
import static org.junit.Assert.assertArrayEquals;
3434
import static org.junit.Assert.assertEquals;
3535
import static org.junit.Assert.assertFalse;

‎netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package io.grpc.netty;
1818

19-
import static com.google.common.base.Charsets.UTF_8;
2019
import static com.google.common.truth.Truth.assertThat;
2120
import static com.google.common.truth.TruthJUnit.assume;
2221
import static io.grpc.internal.GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE;
@@ -29,6 +28,7 @@
2928
import static io.grpc.netty.NettyServerBuilder.MAX_CONNECTION_IDLE_NANOS_DISABLED;
3029
import static io.grpc.netty.NettyServerBuilder.MAX_RST_COUNT_DISABLED;
3130
import static io.netty.handler.codec.http2.Http2CodecUtil.DEFAULT_WINDOW_SIZE;
31+
import static java.nio.charset.StandardCharsets.UTF_8;
3232
import static org.junit.Assert.assertEquals;
3333
import static org.junit.Assert.assertFalse;
3434
import static org.junit.Assert.assertNotNull;

‎netty/src/test/java/io/grpc/netty/NettyHandlerTestBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package io.grpc.netty;
1818

19-
import static com.google.common.base.Charsets.UTF_8;
2019
import static io.netty.handler.codec.http2.Http2CodecUtil.DEFAULT_WINDOW_SIZE;
20+
import static java.nio.charset.StandardCharsets.UTF_8;
2121
import static org.junit.Assert.assertEquals;
2222
import static org.mockito.AdditionalAnswers.delegatesTo;
2323
import static org.mockito.ArgumentMatchers.any;

‎netty/src/test/java/io/grpc/netty/NettyReadableBufferTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package io.grpc.netty;
1818

19-
import static com.google.common.base.Charsets.UTF_8;
19+
import static java.nio.charset.StandardCharsets.UTF_8;
2020
import static org.junit.Assert.assertArrayEquals;
2121
import static org.junit.Assert.assertEquals;
2222
import static org.junit.Assert.assertTrue;

‎netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package io.grpc.netty;
1818

19-
import static com.google.common.base.Charsets.UTF_8;
2019
import static io.grpc.internal.GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE;
2120
import static io.grpc.internal.GrpcUtil.DEFAULT_SERVER_KEEPALIVE_TIMEOUT_NANOS;
2221
import static io.grpc.internal.GrpcUtil.DEFAULT_SERVER_KEEPALIVE_TIME_NANOS;
@@ -29,6 +28,7 @@
2928
import static io.grpc.netty.Utils.HTTP_METHOD;
3029
import static io.grpc.netty.Utils.TE_HEADER;
3130
import static io.grpc.netty.Utils.TE_TRAILERS;
31+
import static java.nio.charset.StandardCharsets.UTF_8;
3232
import static org.junit.Assert.assertArrayEquals;
3333
import static org.junit.Assert.assertEquals;
3434
import static org.junit.Assert.assertFalse;

‎netty/src/test/java/io/grpc/netty/NettyStreamTestBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package io.grpc.netty;
1818

19-
import static com.google.common.base.Charsets.US_ASCII;
2019
import static io.grpc.netty.NettyTestUtil.messageFrame;
20+
import static java.nio.charset.StandardCharsets.US_ASCII;
2121
import static org.junit.Assert.assertEquals;
2222
import static org.junit.Assert.assertFalse;
2323
import static org.junit.Assert.assertNull;

‎netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package io.grpc.netty;
1818

19-
import static com.google.common.base.Charsets.UTF_8;
2019
import static com.google.common.base.Preconditions.checkNotNull;
2120
import static com.google.common.base.Preconditions.checkState;
2221
import static com.google.common.truth.Truth.assertThat;
22+
import static java.nio.charset.StandardCharsets.UTF_8;
2323
import static org.junit.Assert.assertEquals;
2424
import static org.junit.Assert.assertFalse;
2525
import static org.junit.Assert.assertNotNull;

0 commit comments

Comments
 (0)