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

xds: update deprecated charset import (#6502)

This commit is contained in:
Eric Gribkoff 2019-12-09 16:23:27 -08:00 committed by GitHub
parent 2de5b4e254
commit e66ab4e63b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xds/src/main/java/io/grpc/xds/sds/FileBasedPluginCredential.java
View File

@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import com.google.protobuf.Struct;
import com.google.protobuf.Value;
@ -31,9 +30,9 @@ import io.envoyproxy.envoy.api.v2.core.GrpcService.GoogleGrpc.CallCredentials.Me
import io.grpc.CallCredentials;
import io.grpc.Metadata;
import io.grpc.Status;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.Executor;
import javax.annotation.Nullable;
@ -99,13 +98,14 @@ final class FileBasedPluginCredential extends CallCredentials {
Metadata headers = new Metadata();
String headerValue =
headerPrefix
+ Files.asCharSource(new File(secretData.getFilename()), Charsets.UTF_8)
+ Files.asCharSource(
new File(secretData.getFilename()), StandardCharsets.UTF_8)
.read();
if (headerKey.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
Metadata.Key<byte[]> metadataHeaderKey =
Metadata.Key.of(headerKey, Metadata.BINARY_BYTE_MARSHALLER);
headers.put(metadataHeaderKey, headerValue.getBytes(Charsets.UTF_8));
headers.put(metadataHeaderKey, headerValue.getBytes(StandardCharsets.UTF_8));
} else {
Metadata.Key<String> metadataHeaderKey =
Metadata.Key.of(headerKey, Metadata.ASCII_STRING_MARSHALLER);

4
xds/src/test/java/io/grpc/xds/sds/SdsClientFileBasedMetadataTest.java
View File

@ -21,7 +21,6 @@ import static org.junit.Assert.fail;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.protobuf.Struct;
@ -39,6 +38,7 @@ import io.envoyproxy.envoy.api.v2.core.Node;
import io.grpc.Metadata;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@ -136,7 +136,7 @@ public class SdsClientFileBasedMetadataTest {
server.startServer("inproc", /* useUds= */ false, /* useInterceptor= */ true);
tempTokenFile = tempFolder.newFile(TOKEN_FILE_NAME);
Files.write("test-token-content".getBytes(Charsets.UTF_8), tempTokenFile);
Files.write("test-token-content".getBytes(StandardCharsets.UTF_8), tempTokenFile);
ConfigSource configSource =
buildConfigSourceWithCreds(

4
xds/src/test/java/io/grpc/xds/sds/SdsClientUdsFileBasedMetadataTest.java
View File

@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
import com.google.common.util.concurrent.MoreExecutors;
import io.envoyproxy.envoy.api.v2.auth.SdsSecretConfig;
@ -29,6 +28,7 @@ import io.envoyproxy.envoy.api.v2.core.Node;
import io.netty.channel.epoll.Epoll;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import org.junit.Assume;
@ -62,7 +62,7 @@ public class SdsClientUdsFileBasedMetadataTest {
server.startServer(SDSCLIENT_TEST_SOCKET, /* useUds= */ true, /* useInterceptor= */ true);
tempTokenFile = tempFolder.newFile(TOKEN_FILE_NAME);
Files.write("test-token-content".getBytes(Charsets.UTF_8), tempTokenFile);
Files.write("test-token-content".getBytes(StandardCharsets.UTF_8), tempTokenFile);
ConfigSource configSource =
SdsClientFileBasedMetadataTest.buildConfigSourceWithCreds(

4
xds/src/test/java/io/grpc/xds/sds/TestSdsServer.java
View File

@ -19,7 +19,6 @@ package io.grpc.xds.sds;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Charsets;
import com.google.common.base.Strings;
import com.google.protobuf.Any;
import com.google.protobuf.ByteString;
@ -45,6 +44,7 @@ import io.netty.channel.epoll.EpollEventLoopGroup;
import io.netty.channel.epoll.EpollServerDomainSocketChannel;
import io.netty.channel.unix.DomainSocketAddress;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
@ -314,7 +314,7 @@ final class TestSdsServer {
byte[] value =
requestHeaders.get(SdsClientFileBasedMetadataTest.K8S_SA_JWT_TOKEN_HEADER_METADATA_KEY);
if (value != null) {
lastK8sJwtTokenValue = new String(value, Charsets.UTF_8);
lastK8sJwtTokenValue = new String(value, StandardCharsets.UTF_8);
}
return next.startCall(new SimpleForwardingServerCall<ReqT, RespT>(call) {}, requestHeaders);
}