Move Firebase Installations to the new, injected executors (#4514)

* Move Firebase Installations to the new, injected executors

* added sequential executor as network executor to fix tests

* re-organized libraries and test executor

Co-authored-by: David Motsonashvili <[email protected]>

Author: davidmotson

firebase-installations/firebase-installations.gradle

@@ -41,6 +41,7 @@ dependencies {
     implementation project(':firebase-common')
     implementation project(':firebase-installations-interop')
     implementation project(':firebase-components')
+    implementation project(':firebase-annotations')
 
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
@@ -50,6 +51,7 @@ dependencies {
     compileOnly "com.google.auto.value:auto-value-annotations:1.6.5"
     annotationProcessor "com.google.auto.value:auto-value:1.6.2"
 
+    testImplementation project(':integ-testing')
     testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'junit:junit:4.12'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"

firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java

@@ -44,11 +44,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -71,7 +69,7 @@ public class FirebaseInstallations implements FirebaseInstallationsApi {
   private final RandomFidGenerator fidGenerator;
   private final Object lock = new Object();
   private final ExecutorService backgroundExecutor;
-  private final ExecutorService networkExecutor;
+  private final Executor networkExecutor;
   /* FID of this Firebase Installations instance. Cached after successfully registering and
   persisting the FID locally. NOTE: cachedFid resets if FID is deleted.*/
   @GuardedBy("this")
@@ -129,15 +127,13 @@ public Thread newThread(Runnable r) {
   // TODO(b/258422917): Migrate to go/firebase-android-executors
   @SuppressLint("ThreadPoolCreation")
   FirebaseInstallations(
-      FirebaseApp firebaseApp, @NonNull Provider<HeartBeatController> heartBeatProvider) {
+      FirebaseApp firebaseApp,
+      @NonNull Provider<HeartBeatController> heartBeatProvider,
+      @NonNull ExecutorService backgroundExecutor,
+      @NonNull Executor networkExecutor) {
     this(
-        new ThreadPoolExecutor(
-            CORE_POOL_SIZE,
-            MAXIMUM_POOL_SIZE,
-            KEEP_ALIVE_TIME_IN_SECONDS,
-            TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>(),
-            THREAD_FACTORY),
+        backgroundExecutor,
+        networkExecutor,
         firebaseApp,
         new FirebaseInstallationServiceClient(
             firebaseApp.getApplicationContext(), heartBeatProvider),
@@ -151,6 +147,7 @@ public Thread newThread(Runnable r) {
   @SuppressLint("ThreadPoolCreation")
   FirebaseInstallations(
       ExecutorService backgroundExecutor,
+      Executor networkExecutor,
       FirebaseApp firebaseApp,
       FirebaseInstallationServiceClient serviceClient,
       PersistedInstallation persistedInstallation,
@@ -164,14 +161,7 @@ public Thread newThread(Runnable r) {
     this.iidStore = iidStore;
     this.fidGenerator = fidGenerator;
     this.backgroundExecutor = backgroundExecutor;
-    this.networkExecutor =
-        new ThreadPoolExecutor(
-            CORE_POOL_SIZE,
-            MAXIMUM_POOL_SIZE,
-            KEEP_ALIVE_TIME_IN_SECONDS,
-            TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>(),
-            THREAD_FACTORY);
+    this.networkExecutor = networkExecutor;
   }
 
   /**

firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallationsRegistrar.java

@@ -16,14 +16,20 @@
 
 import androidx.annotation.Keep;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Background;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
+import com.google.firebase.concurrent.FirebaseExecutors;
 import com.google.firebase.heartbeatinfo.HeartBeatConsumerComponent;
 import com.google.firebase.heartbeatinfo.HeartBeatController;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 
 /** @hide */
 @Keep
@@ -37,10 +43,16 @@ public List<Component<?>> getComponents() {
             .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.optionalProvider(HeartBeatController.class))
+            .add(Dependency.required(Qualified.qualified(Background.class, ExecutorService.class)))
+            .add(Dependency.required(Qualified.qualified(Blocking.class, Executor.class)))
             .factory(
                 c ->
                     new FirebaseInstallations(
-                        c.get(FirebaseApp.class), c.getProvider(HeartBeatController.class)))
+                        c.get(FirebaseApp.class),
+                        c.getProvider(HeartBeatController.class),
+                        c.get(Qualified.qualified(Background.class, ExecutorService.class)),
+                        FirebaseExecutors.newSequentialExecutor(
+                            c.get(Qualified.qualified(Blocking.class, Executor.class)))))
             .build(),
         HeartBeatConsumerComponent.create(),
         LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));