Refactoring Publisher.publishOutstandingBatch (#4977)

sduskis · web-flow · commit 8894854f9bcd · 2019-04-18T10:11:44.000-04:00
* Refactoring Publisher.publishOutstandingBatch
This will make the class look more like the ordering keys changes

* Ran the formatter
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
@@ -304,15 +304,18 @@ public void publishAllOutstanding() {
     publishOutstandingBatch(batchToSend);
   }
 
-  private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
+  private ApiFuture<PublishResponse> publishCall(OutstandingBatch outstandingBatch) {
     PublishRequest.Builder publishRequest = PublishRequest.newBuilder();
     publishRequest.setTopic(topicName);
     for (OutstandingPublish outstandingPublish : outstandingBatch.outstandingPublishes) {
       publishRequest.addMessages(outstandingPublish.message);
     }
 
-    ApiFutures.addCallback(
-        publisherStub.publishCallable().futureCall(publishRequest.build()),
+    return publisherStub.publishCallable().futureCall(publishRequest.build());
+  }
+
+  private void publishOutstandingBatch(final OutstandingBatch outstandingBatch) {
+    ApiFutureCallback<PublishResponse> futureCallback =
         new ApiFutureCallback<PublishResponse>() {
           @Override
           public void onSuccess(PublishResponse result) {
@@ -351,8 +354,9 @@ public void onFailure(Throwable t) {
               messagesWaiter.incrementPendingMessages(-outstandingBatch.size());
             }
           }
-        },
-        directExecutor());
+        };
+
+    ApiFutures.addCallback(publishCall(outstandingBatch), futureCallback, directExecutor());
   }
 
   private static final class OutstandingBatch {
