Skip to content

Commit 67874a7

Browse files
pongadgarrettjonesgoogle
authored andcommitted
pubsub: rename newBuilder to defaultBuilder (#1873)
Fixes #1853.
1 parent 714bb6f commit 67874a7

File tree

12 files changed

+19
-19
lines changed

12 files changed

+19
-19
lines changed

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/PubSubExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ private static class PublishMessagesAction extends PubSubAction<Tuple<String, Li
315315
public void run(Tuple<String, List<PubsubMessage>> params) throws Exception {
316316
String topic = params.x();
317317
TopicName topicName = TopicName.create(projectId, topic);
318-
Publisher publisher = Publisher.newBuilder(topicName).build();
318+
Publisher publisher = Publisher.defaultBuilder(topicName).build();
319319
List<PubsubMessage> messages = params.y();
320320
for (PubsubMessage message : messages) {
321321
ApiFuture<String> messageIdFuture = publisher.publish(message);
@@ -526,7 +526,7 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
526526
SubscriptionName subscriptionName = params.x();
527527
Subscriber subscriber = null;
528528
try {
529-
subscriber = Subscriber.newBuilder(subscriptionName, receiver).build();
529+
subscriber = Subscriber.defaultBuilder(subscriptionName, receiver).build();
530530
subscriber.addListener(
531531
new Subscriber.Listener() {
532532
@Override

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndPullMessages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
5151
};
5252
Subscriber subscriber = null;
5353
try {
54-
subscriber = Subscriber.newBuilder(subscription, receiver).build();
54+
subscriber = Subscriber.defaultBuilder(subscription, receiver).build();
5555
subscriber.addListener(
5656
new Subscriber.Listener() {
5757
@Override

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void main(String... args) throws Exception {
3939

4040
Publisher publisher = null;
4141
try {
42-
publisher = Publisher.newBuilder(topic).build();
42+
publisher = Publisher.defaultBuilder(topic).build();
4343
List<String> messages = Arrays.asList("first message", "second message");
4444
List<ApiFuture<String>> messageIds = new ArrayList<>();
4545
for (String message : messages) {

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void onFailure(Throwable t) {
6565
public static void newBuilder(String projectName, String topicName) throws Exception {
6666
// [START newBuilder]
6767
TopicName topic = TopicName.create(projectName, topicName);
68-
Publisher publisher = Publisher.newBuilder(topic).build();
68+
Publisher publisher = Publisher.defaultBuilder(topic).build();
6969
try {
7070
// ...
7171
} finally {

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public SubscriberSnippets(
5353
// [TARGET startAsync()]
5454
public void startAndWait() throws Exception {
5555
// [START startAsync]
56-
Subscriber subscriber = Subscriber.newBuilder(subscription, receiver).build();
56+
Subscriber subscriber = Subscriber.defaultBuilder(subscription, receiver).build();
5757
subscriber.addListener(new Subscriber.Listener() {
5858
public void failed(Subscriber.State from, Throwable failure) {
5959
// Handle error.

google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private void testPublisherSubscriberHelper(TopicName topicName, SubscriptionName
7575

7676
Publisher publisher = null;
7777
try {
78-
publisher = Publisher.newBuilder(topicName).build();
78+
publisher = Publisher.defaultBuilder(topicName).build();
7979
PublisherSnippets snippets = new PublisherSnippets(publisher);
8080
final SettableApiFuture<Void> done = SettableApiFuture.create();
8181
ApiFutures.addCallback(

google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private void createTopic(String name) throws Exception {
170170

171171
private Set<String> publishMessages(String topicName, int numMessages) throws Exception {
172172
Set<String> messages = new HashSet<>();
173-
Publisher publisher = Publisher.newBuilder(TopicName.create(projectId, topicName)).build();
173+
Publisher publisher = Publisher.defaultBuilder(TopicName.create(projectId, topicName)).build();
174174
for (int i = 1; i<= numMessages; i++) {
175175
String message = formatForTest("message-" + i);
176176
PubsubMessage pubsubMessage = PubsubMessage.newBuilder().setData(

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ interface LongRandom {
509509
* String projectName = "my_project";
510510
* String topicName = "my_topic";
511511
* TopicName topic = TopicName.create(projectName, topicName);
512-
* Publisher publisher = Publisher.newBuilder(topic).build();
512+
* Publisher publisher = Publisher.defaultBuilder(topic).build();
513513
* try {
514514
* // ...
515515
* } finally {
@@ -519,7 +519,7 @@ interface LongRandom {
519519
* }</pre>
520520
*
521521
*/
522-
public static Builder newBuilder(TopicName topicName) {
522+
public static Builder defaultBuilder(TopicName topicName) {
523523
return new Builder(topicName);
524524
}
525525

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public void close() throws IOException {
165165
* @param receiver an implementation of {@link MessageReceiver} used to process the received
166166
* messages
167167
*/
168-
public static Builder newBuilder(SubscriptionName subscription, MessageReceiver receiver) {
168+
public static Builder defaultBuilder(SubscriptionName subscription, MessageReceiver receiver) {
169169
return new Builder(subscription, receiver);
170170
}
171171

@@ -189,7 +189,7 @@ public FlowControlSettings getFlowControlSettings() {
189189
*
190190
* <p>Example of receiving a specific number of messages.
191191
* <pre> {@code
192-
* Subscriber subscriber = Subscriber.newBuilder(subscription, receiver).build();
192+
* Subscriber subscriber = Subscriber.defaultBuilder(subscription, receiver).build();
193193
* subscriber.addListener(new Subscriber.Listener() {
194194
* public void failed(Subscriber.State from, Throwable failure) {
195195
* // Handle error.

google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void testPublishSubscribe() throws Exception {
109109

110110
final SettableApiFuture<PubsubMessage> received = SettableApiFuture.create();
111111
Subscriber subscriber =
112-
Subscriber.newBuilder(
112+
Subscriber.defaultBuilder(
113113
subscriptionName,
114114
new MessageReceiver() {
115115
@Override
@@ -132,7 +132,7 @@ public void failed(Subscriber.State from, Throwable failure) {
132132
MoreExecutors.directExecutor());
133133
subscriber.startAsync();
134134

135-
Publisher publisher = Publisher.newBuilder(topicName).build();
135+
Publisher publisher = Publisher.defaultBuilder(topicName).build();
136136
publisher.publish(message).get();
137137
publisher.shutdown();
138138

0 commit comments

Comments
 (0)