Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

switch from NettyChannelBuilder to ManagedChannelBuilder (#208) #215

Merged
merged 1 commit into from
Mar 8, 2017
Merged

switch from NettyChannelBuilder to ManagedChannelBuilder (#208) #215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/main/java/com/google/api/gax/grpc/InstantiatingChannelProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@
import com.google.common.collect.Lists;
import io.grpc.ClientInterceptor;
import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
import io.grpc.auth.ClientAuthInterceptor;
import io.grpc.netty.NegotiationType;
import io.grpc.netty.NettyChannelBuilder;
import java.io.IOException;
import java.util.List;
import java.util.Properties;
Expand Down Expand Up @@ -116,8 +115,7 @@ private ManagedChannel createChannel(Executor executor) throws IOException {
interceptors.add(new ClientAuthInterceptor(credentialsProvider.getCredentials(), executor));
interceptors.add(new HeaderInterceptor(serviceHeader()));

return NettyChannelBuilder.forAddress(serviceAddress, port)
.negotiationType(NegotiationType.TLS)
return ManagedChannelBuilder.forAddress(serviceAddress, port)
.intercept(interceptors)
.executor(executor)
.build();
Expand Down