Migrate firebase-appcheck-playintegrity to go/firebase-android-executors.

Author: rosalyntan

appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle

@@ -41,6 +41,7 @@ android {
 }
 
 dependencies {
+    implementation project(':firebase-annotations')
     implementation project(':firebase-common')
     implementation project(':firebase-components')
     implementation project(':appcheck:firebase-appcheck')
@@ -50,6 +51,7 @@ dependencies {
 
     javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
 
+    testImplementation project(':integ-testing')
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.4.6'
     testImplementation "com.google.truth:truth:$googleTruthVersion"

appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrar.java

@@ -16,13 +16,16 @@
 
 import com.google.android.gms.common.annotation.KeepForSdk;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.appcheck.playintegrity.internal.PlayIntegrityAppCheckProvider;
 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.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.Executor;
 
 /**
  * {@link ComponentRegistrar} for setting up FirebaseAppCheck play integrity's dependency injections
@@ -36,12 +39,17 @@ public class FirebaseAppCheckPlayIntegrityRegistrar implements ComponentRegistra
 
   @Override
   public List<Component<?>> getComponents() {
+    Qualified<Executor> blockingExecutor = Qualified.qualified(Blocking.class, Executor.class);
+
     return Arrays.asList(
         Component.builder(PlayIntegrityAppCheckProvider.class)
             .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
+            .add(Dependency.required(blockingExecutor))
             .factory(
-                (container) -> new PlayIntegrityAppCheckProvider(container.get(FirebaseApp.class)))
+                (container) ->
+                    new PlayIntegrityAppCheckProvider(
+                        container.get(FirebaseApp.class), container.get(blockingExecutor)))
             .build(),
         LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }

appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProvider.java

@@ -24,13 +24,13 @@
 import com.google.android.play.core.integrity.IntegrityTokenRequest;
 import com.google.android.play.core.integrity.IntegrityTokenResponse;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.appcheck.AppCheckProvider;
 import com.google.firebase.appcheck.AppCheckToken;
 import com.google.firebase.appcheck.internal.DefaultAppCheckToken;
 import com.google.firebase.appcheck.internal.NetworkClient;
 import com.google.firebase.appcheck.internal.RetryManager;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.Executor;
 
 public class PlayIntegrityAppCheckProvider implements AppCheckProvider {
 
@@ -39,17 +39,16 @@ public class PlayIntegrityAppCheckProvider implements AppCheckProvider {
   private final String projectNumber;
   private final IntegrityManager integrityManager;
   private final NetworkClient networkClient;
-  private final ExecutorService backgroundExecutor;
+  private final Executor blockingExecutor;
   private final RetryManager retryManager;
 
-  // TODO(b/258273630): Migrate to go/firebase-android-executors
-  @SuppressLint("ThreadPoolCreation")
-  public PlayIntegrityAppCheckProvider(@NonNull FirebaseApp firebaseApp) {
+  public PlayIntegrityAppCheckProvider(
+      @NonNull FirebaseApp firebaseApp, @Blocking Executor blockingExecutor) {
     this(
         firebaseApp.getOptions().getGcmSenderId(),
         IntegrityManagerFactory.create(firebaseApp.getApplicationContext()),
         new NetworkClient(firebaseApp),
-        Executors.newCachedThreadPool(),
+        blockingExecutor,
         new RetryManager());
   }
 
@@ -58,12 +57,12 @@ public PlayIntegrityAppCheckProvider(@NonNull FirebaseApp firebaseApp) {
       @NonNull String projectNumber,
       @NonNull IntegrityManager integrityManager,
       @NonNull NetworkClient networkClient,
-      @NonNull ExecutorService backgroundExecutor,
+      @NonNull Executor blockingExecutor,
       @NonNull RetryManager retryManager) {
     this.projectNumber = projectNumber;
     this.integrityManager = integrityManager;
     this.networkClient = networkClient;
-    this.backgroundExecutor = backgroundExecutor;
+    this.blockingExecutor = blockingExecutor;
     this.retryManager = retryManager;
   }
 
@@ -78,7 +77,7 @@ public Task<AppCheckToken> getToken() {
               ExchangePlayIntegrityTokenRequest request =
                   new ExchangePlayIntegrityTokenRequest(integrityTokenResponse.token());
               return Tasks.call(
-                  backgroundExecutor,
+                  blockingExecutor,
                   () ->
                       networkClient.exchangeAttestationForAppCheckToken(
                           request.toJsonString().getBytes(UTF_8),
@@ -100,7 +99,7 @@ private Task<IntegrityTokenResponse> getPlayIntegrityAttestation() {
         new GeneratePlayIntegrityChallengeRequest();
     Task<GeneratePlayIntegrityChallengeResponse> generateChallengeTask =
         Tasks.call(
-            backgroundExecutor,
+            blockingExecutor,
             () ->
                 GeneratePlayIntegrityChallengeResponse.fromJsonString(
                     networkClient.generatePlayIntegrityChallenge(

appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/FirebaseAppCheckPlayIntegrityRegistrarTest.java

@@ -17,9 +17,12 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.Dependency;
+import com.google.firebase.components.Qualified;
 import java.util.List;
+import java.util.concurrent.Executor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -35,7 +38,9 @@ public void testGetComponents() {
     assertThat(components).hasSize(2);
     Component<?> appCheckPlayIntegrityComponent = components.get(0);
     assertThat(appCheckPlayIntegrityComponent.getDependencies())
-        .containsExactly(Dependency.required(FirebaseApp.class));
+        .containsExactly(
+            Dependency.required(FirebaseApp.class),
+            Dependency.required(Qualified.qualified(Blocking.class, Executor.class)));
     assertThat(appCheckPlayIntegrityComponent.isLazy()).isTrue();
   }
 }

appcheck/firebase-appcheck-playintegrity/src/test/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProviderTest.java

@@ -34,8 +34,9 @@
 import com.google.firebase.appcheck.internal.DefaultAppCheckToken;
 import com.google.firebase.appcheck.internal.NetworkClient;
 import com.google.firebase.appcheck.internal.RetryManager;
+import com.google.firebase.concurrent.TestOnlyExecutors;
 import java.io.IOException;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeoutException;
 import org.json.JSONObject;
 import org.junit.Before;
@@ -70,7 +71,8 @@ public class PlayIntegrityAppCheckProviderTest {
   @Captor private ArgumentCaptor<IntegrityTokenRequest> integrityTokenRequestCaptor;
   @Captor private ArgumentCaptor<byte[]> exchangePlayIntegrityTokenRequestCaptor;
 
-  private ExecutorService backgroundExecutor = MoreExecutors.newDirectExecutorService();
+  // TODO(b/258273630): Use TestOnlyExecutors instead of MoreExecutors.directExecutor().
+  private Executor backgroundExecutor = MoreExecutors.directExecutor();
 
   @Before
   public void setup() {
@@ -85,7 +87,7 @@ public void testPublicConstructor_nullFirebaseApp_expectThrows() {
     assertThrows(
         NullPointerException.class,
         () -> {
-          new PlayIntegrityAppCheckProvider(null);
+          new PlayIntegrityAppCheckProvider(null, TestOnlyExecutors.blocking());
         });
   }
 

appcheck/firebase-appcheck-safetynet/src/test/java/com/google/firebase/appcheck/safetynet/internal/SafetyNetAppCheckProviderTest.java

@@ -205,8 +205,7 @@ public void exchangeSafetyNetJwsForToken_onSuccess_setsTaskResult() throws Excep
     when(mockAppCheckTokenResponse.getToken()).thenReturn(APP_CHECK_TOKEN);
     when(mockAppCheckTokenResponse.getTimeToLive()).thenReturn(TIME_TO_LIVE);
 
-    // TODO(b/258273630): Use TestOnlyExecutors.background() instead of
-    // MoreExecutors.directExecutor().
+    // TODO(b/258273630): Use TestOnlyExecutors instead of MoreExecutors.directExecutor().
     SafetyNetAppCheckProvider provider =
         new SafetyNetAppCheckProvider(
             firebaseApp,
@@ -234,8 +233,7 @@ public void exchangeSafetyNetJwsForToken_onFailure_setsTaskException() throws Ex
             any(), eq(NetworkClient.SAFETY_NET), eq(mockRetryManager)))
         .thenThrow(new IOException());
 
-    // TODO(b/258273630): Use TestOnlyExecutors.background() instead of
-    // MoreExecutors.directExecutor().
+    // TODO(b/258273630): Use TestOnlyExecutors instead of MoreExecutors.directExecutor().
     SafetyNetAppCheckProvider provider =
         new SafetyNetAppCheckProvider(
             firebaseApp,