From 708d7850d6c8ebe6c82acb3019407b14c252a913 Mon Sep 17 00:00:00 2001
From: Solomon Duskis <sduskis@google.com>
Date: Thu, 18 Apr 2019 11:24:21 -0400
Subject: [PATCH] Refactoring SequentialExecutorService.java (#4979)

- Marking methods as private
- renaming variables from `finalTasks` to `tasks` for clarity
- reducing code duplication by calling `execute`
---
 .../pubsub/v1/SequentialExecutorService.java  | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java
index 353b0ec2e293..bbebd8db4de2 100644
--- a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java
+++ b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java
@@ -115,17 +115,17 @@ private static class AutoExecutor extends SequentialExecutor {
       super(executor);
     }
 
-    protected void execute(final String key, final Deque<Runnable> finalTasks) {
+    protected void execute(final String key, final Deque<Runnable> tasks) {
       executor.execute(
           new Runnable() {
             @Override
             public void run() {
-              invokeCallbackAndExecuteNext(key, finalTasks);
+              invokeCallbackAndExecuteNext(key, tasks);
             }
           });
     }
 
-    protected void invokeCallbackAndExecuteNext(final String key, final Deque<Runnable> tasks) {
+    private void invokeCallbackAndExecuteNext(final String key, final Deque<Runnable> tasks) {
       invokeCallback(tasks);
       synchronized (tasksByKey) {
         if (tasks.isEmpty()) {
@@ -137,13 +137,7 @@ protected void invokeCallbackAndExecuteNext(final String key, final Deque<Runnab
           return;
         }
       }
-      executor.execute(
-          new Runnable() {
-            @Override
-            public void run() {
-              invokeCallbackAndExecuteNext(key, tasks);
-            }
-          });
+      execute(key, tasks);
     }
   }
 
@@ -199,18 +193,18 @@ public void cancel(Throwable e) {
       return future;
     }
 
-    protected void execute(final String key, final Deque<Runnable> finalTasks) {
+    protected void execute(final String key, final Deque<Runnable> tasks) {
       executor.execute(
           new Runnable() {
             @Override
             public void run() {
-              invokeCallback(finalTasks);
+              invokeCallback(tasks);
             }
           });
     }
 
     /** Executes the next queued task associated with {@code key}. */
-    void resume(final String key) {
+    private void resume(String key) {
       Deque<Runnable> tasks;
       synchronized (tasksByKey) {
         tasks = tasksByKey.get(key);
@@ -222,19 +216,11 @@ void resume(final String key) {
           return;
         }
       }
-      final Deque<Runnable> finalTasks = tasks;
-      // Run the next task.
-      executor.execute(
-          new Runnable() {
-            @Override
-            public void run() {
-              invokeCallback(finalTasks);
-            }
-          });
+      execute(key, tasks);
     }
 
     /** Cancels every task in the queue assoicated with {@code key}. */
-    void cancelQueuedTasks(final String key, Throwable e) {
+    private void cancelQueuedTasks(final String key, Throwable e) {
       // TODO(kimkyung-goog): Ensure execute() fails once cancelQueueTasks() has been ever invoked,
       // so that no more tasks are scheduled.
       synchronized (tasksByKey) {