Change pubsub endpoint from pubsub-experimental to pubsub (#1149)

mziccard · aozarov · commit b25c4623c969 · 2016-08-10T16:37:55.000-07:00
diff --git a/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/PubSubOptions.java b/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/PubSubOptions.java
@@ -31,7 +31,7 @@ public class PubSubOptions extends GrpcServiceOptions<PubSub, PubSubRpc, PubSubO
   private static final long serialVersionUID = 5640180400046623305L;
   private static final String PUBSUB_SCOPE = "https://www.googleapis.com/auth/pubsub";
   private static final Set<String> SCOPES = ImmutableSet.of(PUBSUB_SCOPE);
-  private static final String DEFAULT_HOST = "https://pubsub.googleapis.com";
+  private static final String DEFAULT_HOST = "pubsub.googleapis.com";
 
   public static class DefaultPubSubFactory implements PubSubFactory {
     private static final PubSubFactory INSTANCE = new DefaultPubSubFactory();
diff --git a/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/spi/DefaultPubSubRpc.java b/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/spi/DefaultPubSubRpc.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 
+import com.google.api.gax.core.ConnectionSettings;
 import com.google.api.gax.core.RetrySettings;
 import com.google.api.gax.grpc.ApiCallSettings;
 import com.google.api.gax.grpc.ApiException;
@@ -139,10 +140,20 @@ public DefaultPubSubRpc(PubSubOptions options) throws IOException {
         subBuilder.provideChannelWith(channel, true);
       } else {
         GoogleCredentials credentials = options.authCredentials().credentials();
-        pubBuilder.provideChannelWith(
-            credentials.createScoped(PublisherSettings.DEFAULT_SERVICE_SCOPES));
-        subBuilder.provideChannelWith(
-            credentials.createScoped(SubscriberSettings.DEFAULT_SERVICE_SCOPES));
+        ConnectionSettings pubConnectionSettings = ConnectionSettings.newBuilder()
+            .setServiceAddress(options.host())
+            .setPort(PublisherSettings.DEFAULT_SERVICE_PORT)
+            .provideCredentialsWith(
+                credentials.createScoped(PublisherSettings.DEFAULT_SERVICE_SCOPES))
+            .build();
+        ConnectionSettings subConnectionSettings = ConnectionSettings.newBuilder()
+            .setServiceAddress(options.host())
+            .setPort(SubscriberSettings.DEFAULT_SERVICE_PORT)
+            .provideCredentialsWith(
+                credentials.createScoped(SubscriberSettings.DEFAULT_SERVICE_SCOPES))
+            .build();
+        pubBuilder.provideChannelWith(pubConnectionSettings);
+        subBuilder.provideChannelWith(subConnectionSettings);
       }
       pubBuilder.applyToAllApiMethods(apiCallSettings(options));
       subBuilder.applyToAllApiMethods(apiCallSettings(options));
