Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ private static class PublishMessagesAction extends PubSubAction<Tuple<String, Li
public void run(Tuple<String, List<PubsubMessage>> 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<PubsubMessage> messages = params.y();
for (PubsubMessage message : messages) {
ApiFuture<String> messageIdFuture = publisher.publish(message);
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> messages = Arrays.asList("first message", "second message");
List<ApiFuture<String>> messageIds = new ArrayList<>();
for (String message : messages) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Void> done = SettableApiFuture.create();
ApiFutures.addCallback(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ private void createTopic(String name) throws Exception {

private Set<String> publishMessages(String topicName, int numMessages) throws Exception {
Set<String> 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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -519,7 +519,7 @@ interface LongRandom {
* }</pre>
*
*/
public static Builder newBuilder(TopicName topicName) {
public static Builder defaultBuilder(TopicName topicName) {
return new Builder(topicName);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -189,7 +189,7 @@ public FlowControlSettings getFlowControlSettings() {
*
* <p>Example of receiving a specific number of messages.
* <pre> {@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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void testPublishSubscribe() throws Exception {

final SettableApiFuture<PubsubMessage> received = SettableApiFuture.create();
Subscriber subscriber =
Subscriber.newBuilder(
Subscriber.defaultBuilder(
subscriptionName,
new MessageReceiver() {
@Override
Expand All @@ -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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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);
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ private void sendMessages(Iterable<String> 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)
Expand Down