PubSub: move topic/subscription success statement to inside try block (GoogleCloudPlatform#1446)

hongalex · web-flow · commit 2ed077aa2e9e · 2019-06-04T19:23:28.000-04:00
diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java
@@ -55,15 +55,15 @@ public static void main(String... args) throws Exception {
       Subscription subscription =
           subscriptionAdminClient.createSubscription(
               subscriptionName, topicName, PushConfig.getDefaultInstance(), 0);
+      System.out.printf(
+          "Subscription %s:%s created.\n",
+          subscriptionName.getProject(), subscriptionName.getSubscription());
     } catch (ApiException e) {
       // example : code = ALREADY_EXISTS(409) implies subscription already exists
       System.out.print(e.getStatusCode().getCode());
       System.out.print(e.isRetryable());
     }
 
-    System.out.printf(
-        "Subscription %s:%s created.\n",
-        subscriptionName.getProject(), subscriptionName.getSubscription());
   }
 }
 // [END pubsub_quickstart_create_subscription]
diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java
@@ -44,13 +44,12 @@ public static void main(String... args) throws Exception {
     ProjectTopicName topic = ProjectTopicName.of(projectId, topicId);
     try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {
       topicAdminClient.createTopic(topic);
+      System.out.printf("Topic %s:%s created.\n", topic.getProject(), topic.getTopic());
     } catch (ApiException e) {
       // example : code = ALREADY_EXISTS(409) implies topic already exists
       System.out.print(e.getStatusCode().getCode());
       System.out.print(e.isRetryable());
     }
-
-    System.out.printf("Topic %s:%s created.\n", topic.getProject(), topic.getTopic());
   }
 }
 // [END pubsub_quickstart_create_topic]

Original file line number	Diff line number	Diff line change
`@@ -55,15 +55,15 @@ public static void main(String... args) throws Exception {`
`55`	`55`	`Subscription subscription =`
`56`	`56`	`subscriptionAdminClient.createSubscription(`
`57`	`57`	`subscriptionName, topicName, PushConfig.getDefaultInstance(), 0);`
	`58`	`+ System.out.printf(`
	`59`	`+ "Subscription %s:%s created.\n",`
	`60`	`+ subscriptionName.getProject(), subscriptionName.getSubscription());`
`58`	`61`	`} catch (ApiException e) {`
`59`	`62`	`// example : code = ALREADY_EXISTS(409) implies subscription already exists`
`60`	`63`	`System.out.print(e.getStatusCode().getCode());`
`61`	`64`	`System.out.print(e.isRetryable());`
`62`	`65`	`}`
`63`	`66`
`64`		`- System.out.printf(`
`65`		`- "Subscription %s:%s created.\n",`
`66`		`- subscriptionName.getProject(), subscriptionName.getSubscription());`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`// [END pubsub_quickstart_create_subscription]`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,12 @@ public static void main(String... args) throws Exception {`
`44`	`44`	`ProjectTopicName topic = ProjectTopicName.of(projectId, topicId);`
`45`	`45`	`try (TopicAdminClient topicAdminClient = TopicAdminClient.create()) {`
`46`	`46`	`topicAdminClient.createTopic(topic);`
	`47`	`+ System.out.printf("Topic %s:%s created.\n", topic.getProject(), topic.getTopic());`
`47`	`48`	`} catch (ApiException e) {`
`48`	`49`	`// example : code = ALREADY_EXISTS(409) implies topic already exists`
`49`	`50`	`System.out.print(e.getStatusCode().getCode());`
`50`	`51`	`System.out.print(e.isRetryable());`
`51`	`52`	`}`
`52`		`-`
`53`		`- System.out.printf("Topic %s:%s created.\n", topic.getProject(), topic.getTopic());`
`54`	`53`	`}`
`55`	`54`	`}`
`56`	`55`	`// [END pubsub_quickstart_create_topic]`