---

sduskis · web-flow · commit ca2b3a84f1a7 · 2019-05-01T13:18:41.000-04:00
yaml --- r: 32503 b: refs/heads/autosynth-firestore c: 67668c1 h: refs/heads/master i: 32501: 7f101e9 32499: 20fd952 32495: 3e5f721
diff --git a/[refs] b/[refs]
@@ -130,7 +130,7 @@ refs/heads/autosynth-containeranalysis: 18d210f81f17cf74864d0db2c29e834302f74f2a
 refs/heads/autosynth-datastore: f1efc3dc465174f41041acd56cf29badcec3e5bd
 refs/heads/autosynth-dialogflow: 73974cc32e5212aec0126472e0bc1442886fedaf
 refs/heads/autosynth-errorreporting: effe8001d110ad584187b30aafc473db0dd4a15f
-refs/heads/autosynth-firestore: 652794a69a167d6223e9abdd512066c21835072d
+refs/heads/autosynth-firestore: 67668c1411169338374b050eae50ed650e318c54
 refs/heads/autosynth-iot: 4025d1804241e74d54950a324dc4f667aeaad4b3
 refs/heads/autosynth-kms: 6b65b0f34c12d141031c7288cdc01e550212d0f6
 refs/heads/autosynth-language: e73905aa7672afa47240e65b25c087207f4594f9
diff --git a/branches/autosynth-firestore/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/autosynth-firestore/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -192,9 +192,7 @@ public String getTopicNameString() {
    * @return the message ID wrapped in a future.
    */
   public ApiFuture<String> publish(PubsubMessage message) {
-    if (shutdown.get()) {
-      throw new IllegalStateException("Cannot publish on a shut-down publisher.");
-    }
+    Preconditions.checkState(!shutdown.get(), "Cannot publish on a shut-down publisher.");
 
     final OutstandingPublish outstandingPublish =
         new OutstandingPublish(messageTransform.apply(message));
@@ -288,23 +286,15 @@ private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
           public void onSuccess(PublishResponse result) {
             try {
               if (result.getMessageIdsCount() != outstandingBatch.size()) {
-                Throwable t =
+                outstandingBatch.onFailure(
                     new IllegalStateException(
                         String.format(
                             "The publish result count %s does not match "
                                 + "the expected %s results. Please contact Cloud Pub/Sub support "
                                 + "if this frequently occurs",
-                            result.getMessageIdsCount(), outstandingBatch.size()));
-                for (OutstandingPublish oustandingMessage : outstandingBatch.outstandingPublishes) {
-                  oustandingMessage.publishResult.setException(t);
-                }
-                return;
-              }
-
-              Iterator<OutstandingPublish> messagesResultsIt =
-                  outstandingBatch.outstandingPublishes.iterator();
-              for (String messageId : result.getMessageIdsList()) {
-                messagesResultsIt.next().publishResult.set(messageId);
+                            result.getMessageIdsCount(), outstandingBatch.size())));
+              } else {
+                outstandingBatch.onSuccess(result.getMessageIdsList());
               }
             } finally {
               messagesWaiter.incrementPendingMessages(-outstandingBatch.size());
@@ -314,9 +304,7 @@ public void onSuccess(PublishResponse result) {
           @Override
           public void onFailure(Throwable t) {
             try {
-              for (OutstandingPublish outstandingPublish : outstandingBatch.outstandingPublishes) {
-                outstandingPublish.publishResult.setException(t);
-              }
+              outstandingBatch.onFailure(t);
             } finally {
               messagesWaiter.incrementPendingMessages(-outstandingBatch.size());
             }
@@ -350,6 +338,19 @@ private List<PubsubMessage> getMessages() {
       }
       return results;
     }
+
+    private void onFailure(Throwable t) {
+      for (OutstandingPublish outstandingPublish : outstandingPublishes) {
+        outstandingPublish.publishResult.setException(t);
+      }
+    }
+
+    private void onSuccess(Iterable<String> results) {
+      Iterator<OutstandingPublish> messagesResultsIt = outstandingPublishes.iterator();
+      for (String messageId : results) {
+        messagesResultsIt.next().publishResult.set(messageId);
+      }
+    }
   }
 
   private static final class OutstandingPublish {
@@ -376,10 +377,9 @@ public BatchingSettings getBatchingSettings() {
    * should be invoked prior to deleting the {@link Publisher} object in order to ensure that no
    * pending messages are lost.
    */
-  public void shutdown() throws Exception {
-    if (shutdown.getAndSet(true)) {
-      throw new IllegalStateException("Cannot shut down a publisher already shut-down.");
-    }
+  public void shutdown() {
+    Preconditions.checkState(
+        !shutdown.getAndSet(true), "Cannot shut down a publisher already shut-down.");
     if (currentAlarmFuture != null && activeAlarm.getAndSet(false)) {
       currentAlarmFuture.cancel(false);
     }
