Merge pull request #3296 from alixhami/pubsub-region-tags

alixhami · web-flow · commit 4af327ad557a · 2018-05-22T09:16:01.000-07:00
Pubsub: adds missing region tags
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
@@ -122,13 +122,13 @@ public Publisher getPublisherWithCustomRetrySettings(ProjectTopicName topicName)
   }
 
   public Publisher getSingleThreadedPublisher(ProjectTopicName topicName) throws Exception {
-    // [START pubsub_publisher_single_threaded]
+    // [START pubsub_publisher_concurrency_control]
     // create a publisher with a single threaded executor
     ExecutorProvider executorProvider = InstantiatingExecutorProvider.newBuilder()
         .setExecutorThreadCount(1).build();
     Publisher publisher = Publisher.newBuilder(topicName)
         .setExecutorProvider(executorProvider).build();
-    // [END pubsub_publisher_single_threaded]
+    // [END pubsub_publisher_concurrency_control]
     return publisher;
   }
 
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
@@ -146,7 +146,7 @@ public void failed(Subscriber.State from, Throwable failure) {
   }
 
   private Subscriber createSingleThreadedSubscriber() throws Exception {
-    // [START pubsub_subscriber_single_threaded]
+    // [START pubsub_subscriber_concurrency_control]
     // provide a separate executor service for polling
     ExecutorProvider executorProvider =
         InstantiatingExecutorProvider.newBuilder().setExecutorThreadCount(1).build();
@@ -155,7 +155,7 @@ private Subscriber createSingleThreadedSubscriber() throws Exception {
         Subscriber.newBuilder(subscriptionName, receiver)
             .setExecutorProvider(executorProvider)
             .build();
-    // [END pubsub_subscriber_single_threaded]
+    // [END pubsub_subscriber_concurrency_control]
     return subscriber;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -122,13 +122,13 @@ public Publisher getPublisherWithCustomRetrySettings(ProjectTopicName topicName)`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`public Publisher getSingleThreadedPublisher(ProjectTopicName topicName) throws Exception {`
`125`		`- // [START pubsub_publisher_single_threaded]`
	`125`	`+ // [START pubsub_publisher_concurrency_control]`
`126`	`126`	`// create a publisher with a single threaded executor`
`127`	`127`	`ExecutorProvider executorProvider = InstantiatingExecutorProvider.newBuilder()`
`128`	`128`	`.setExecutorThreadCount(1).build();`
`129`	`129`	`Publisher publisher = Publisher.newBuilder(topicName)`
`130`	`130`	`.setExecutorProvider(executorProvider).build();`
`131`		`- // [END pubsub_publisher_single_threaded]`
	`131`	`+ // [END pubsub_publisher_concurrency_control]`
`132`	`132`	`return publisher;`
`133`	`133`	`}`
`134`	`134`