---

sduskis · sduskis · commit fe6dd7d0e10a · 2019-05-01T09:00:17.000-04:00
yaml --- r: 28271 b: refs/heads/pubsub-ordering-keys c: 0b00228 h: refs/heads/master i: 28269: aa202e7 28267: f538d3b 28263: b91119f 28255: 21c6dc7
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: ec2ecc6d8ef49ab006d93d958d27d8a0a5143e61
+refs/heads/pubsub-ordering-keys: 0b002280af0d6253fe50bf3f073749a2c6b86853
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/pubsub-ordering-keys/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/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java b/branches/pubsub-ordering-keys/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.
