Update CreateTopicAndPublishMessages.java

chenyumic · web-flow · commit 9f624a00499b · 2018-05-17T10:01:25.000-07:00
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
@@ -83,11 +83,8 @@ public static void publishMessages() throws Exception {
   public static void publishMessagesWithErrorHandler() throws Exception {
     // [START pubsub_publish_error_handler]
     ProjectTopicName topicName = ProjectTopicName.of("my-project-id", "my-topic-id");
-    Publisher publisher = null;
 
-    try {
-      // Create a publisher instance with default settings bound to the topic
-      publisher = Publisher.newBuilder(topicName).build();
+    try (Publisher publisher = Publisher.newBuilder(topicName).build()) {
 
       List<String> messages = Arrays.asList("first message", "second message");
 
@@ -119,17 +116,13 @@ public void onSuccess(String messageId) {
           }
         });
       }
-    } finally {
-      if (publisher != null) {
-        // When finished with the publisher, shutdown to free up resources.
-        publisher.shutdown();
-      }
     }
     // [END pubsub_publish_error_handler]
   }
   
   public static void main(String... args) throws Exception {
     createTopic();
     publishMessages();
+    publishMessagesWithErrorHandler();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,8 @@ public static void publishMessages() throws Exception {`
`83`	`83`	`public static void publishMessagesWithErrorHandler() throws Exception {`
`84`	`84`	`// [START pubsub_publish_error_handler]`
`85`	`85`	`ProjectTopicName topicName = ProjectTopicName.of("my-project-id", "my-topic-id");`
`86`		`- Publisher publisher = null;`
`87`	`86`
`88`		`- try {`
`89`		`- // Create a publisher instance with default settings bound to the topic`
`90`		`- publisher = Publisher.newBuilder(topicName).build();`
	`87`	`+ try (Publisher publisher = Publisher.newBuilder(topicName).build()) {`
`91`	`88`
`92`	`89`	`List<String> messages = Arrays.asList("first message", "second message");`
`93`	`90`
`@@ -119,17 +116,13 @@ public void onSuccess(String messageId) {`
`119`	`116`	`}`
`120`	`117`	`});`
`121`	`118`	`}`
`122`		`- } finally {`
`123`		`- if (publisher != null) {`
`124`		`- // When finished with the publisher, shutdown to free up resources.`
`125`		`- publisher.shutdown();`
`126`		`- }`
`127`	`119`	`}`
`128`	`120`	`// [END pubsub_publish_error_handler]`
`129`	`121`	`}`
`130`	`122`
`131`	`123`	`public static void main(String... args) throws Exception {`
`132`	`124`	`createTopic();`
`133`	`125`	`publishMessages();`
	`126`	`+ publishMessagesWithErrorHandler();`
`134`	`127`	`}`
`135`	`128`	`}`