Using Preconditions in Publisher.

sduskis · sduskis · commit 0b002280af0d · 2019-05-01T09:00:17.000-04:00
diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -216,15 +216,12 @@ 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 String orderingKey = message.getOrderingKey();
-    if (orderingKey != null && !orderingKey.isEmpty() && !enableMessageOrdering) {
-      throw new IllegalStateException(
-          "Cannot publish a message with an ordering key when message ordering is not enabled.");
-    }
+    Preconditions.checkState(
+        orderingKey != null && !orderingKey.isEmpty() && !enableMessageOrdering,
+        "Cannot publish a message with an ordering key when message ordering is not enabled.");
 
     final OutstandingPublish outstandingPublish =
         new OutstandingPublish(messageTransform.apply(message));
@@ -361,9 +358,13 @@ private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
           public void onSuccess(PublishResponse result) {
             try {
               if (result.getMessageIdsCount() != outstandingBatch.size()) {
-                Throwable t = 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()));
+                Throwable t =
+                    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);
                 }
diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java
@@ -47,7 +47,6 @@
 import java.util.concurrent.TimeUnit;
 import org.easymock.EasyMock;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -413,7 +412,6 @@ public void testEnableMessageOrdering_overwritesMaxAttempts() throws Exception {
     publisher.shutdown();
   }
 
-
   @Test
   public void testEnableMessageOrdering_dontSendWhileInflight() throws Exception {
     // Set maxAttempts to 1 and enableMessageOrdering to true at the same time.
