From 4a534753dda93a18a2e61b26e88683b1e4ddd027 Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Fri, 7 Apr 2017 15:08:10 +1000 Subject: [PATCH 1/2] remove last use of setPort/setServiceAddress Fixes #1835. --- .../src/main/java/com/google/cloud/GrpcTransportOptions.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java index b84f03e9156d..ac9f4fcd4910 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java +++ b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java @@ -215,8 +215,7 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings) public static ChannelProvider setUpChannelProvider( InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions serviceOptions) { HostAndPort hostAndPort = HostAndPort.fromString(serviceOptions.getHost()); - providerBuilder.setServiceAddress(hostAndPort.getHostText()) - .setPort(hostAndPort.getPort()) + providerBuilder.setEndpoint(hostAndPort.getHostText() + ':' + hostAndPort.getPort()) .setClientLibHeader(ServiceOptions.getGoogApiClientLibName(), firstNonNull(ServiceOptions.getLibraryVersion(), "")); Credentials scopedCredentials = serviceOptions.getScopedCredentials(); From 4fa180754a579757f7a5652669c196a25d266fca Mon Sep 17 00:00:00 2001 From: Michael Darakananda Date: Fri, 7 Apr 2017 15:22:29 +1000 Subject: [PATCH 2/2] pass text directly --- .../src/main/java/com/google/cloud/GrpcTransportOptions.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java index ac9f4fcd4910..f27ace8b01b3 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java +++ b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java @@ -214,8 +214,7 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings) */ public static ChannelProvider setUpChannelProvider( InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions serviceOptions) { - HostAndPort hostAndPort = HostAndPort.fromString(serviceOptions.getHost()); - providerBuilder.setEndpoint(hostAndPort.getHostText() + ':' + hostAndPort.getPort()) + providerBuilder.setEndpoint(serviceOptions.getHost()) .setClientLibHeader(ServiceOptions.getGoogApiClientLibName(), firstNonNull(ServiceOptions.getLibraryVersion(), "")); Credentials scopedCredentials = serviceOptions.getScopedCredentials();