---

jabubake · web-flow · commit 1f1bc7a0f392 · 2017-05-09T21:33:08.000-07:00
yaml --- r: 8073 b: refs/heads/tswast-patch-1 c: 4cf6e25 h: refs/heads/master i: 8071: 19396f7
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 82932490728530309a731f8595d8f66fa8f17964
+refs/heads/tswast-patch-1: 4cf6e2533895bd6c9812fe5e6965ae1816ada5be
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java b/branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java
@@ -33,8 +33,8 @@
 public class CreateSubscriptionAndConsumeMessages {
 
   public static void main(String... args) throws Exception {
-    TopicName topic = TopicName.create("test-project", "test-topic");
-    SubscriptionName subscription = SubscriptionName.create("test-project", "test-subscription");
+    TopicName topic = TopicName.create("my-project-id", "my-topic-id");
+    SubscriptionName subscription = SubscriptionName.create("my-project-id", "my-topic-id");
 
     try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) {
       subscriptionAdminClient.createSubscription(subscription, topic, PushConfig.getDefaultInstance(), 0);
@@ -44,7 +44,7 @@ public static void main(String... args) throws Exception {
         new MessageReceiver() {
           @Override
           public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
-            System.out.println("got message: " + message.getData().toStringUtf8());
+            System.out.println("Received message: " + message.getData().toStringUtf8());
             consumer.ack();
           }
         };
diff --git a/branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java b/branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java
@@ -34,15 +34,15 @@
 public class CreateTopicAndPublishMessages {
 
   public static void createTopic() throws Exception {
-    TopicName topic = TopicName.create("test-project", "test-topic");
+    TopicName topic = TopicName.create("my-project-id", "my-topic-id");
     try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
       topicAdminClient.createTopic(topic);
     }
   }
 
   public static void publishMessages() throws Exception {
     // [START publish]
-    TopicName topicName = TopicName.create("test-project", "test-topic");
+    TopicName topicName = TopicName.create("my-project-id", "my-topic-id");
     Publisher publisher = null;
     List<ApiFuture<String>> messageIdFutures = new ArrayList<>();
 
diff --git a/branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java b/branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java
@@ -86,8 +86,9 @@ private void createSubscriber() throws Exception {
     MessageReceiver receiver = new MessageReceiver() {
           @Override
           public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
-            // handle incoming message, then ack or nack the received message
-            // ...
+            // handle incoming message, then ack/nack the received message
+            System.out.println("Id : " + message.getMessageId());
+            System.out.println("Data : " + message.getData().toStringUtf8());
             consumer.ack();
           }
         };
@@ -107,10 +108,8 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) {
     // [END pullSubscriber]
   }
 
-  private Subscriber createSubscriberWithErrorListener() throws Exception {
+  private Subscriber createSubscriberWithErrorListener(Subscriber subscriber) throws Exception {
     // [START subscriberWithErrorListener]
-    Subscriber subscriber = Subscriber.defaultBuilder(subscriptionName, receiver).build();
-
     subscriber.addListener(new Subscriber.Listener() {
       public void failed(Subscriber.State from, Throwable failure) {
         // Handle error.
