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

Migrate from the deprecated `Charsets` constants (in Guava) to the `StandardCharsets` constants (in the JDK) 

cl/658539667
This commit is contained in:
Kurt Alfred Kluever 2024-08-05 12:49:03 -07:00 committed by Eric Anderson
parent 9bed655c56
commit 06135a0745
25 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/io/grpc/Metadata.java
View File

@ -16,9 +16,9 @@
package io.grpc; package io.grpc;
import static com.google.common.base.Charsets.US_ASCII;
import static com.google.common.base.Preconditions.checkArgument; 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 static java.nio.charset.StandardCharsets.US_ASCII;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;

5
api/src/main/java/io/grpc/Status.java
View File

@ -16,10 +16,10 @@
package io.grpc; package io.grpc;
import static com.google.common.base.Charsets.US_ASCII;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.getStackTraceAsString; import static com.google.common.base.Throwables.getStackTraceAsString;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.base.Objects; import com.google.common.base.Objects;
@ -34,7 +34,6 @@ import javax.annotation.CheckReturnValue;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.annotation.concurrent.Immutable; import javax.annotation.concurrent.Immutable;
/** /**
* Defines the status of an operation by providing a standard {@link Code} in conjunction with an * Defines the status of an operation by providing a standard {@link Code} in conjunction with an
* optional descriptive message. Instances of {@code Status} are created by starting with the * optional descriptive message. Instances of {@code Status} are created by starting with the

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

@ -16,8 +16,8 @@
package io.grpc; package io.grpc;
import static com.google.common.base.Charsets.US_ASCII; import static java.nio.charset.StandardCharsets.US_ASCII;
import static com.google.common.base.Charsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

2
api/src/testFixtures/java/io/grpc/StringMarshaller.java
View File

@ -16,7 +16,7 @@
package io.grpc; package io.grpc;
import static com.google.common.base.Charsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;

2
auth/src/test/java/io/grpc/auth/GoogleAuthLibraryCallCredentialsTest.java
View File

@ -16,7 +16,7 @@
package io.grpc.auth; package io.grpc.auth;
import static com.google.common.base.Charsets.US_ASCII; import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;

2
core/src/main/java/io/grpc/internal/ReadableBuffers.java
View File

@ -16,7 +16,7 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import io.grpc.Detachable; import io.grpc.Detachable;

2
core/src/main/java/io/grpc/internal/TransportFrameUtil.java
View File

@ -16,7 +16,7 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.US_ASCII; import static java.nio.charset.StandardCharsets.US_ASCII;
import com.google.common.io.BaseEncoding; import com.google.common.io.BaseEncoding;
import io.grpc.InternalMetadata; import io.grpc.InternalMetadata;

2
core/src/test/java/io/grpc/internal/CompositeReadableBufferTest.java
View File

@ -16,7 +16,7 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

2
core/src/test/java/io/grpc/internal/Http2ClientStreamTransportStateTest.java
View File

@ -16,9 +16,9 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.US_ASCII;
import static io.grpc.internal.ClientStreamListener.RpcProgress.PROCESSED; import static io.grpc.internal.ClientStreamListener.RpcProgress.PROCESSED;
import static io.grpc.internal.GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE; import static io.grpc.internal.GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;

2
core/src/test/java/io/grpc/internal/ReadableBuffersArrayTest.java
View File

@ -16,8 +16,8 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.UTF_8;
import static io.grpc.internal.ReadableBuffers.wrap; import static io.grpc.internal.ReadableBuffers.wrap;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame; import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;

2
core/src/test/java/io/grpc/internal/ReadableBuffersByteBufferTest.java
View File

@ -16,7 +16,7 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

2
core/src/test/java/io/grpc/internal/ReadableBuffersTest.java
View File

@ -16,7 +16,7 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertThrows;

2
core/src/test/java/io/grpc/internal/ServerCallImplTest.java
View File

@ -16,8 +16,8 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.UTF_8;
import static io.grpc.internal.GrpcUtil.CONTENT_LENGTH_KEY; import static io.grpc.internal.GrpcUtil.CONTENT_LENGTH_KEY;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

4
core/src/test/java/io/grpc/internal/TransportFrameUtilTest.java
View File

@ -16,10 +16,10 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.US_ASCII;
import static com.google.common.base.Charsets.UTF_8;
import static io.grpc.Metadata.ASCII_STRING_MARSHALLER; import static io.grpc.Metadata.ASCII_STRING_MARSHALLER;
import static io.grpc.Metadata.BINARY_BYTE_MARSHALLER; import static io.grpc.Metadata.BINARY_BYTE_MARSHALLER;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;

2
core/src/testFixtures/java/io/grpc/internal/AbstractTransportTest.java
View File

@ -16,8 +16,8 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;

2
core/src/testFixtures/java/io/grpc/internal/ReadableBufferTestBase.java
View File

@ -16,7 +16,7 @@
package io.grpc.internal; package io.grpc.internal;
import static com.google.common.base.Charsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

2
interop-testing/src/main/java/io/grpc/testing/integration/GrpclbFallbackTestClient.java
View File

@ -16,7 +16,7 @@
package io.grpc.testing.integration; package io.grpc.testing.integration;
import static com.google.common.base.Charsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import com.google.common.io.CharStreams; import com.google.common.io.CharStreams;

2
netty/src/main/java/io/grpc/netty/GrpcHttp2HeadersUtils.java
View File

@ -31,12 +31,12 @@
package io.grpc.netty; package io.grpc.netty;
import static com.google.common.base.Charsets.US_ASCII;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkArgument;
import static io.grpc.netty.Utils.TE_HEADER; import static io.grpc.netty.Utils.TE_HEADER;
import static io.netty.handler.codec.http2.Http2Error.PROTOCOL_ERROR; import static io.netty.handler.codec.http2.Http2Error.PROTOCOL_ERROR;
import static io.netty.handler.codec.http2.Http2Exception.connectionError; import static io.netty.handler.codec.http2.Http2Exception.connectionError;
import static io.netty.util.AsciiString.isUpperCase; import static io.netty.util.AsciiString.isUpperCase;
import static java.nio.charset.StandardCharsets.US_ASCII;
import com.google.common.io.BaseEncoding; import com.google.common.io.BaseEncoding;
import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.CanIgnoreReturnValue;

2
okhttp/src/test/java/io/grpc/okhttp/ExceptionHandlingFrameWriterTest.java
View File

@ -16,9 +16,9 @@
package io.grpc.okhttp; package io.grpc.okhttp;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static io.grpc.okhttp.ExceptionHandlingFrameWriter.getLogLevel; import static io.grpc.okhttp.ExceptionHandlingFrameWriter.getLogLevel;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;

2
okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java
View File

@ -16,7 +16,6 @@
package io.grpc.okhttp; package io.grpc.okhttp;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static io.grpc.internal.ClientStreamListener.RpcProgress.MISCARRIED; import static io.grpc.internal.ClientStreamListener.RpcProgress.MISCARRIED;
import static io.grpc.internal.ClientStreamListener.RpcProgress.PROCESSED; import static io.grpc.internal.ClientStreamListener.RpcProgress.PROCESSED;
@ -25,6 +24,7 @@ import static io.grpc.okhttp.Headers.CONTENT_TYPE_HEADER;
import static io.grpc.okhttp.Headers.HTTP_SCHEME_HEADER; import static io.grpc.okhttp.Headers.HTTP_SCHEME_HEADER;
import static io.grpc.okhttp.Headers.METHOD_HEADER; import static io.grpc.okhttp.Headers.METHOD_HEADER;
import static io.grpc.okhttp.Headers.TE_HEADER; import static io.grpc.okhttp.Headers.TE_HEADER;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

2
okhttp/src/test/java/io/grpc/okhttp/OkHttpProtocolNegotiatorTest.java
View File

@ -16,7 +16,7 @@
package io.grpc.okhttp; package io.grpc.okhttp;
import static com.google.common.base.Charsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

2
okhttp/src/test/java/io/grpc/okhttp/OkHttpServerTransportTest.java
View File

@ -16,12 +16,12 @@
package io.grpc.okhttp; package io.grpc.okhttp;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static io.grpc.okhttp.Headers.CONTENT_TYPE_HEADER; import static io.grpc.okhttp.Headers.CONTENT_TYPE_HEADER;
import static io.grpc.okhttp.Headers.HTTP_SCHEME_HEADER; import static io.grpc.okhttp.Headers.HTTP_SCHEME_HEADER;
import static io.grpc.okhttp.Headers.METHOD_HEADER; import static io.grpc.okhttp.Headers.METHOD_HEADER;
import static io.grpc.okhttp.Headers.TE_HEADER; import static io.grpc.okhttp.Headers.TE_HEADER;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.mockito.AdditionalAnswers.answerVoid; import static org.mockito.AdditionalAnswers.answerVoid;
import static org.mockito.AdditionalAnswers.delegatesTo; import static org.mockito.AdditionalAnswers.delegatesTo;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;

2
services/src/test/java/io/grpc/protobuf/services/BinaryLogProviderTest.java
View File

@ -16,8 +16,8 @@
package io.grpc.protobuf.services; package io.grpc.protobuf.services;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame; import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;

2
testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java
View File

@ -16,8 +16,8 @@
package io.grpc.internal.testing; package io.grpc.internal.testing;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;

2
xds/src/test/java/io/grpc/xds/internal/rbac/engine/GrpcAuthorizationEngineTest.java
View File

@ -16,8 +16,8 @@
package io.grpc.xds.internal.rbac.engine; package io.grpc.xds.internal.rbac.engine;
import static com.google.common.base.Charsets.US_ASCII;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;