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

interop-testing: Avoid Netty-specific APIs to creating channels 

We prefer to test using the stable APIs, as they are what our users
should be using. Http2Client continues using NettyChannelBuilder because
it is intended to test grpc-netty.
This commit is contained in:
Eric Anderson 2023-08-25 17:10:10 -07:00
parent 372a535615
commit 92463f62bf
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
interop-testing/src/main/java/io/grpc/testing/integration/Http2Client.java
View File

@ -23,18 +23,16 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.MoreExecutors;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import io.grpc.ChannelCredentials;
import io.grpc.InsecureChannelCredentials;
import io.grpc.ManagedChannel; import io.grpc.ManagedChannel;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.StatusRuntimeException; import io.grpc.StatusRuntimeException;
import io.grpc.netty.NegotiationType;
import io.grpc.netty.NettyChannelBuilder; import io.grpc.netty.NettyChannelBuilder;
import io.grpc.stub.StreamObserver; import io.grpc.stub.StreamObserver;
import io.grpc.testing.integration.Messages.Payload; import io.grpc.testing.integration.Messages.Payload;
import io.grpc.testing.integration.Messages.SimpleRequest; import io.grpc.testing.integration.Messages.SimpleRequest;
import io.grpc.testing.integration.Messages.SimpleResponse; import io.grpc.testing.integration.Messages.SimpleResponse;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -353,15 +351,8 @@ public final class Http2Client {
} }
private ManagedChannel createChannel() { private ManagedChannel createChannel() {
InetAddress address; ChannelCredentials creds = InsecureChannelCredentials.create();
try { return NettyChannelBuilder.forAddress(serverHost, serverPort, creds).build();
address = InetAddress.getByName(serverHost);
} catch (UnknownHostException ex) {
throw new RuntimeException(ex);
}
return NettyChannelBuilder.forAddress(new InetSocketAddress(address, serverPort))
.negotiationType(NegotiationType.PLAINTEXT)
.build();
} }
private static String validTestCasesHelpText() { private static String validTestCasesHelpText() {

4
interop-testing/src/main/java/io/grpc/testing/integration/XdsFederationTestClient.java
View File

@ -20,10 +20,10 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import io.grpc.ChannelCredentials; import io.grpc.ChannelCredentials;
import io.grpc.Grpc;
import io.grpc.InsecureChannelCredentials; import io.grpc.InsecureChannelCredentials;
import io.grpc.ManagedChannelBuilder; import io.grpc.ManagedChannelBuilder;
import io.grpc.alts.ComputeEngineChannelCredentials; import io.grpc.alts.ComputeEngineChannelCredentials;
import io.grpc.netty.NettyChannelBuilder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -289,7 +289,7 @@ public final class XdsFederationTestClient {
default: default:
throw new IllegalArgumentException("Unknown custom credentials: " + credentialsType); throw new IllegalArgumentException("Unknown custom credentials: " + credentialsType);
} }
return NettyChannelBuilder.forTarget(serverUri, channelCredentials) return Grpc.newChannelBuilder(serverUri, channelCredentials)
.keepAliveTime(3600, SECONDS) .keepAliveTime(3600, SECONDS)
.keepAliveTimeout(20, SECONDS); .keepAliveTimeout(20, SECONDS);
} }