execute calls to AsyncStorageModule serially

ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java

@@ -7,13 +7,12 @@
 
 package com.facebook.react.modules.storage;
 
-import java.util.ArrayDeque;
 import java.util.HashSet;
-import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteStatement;
-import android.os.AsyncTask;
 
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.Arguments;
@@ -26,7 +25,6 @@
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.common.ModuleDataCleaner;
 
@@ -46,49 +44,16 @@ public final class AsyncStorageModule
 
   private ReactDatabaseSupplier mReactDatabaseSupplier;
   private boolean mShuttingDown = false;
-
-  // Adapted from https://android.googlesource.com/platform/frameworks/base.git/+/1488a3a19d4681a41fb45570c15e14d99db1cb66/core/java/android/os/AsyncTask.java#237
-  private class SerialExecutor implements Executor {
-    private final ArrayDeque<Runnable> mTasks = new ArrayDeque<Runnable>();
-    private Runnable mActive;
-    private final Executor executor;
-
-    SerialExecutor(Executor executor) {
-      this.executor = executor;
-    }
-
-    public synchronized void execute(final Runnable r) {
-      mTasks.offer(new Runnable() {
-        public void run() {
-          try {
-            r.run();
-          } finally {
-            scheduleNext();
-          }
-        }
-      });
-      if (mActive == null) {
-        scheduleNext();
-      }
-    }
-    synchronized void scheduleNext() {
-      if ((mActive = mTasks.poll()) != null) {
-        executor.execute(mActive);
-      }
-    }
-  }
-
-  private final SerialExecutor executor;
+  private ExecutorService executor;
 
   public AsyncStorageModule(ReactApplicationContext reactContext) {
-    this(reactContext, AsyncTask.THREAD_POOL_EXECUTOR);
+    this(reactContext, Executors.newSingleThreadExecutor());
   }
 
-  @VisibleForTesting
-  AsyncStorageModule(ReactApplicationContext reactContext, Executor executor) {
+  public AsyncStorageModule(ReactApplicationContext reactContext, ExecutorService executor) {
     super(reactContext);
-    this.executor = new SerialExecutor(executor);
     mReactDatabaseSupplier = ReactDatabaseSupplier.getInstance(reactContext);
+    this.executor = executor;
   }
 
   @Override
@@ -104,6 +69,7 @@ public void initialize() {
 
   @Override
   public void onCatalystInstanceDestroy() {
+    executor.shutdown();
     mShuttingDown = true;
   }
 

ReactAndroid/src/test/java/com/facebook/react/modules/storage/AsyncStorageModuleTest.java

@@ -12,20 +12,11 @@
 import java.util.Map;
 import java.util.concurrent.Executor;
 
-import android.app.Activity;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.os.AsyncTask;
-
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.GuardedAsyncTask;
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactTestHelper;
 import com.facebook.react.bridge.JavaOnlyArray;
 import com.facebook.react.bridge.JavaOnlyMap;
-import com.facebook.react.modules.storage.AsyncStorageModule;
-import com.facebook.react.modules.storage.ReactDatabaseSupplier;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -34,22 +25,20 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.mockito.verification.VerificationMode;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.modules.junit4.rule.PowerMockRule;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.util.concurrent.RoboExecutorService;
 
 import static org.mockito.Mockito.mock;
 import static org.fest.assertions.api.Assertions.assertThat;
+import static org.mockito.Mockito.verify;
 
 /**
  * Tests for {@link AsyncStorageModule}.
@@ -86,8 +75,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
 
     // don't use Robolectric before initializing mocks
     mStorage = new AsyncStorageModule(
-        ReactTestHelper.createCatalystContextForTest(),
-        new RoboExecutorService()
+      ReactTestHelper.createCatalystContextForTest(),
+      new RoboExecutorService()
     );
     mEmptyArray = new JavaOnlyArray();
   }
@@ -346,14 +335,4 @@ private JavaOnlyArray getArray(String... values) {
     }
     return array;
   }
-
-  private static void waitForAsync() {
-    Robolectric.flushForegroundThreadScheduler();
-    Robolectric.flushBackgroundThreadScheduler();
-  }
-
-  private static <T> T verify(T mock, VerificationMode mode) {
-    waitForAsync();
-    return Mockito.verify(mock, mode);
-  }
 }