From 00f58ae849dbe38474e07069372554d95ce11f0c Mon Sep 17 00:00:00 2001 From: Jisha Abubaker Date: Tue, 9 May 2017 13:09:54 -0700 Subject: [PATCH 1/3] pubsub doc snippet updates --- .../CreateSubscriptionAndConsumeMessages.java | 7 ++++--- .../snippets/CreateTopicAndPublishMessages.java | 4 ++-- .../examples/pubsub/snippets/SubscriberSnippets.java | 12 +++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java index 1f8968f44bd7..3dd0f04f0376 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java @@ -25,6 +25,7 @@ import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.SubscriptionName; import com.google.pubsub.v1.TopicName; +import javax.xml.bind.DatatypeConverter; /** * A snippet for Google Cloud Pub/Sub showing how to create a Pub/Sub pull subscription and @@ -33,8 +34,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 +45,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/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 e39fa4d4e8e3..9b0e8215aacf 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 @@ -34,7 +34,7 @@ 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); } @@ -42,7 +42,7 @@ public static void createTopic() throws Exception { 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> messageIdFutures = new ArrayList<>(); 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 2c5756078b02..5e9d89764206 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 @@ -39,6 +39,7 @@ import com.google.pubsub.v1.SubscriptionName; import java.io.FileInputStream; import java.util.concurrent.Executor; +import javax.xml.bind.DatatypeConverter; /** This class contains snippets for the {@link Subscriber} interface. */ public class SubscriberSnippets { @@ -86,8 +87,11 @@ 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()); + // decode from base64 to view original data + System.out.println("Data : " + + new String(DatatypeConverter.parseBase64Binary(message.getData().toStringUtf8()))); consumer.ack(); } }; @@ -107,10 +111,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. From 1ba58fb58064ef0601e3d2e650c5871fcf5dc7c4 Mon Sep 17 00:00:00 2001 From: Jisha Abubaker Date: Tue, 9 May 2017 13:13:56 -0700 Subject: [PATCH 2/3] removing unused import --- .../pubsub/snippets/CreateSubscriptionAndConsumeMessages.java | 1 - 1 file changed, 1 deletion(-) diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java index 3dd0f04f0376..f3ae5d4dc148 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java @@ -25,7 +25,6 @@ import com.google.pubsub.v1.PushConfig; import com.google.pubsub.v1.SubscriptionName; import com.google.pubsub.v1.TopicName; -import javax.xml.bind.DatatypeConverter; /** * A snippet for Google Cloud Pub/Sub showing how to create a Pub/Sub pull subscription and From 2351205c5a34721e9681e4ada6fac5fdbcf30766 Mon Sep 17 00:00:00 2001 From: Jisha Abubaker Date: Tue, 9 May 2017 14:55:03 -0700 Subject: [PATCH 3/3] remove un-necessary base64 decoding --- .../cloud/examples/pubsub/snippets/SubscriberSnippets.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 5e9d89764206..b8cd7070a8a3 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 @@ -39,7 +39,6 @@ import com.google.pubsub.v1.SubscriptionName; import java.io.FileInputStream; import java.util.concurrent.Executor; -import javax.xml.bind.DatatypeConverter; /** This class contains snippets for the {@link Subscriber} interface. */ public class SubscriberSnippets { @@ -89,9 +88,7 @@ private void createSubscriber() throws Exception { public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { // handle incoming message, then ack/nack the received message System.out.println("Id : " + message.getMessageId()); - // decode from base64 to view original data - System.out.println("Data : " + - new String(DatatypeConverter.parseBase64Binary(message.getData().toStringUtf8()))); + System.out.println("Data : " + message.getData().toStringUtf8()); consumer.ack(); } };