diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java index ad79647d787e..c632cf3ddfe2 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java @@ -315,7 +315,7 @@ private static class PublishMessagesAction extends PubSubAction> params) throws Exception { String topic = params.x(); TopicName topicName = TopicName.create(projectId, topic); - Publisher publisher = Publisher.newBuilder(topicName).build(); + Publisher publisher = Publisher.defaultBuilder(topicName).build(); List messages = params.y(); for (PubsubMessage message : messages) { ApiFuture messageIdFuture = publisher.publish(message); @@ -526,7 +526,7 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { SubscriptionName subscriptionName = params.x(); Subscriber subscriber = null; try { - subscriber = Subscriber.newBuilder(subscriptionName, receiver).build(); + subscriber = Subscriber.defaultBuilder(subscriptionName, receiver).build(); subscriber.addListener( new Subscriber.Listener() { @Override diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java index 563f270ec6dc..4f02b70db53e 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java @@ -51,7 +51,7 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { }; Subscriber subscriber = null; try { - subscriber = Subscriber.newBuilder(subscription, receiver).build(); + subscriber = Subscriber.defaultBuilder(subscription, receiver).build(); subscriber.addListener( new Subscriber.Listener() { @Override diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java index c22428be8931..8021bf736c8b 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java @@ -39,7 +39,7 @@ public static void main(String... args) throws Exception { Publisher publisher = null; try { - publisher = Publisher.newBuilder(topic).build(); + publisher = Publisher.defaultBuilder(topic).build(); List messages = Arrays.asList("first message", "second message"); List> messageIds = new ArrayList<>(); for (String message : messages) { diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java index 6f431d6277f1..39465d573149 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java @@ -65,7 +65,7 @@ public void onFailure(Throwable t) { public static void newBuilder(String projectName, String topicName) throws Exception { // [START newBuilder] TopicName topic = TopicName.create(projectName, topicName); - Publisher publisher = Publisher.newBuilder(topic).build(); + Publisher publisher = Publisher.defaultBuilder(topic).build(); try { // ... } finally { diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java index c65f416df3d1..e5c0d840399d 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java @@ -53,7 +53,7 @@ public SubscriberSnippets( // [TARGET startAsync()] public void startAndWait() throws Exception { // [START startAsync] - Subscriber subscriber = Subscriber.newBuilder(subscription, receiver).build(); + Subscriber subscriber = Subscriber.defaultBuilder(subscription, receiver).build(); subscriber.addListener(new Subscriber.Listener() { public void failed(Subscriber.State from, Throwable failure) { // Handle error. diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java index eeded46f5e04..fc329f660585 100644 --- a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java +++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java @@ -75,7 +75,7 @@ private void testPublisherSubscriberHelper(TopicName topicName, SubscriptionName Publisher publisher = null; try { - publisher = Publisher.newBuilder(topicName).build(); + publisher = Publisher.defaultBuilder(topicName).build(); PublisherSnippets snippets = new PublisherSnippets(publisher); final SettableApiFuture done = SettableApiFuture.create(); ApiFutures.addCallback( diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java index e128b007d5dd..015c50052c66 100644 --- a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java +++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java @@ -170,7 +170,7 @@ private void createTopic(String name) throws Exception { private Set publishMessages(String topicName, int numMessages) throws Exception { Set messages = new HashSet<>(); - Publisher publisher = Publisher.newBuilder(TopicName.create(projectId, topicName)).build(); + Publisher publisher = Publisher.defaultBuilder(TopicName.create(projectId, topicName)).build(); for (int i = 1; i<= numMessages; i++) { String message = formatForTest("message-" + i); PubsubMessage pubsubMessage = PubsubMessage.newBuilder().setData( diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java index 73c17106fffe..96f7a5ae5ad9 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java @@ -509,7 +509,7 @@ interface LongRandom { * String projectName = "my_project"; * String topicName = "my_topic"; * TopicName topic = TopicName.create(projectName, topicName); - * Publisher publisher = Publisher.newBuilder(topic).build(); + * Publisher publisher = Publisher.defaultBuilder(topic).build(); * try { * // ... * } finally { @@ -519,7 +519,7 @@ interface LongRandom { * } * */ - public static Builder newBuilder(TopicName topicName) { + public static Builder defaultBuilder(TopicName topicName) { return new Builder(topicName); } diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java index 2ffad91dd734..b6c311730d82 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java @@ -165,7 +165,7 @@ public void close() throws IOException { * @param receiver an implementation of {@link MessageReceiver} used to process the received * messages */ - public static Builder newBuilder(SubscriptionName subscription, MessageReceiver receiver) { + public static Builder defaultBuilder(SubscriptionName subscription, MessageReceiver receiver) { return new Builder(subscription, receiver); } @@ -189,7 +189,7 @@ public FlowControlSettings getFlowControlSettings() { * *

Example of receiving a specific number of messages. *

 {@code
-   * Subscriber subscriber = Subscriber.newBuilder(subscription, receiver).build();
+   * Subscriber subscriber = Subscriber.defaultBuilder(subscription, receiver).build();
    * subscriber.addListener(new Subscriber.Listener() {
    *   public void failed(Subscriber.State from, Throwable failure) {
    *     // Handle error.
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java
index b1f657bedbd7..eba7a6eedc48 100644
--- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java
+++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java
@@ -109,7 +109,7 @@ public void testPublishSubscribe() throws Exception {
 
     final SettableApiFuture received = SettableApiFuture.create();
     Subscriber subscriber =
-        Subscriber.newBuilder(
+        Subscriber.defaultBuilder(
                 subscriptionName,
                 new MessageReceiver() {
                   @Override
@@ -132,7 +132,7 @@ public void failed(Subscriber.State from, Throwable failure) {
         MoreExecutors.directExecutor());
     subscriber.startAsync();
 
-    Publisher publisher = Publisher.newBuilder(topicName).build();
+    Publisher publisher = Publisher.defaultBuilder(topicName).build();
     publisher.publish(message).get();
     publisher.shutdown();
 
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java
index 0bfa930887bd..67bc90fa5229 100644
--- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java
+++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java
@@ -347,7 +347,7 @@ public void testPublishFailureRetries_nonRetryableFailsImmediately() throws Exce
 
   @Test
   public void testPublisherGetters() throws Exception {
-    Publisher.Builder builder = Publisher.newBuilder(TEST_TOPIC);
+    Publisher.Builder builder = Publisher.defaultBuilder(TEST_TOPIC);
     builder.setChannelProvider(TEST_CHANNEL_PROVIDER);
     builder.setExecutorProvider(SINGLE_THREAD_EXECUTOR);
     builder.setBatchingSettings(
@@ -378,7 +378,7 @@ public void testPublisherGetters() throws Exception {
 
   @Test
   public void testBuilderParametersAndDefaults() {
-    Publisher.Builder builder = Publisher.newBuilder(TEST_TOPIC);
+    Publisher.Builder builder = Publisher.defaultBuilder(TEST_TOPIC);
     assertEquals(TEST_TOPIC, builder.topicName);
     assertEquals(Publisher.Builder.DEFAULT_EXECUTOR_PROVIDER, builder.executorProvider);
     assertEquals(
@@ -397,7 +397,7 @@ public void testBuilderParametersAndDefaults() {
 
   @Test
   public void testBuilderInvalidArguments() {
-    Publisher.Builder builder = Publisher.newBuilder(TEST_TOPIC);
+    Publisher.Builder builder = Publisher.defaultBuilder(TEST_TOPIC);
 
     try {
       builder.setChannelProvider(null);
@@ -587,7 +587,7 @@ public void testBuilderInvalidArguments() {
   }
 
   private Builder getTestPublisherBuilder() {
-    return Publisher.newBuilder(TEST_TOPIC)
+    return Publisher.defaultBuilder(TEST_TOPIC)
         .setExecutorProvider(FixedExecutorProvider.create(fakeExecutor))
         .setChannelProvider(TEST_CHANNEL_PROVIDER)
         .setLongRandom(
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberImplTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberImplTest.java
index 15f2fe5dc05c..19df0b265fb7 100644
--- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberImplTest.java
+++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberImplTest.java
@@ -458,7 +458,7 @@ private void sendMessages(Iterable ackIds) throws InterruptedException {
   }
 
   private Builder getTestSubscriberBuilder(MessageReceiver receiver) {
-    return Subscriber.newBuilder(TEST_SUBSCRIPTION, receiver)
+    return Subscriber.defaultBuilder(TEST_SUBSCRIPTION, receiver)
         .setExecutorProvider(FixedExecutorProvider.create(fakeExecutor))
         .setCredentials(testCredentials)
         .setChannelBuilder(testChannelBuilder)