---

garrettjonesgoogle · garrettjonesgoogle · commit 4b64ecceb449 · 2016-03-15T21:04:06.000-07:00
yaml --- r: 2293 b: refs/heads/pubsub-alpha c: 5245e7d h: refs/heads/master i: 2291: 6ede890
diff --git a/[refs] b/[refs]
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
-refs/heads/pubsub-alpha: a4609cae9670f81e2ff4b9865835446f893c4e8e
+refs/heads/pubsub-alpha: 5245e7d059ea4073d928562c9ce4afa26cb228b6
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
 refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/branches/pubsub-alpha/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/PublisherApi.java b/branches/pubsub-alpha/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/PublisherApi.java
@@ -182,7 +182,7 @@ public static final String parseTopicFromTopicPath(String topicPath) {
    * <!-- end manual edit -->
    */
   public static PublisherApi create() throws IOException {
-    return create(newSettings());
+    return create(PublisherSettings.create());
   }
 
   /**
diff --git a/branches/pubsub-alpha/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/SubscriberApi.java b/branches/pubsub-alpha/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/SubscriberApi.java
@@ -185,7 +185,7 @@ public static final String parseSubscriptionFromSubscriptionPath(String subscrip
    * <!-- end manual edit -->
    */
   public static SubscriberApi create() throws IOException {
-    return create(newSettings());
+    return create(SubscriberSettings.create());
   }
 
   /**
diff --git a/branches/pubsub-alpha/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/PublisherApi.java b/branches/pubsub-alpha/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/PublisherApi.java
@@ -182,7 +182,7 @@ public static final String parseTopicFromTopicPath(String topicPath) {
    * <!-- end manual edit -->
    */
   public static PublisherApi create() throws IOException {
-    return create(newSettings());
+    return create(PublisherSettings.create());
   }
 
   /**
diff --git a/branches/pubsub-alpha/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/SubscriberApi.java b/branches/pubsub-alpha/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/SubscriberApi.java
@@ -185,7 +185,7 @@ public static final String parseSubscriptionFromSubscriptionPath(String subscrip
    * <!-- end manual edit -->
    */
   public static SubscriberApi create() throws IOException {
-    return create(newSettings());
+    return create(SubscriberSettings.create());
   }
 
   /**
diff --git a/branches/pubsub-alpha/gcloud-java-pubsub/src/test/java/com/google/gcloud/pubsub/spi/PublisherApiTest.java b/branches/pubsub-alpha/gcloud-java-pubsub/src/test/java/com/google/gcloud/pubsub/spi/PublisherApiTest.java
@@ -75,12 +75,12 @@ public void setUp() throws Exception {
             .setTotalTimeout(30000L)
             .build();
 
-    PublisherSettings publisherSettings = PublisherApi.newSettings();
+    PublisherSettings publisherSettings = PublisherSettings.create();
     publisherSettings.setRetryParamsOnAllMethods(retryParams);
     publisherSettings.provideChannelWith(channel);
     publisherApi = PublisherApi.create(publisherSettings);
 
-    SubscriberSettings subscriberSettings = SubscriberApi.newSettings();
+    SubscriberSettings subscriberSettings = SubscriberSettings.create();
     subscriberSettings.setRetryParamsOnAllMethods(retryParams);
     subscriberSettings.provideChannelWith(channel);
     subscriberApi = SubscriberApi.create(subscriberSettings);

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public static final String parseTopicFromTopicPath(String topicPath) {`
`182`	`182`	`* <!-- end manual edit -->`
`183`	`183`	`*/`
`184`	`184`	`public static PublisherApi create() throws IOException {`
`185`		`- return create(newSettings());`
	`185`	`+ return create(PublisherSettings.create());`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public static final String parseSubscriptionFromSubscriptionPath(String subscrip`
`185`	`185`	`* <!-- end manual edit -->`
`186`	`186`	`*/`
`187`	`187`	`public static SubscriberApi create() throws IOException {`
`188`		`- return create(newSettings());`
	`188`	`+ return create(SubscriberSettings.create());`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`/**`