Add javadoc tu PubSubSnippets, remove unused @rule, fix snippets names

mziccard · mziccard · commit e0dbb7e7f9d7 · 2016-09-15T17:31:36.000+02:00
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PubSubSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PubSubSnippets.java
@@ -46,6 +46,9 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * This class contains a number of snippets for the {@link PubSub} interface.
+ */
 public class PubSubSnippets {
 
   private final PubSub pubsub;
@@ -205,12 +208,12 @@ public String publishOneMessage(String topicName) {
   // [VARIABLE "my_topic_name"]
   public String publishOneMessageAsync(String topicName)
       throws ExecutionException, InterruptedException {
-    // [START publishOneMessage]
+    // [START publishOneMessageAsync]
     Message message = Message.of("payload");
     Future<String> future = pubsub.publishAsync(topicName, message);
     // ...
     String messageId = future.get();
-    // [END publishOneMessage]
+    // [END publishOneMessageAsync]
     return messageId;
   }
 
@@ -220,12 +223,12 @@ public String publishOneMessageAsync(String topicName)
   // [TARGET publish(String, Iterable)]
   // [VARIABLE "my_topic_name"]
   public List<String> publishMessageList(String topicName) {
-    // [START publishOneMessageAsync]
+    // [START publishMessageList]
     List<Message> messages = new LinkedList<>();
     messages.add(Message.of("payload1"));
     messages.add(Message.of("payload2"));
     List<String> messageIds = pubsub.publish(topicName, messages);
-    // [END publishOneMessageAsync]
+    // [END publishMessageList]
     return messageIds;
   }
 
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java
@@ -40,7 +40,6 @@
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.rules.Timeout;
 
 import java.util.HashSet;
@@ -60,9 +59,6 @@ public class ITPubSubSnippets {
   @Rule
   public Timeout globalTimeout = Timeout.seconds(300);
 
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
-
   private static String formatForTest(String resourceName) {
     return resourceName + "-" + NAME_SUFFIX;
   }
