---

sduskis · web-flow · commit f538d3bf465b · 2019-04-30T15:06:30.000-04:00
yaml --- r: 28267 b: refs/heads/pubsub-ordering-keys c: d2f0bc6 h: refs/heads/master i: 28265: 4ddc57a 28263: b91119f
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: ff068a98c01b31c9cd416ff92e71c96ababcd204
+refs/heads/pubsub-ordering-keys: d2f0bc64a53049040fe9c9d338b12fab3dd1ad6a
 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
@@ -272,13 +272,13 @@ public void publishAllOutstanding() {
   }
 
   private ApiFuture<PublishResponse> publishCall(OutstandingBatch outstandingBatch) {
-    PublishRequest.Builder publishRequest = PublishRequest.newBuilder();
-    publishRequest.setTopic(topicName);
-    for (OutstandingPublish outstandingPublish : outstandingBatch.outstandingPublishes) {
-      publishRequest.addMessages(outstandingPublish.message);
-    }
-
-    return publisherStub.publishCallable().futureCall(publishRequest.build());
+    return publisherStub
+        .publishCallable()
+        .futureCall(
+            PublishRequest.newBuilder()
+                .setTopic(topicName)
+                .addAllMessages(outstandingBatch.getMessages())
+                .build());
   }
 
   private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
@@ -342,6 +342,14 @@ private static final class OutstandingBatch {
     int size() {
       return outstandingPublishes.size();
     }
+
+    private List<PubsubMessage> getMessages() {
+      List<PubsubMessage> results = new ArrayList<>(outstandingPublishes.size());
+      for (OutstandingPublish outstandingPublish : outstandingPublishes) {
+        results.add(outstandingPublish.message);
+      }
+      return results;
+    }
   }
 
   private static final class OutstandingPublish {
