Resolves comments

Author: hiteshmaurya56

appcheck/firebase-appcheck-recaptchaenterprise/firebase-appcheck-recaptchaenterprise.gradle

@@ -60,4 +60,5 @@ dependencies {
     testImplementation libs.junit
     testImplementation libs.mockito.core
     testImplementation libs.robolectric
+    testImplementation libs.org.json
 }

appcheck/firebase-appcheck-recaptchaenterprise/src/main/java/com/google/firebase/appcheck/recaptchaenterprise/FirebaseAppCheckRecaptchaEnterpriseRegistrar.java

@@ -14,9 +14,7 @@
 
 package com.google.firebase.appcheck.recaptchaenterprise;
 
-import android.app.Application;
 import com.google.android.gms.common.annotation.KeepForSdk;
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.appcheck.recaptchaenterprise.internal.FirebaseExecutors;
@@ -45,15 +43,6 @@ public List<Component<?>> getComponents() {
     Qualified<Executor> blockingExecutor = Qualified.qualified(Blocking.class, Executor.class);
 
     return Arrays.asList(
-        Component.builder(Application.class)
-            .name(LIBRARY_NAME)
-            .add(Dependency.required(FirebaseApp.class))
-            .factory(
-                container -> {
-                  FirebaseApp firebaseApp = container.get(FirebaseApp.class);
-                  return (Application) firebaseApp.getApplicationContext();
-                })
-            .build(),
         Component.builder(FirebaseExecutors.class)
             .name(LIBRARY_NAME)
             .add(Dependency.required(liteExecutor))

appcheck/firebase-appcheck-recaptchaenterprise/src/main/java/com/google/firebase/appcheck/recaptchaenterprise/RecaptchaEnterpriseAppCheckProviderFactory.java

@@ -44,17 +44,8 @@ private RecaptchaEnterpriseAppCheckProviderFactory(@NonNull String siteKey) {
   /** Gets an instance of this class for installation into a {@link FirebaseAppCheck} instance. */
   @NonNull
   public static RecaptchaEnterpriseAppCheckProviderFactory getInstance(@NonNull String siteKey) {
-    RecaptchaEnterpriseAppCheckProviderFactory factory = factoryInstances.get(siteKey);
-    if (factory == null) {
-      synchronized (factoryInstances) {
-        factory = factoryInstances.get(siteKey);
-        if (factory == null) {
-          factory = new RecaptchaEnterpriseAppCheckProviderFactory(siteKey);
-          factoryInstances.put(siteKey, factory);
-        }
-      }
-    }
-    return factory;
+    return factoryInstances.computeIfAbsent(
+        siteKey, RecaptchaEnterpriseAppCheckProviderFactory::new);
   }
 
   @NonNull
@@ -67,7 +58,7 @@ public AppCheckProvider create(@NonNull FirebaseApp firebaseApp) {
           if (RecaptchaEnterpriseAppCheckProviderFactory.firebaseExecutors == null) {
             firebaseExecutors = firebaseApp.get(FirebaseExecutors.class);
           }
-          Application application = firebaseApp.get(Application.class);
+          Application application = (Application) firebaseApp.getApplicationContext();
 
           provider =
               new RecaptchaEnterpriseAppCheckProvider(

appcheck/firebase-appcheck-recaptchaenterprise/src/main/java/com/google/firebase/appcheck/recaptchaenterprise/internal/RecaptchaEnterpriseAppCheckProvider.java

@@ -43,18 +43,20 @@
  *
  * <ol>
  *   <li>Obtain a reCAPTCHA token via {@code RecaptchaTasksClient}.
- *   <li>Exchange the reCAPTCHA token with the Firebase App Check backend using {@link
- *       NetworkClient} to receive a Firebase App Check token.
+ *   <li>Exchange the reCAPTCHA token with the Firebase App Check backend to receive a Firebase App
+ *       Check token.
  * </ol>
  */
 public class RecaptchaEnterpriseAppCheckProvider implements AppCheckProvider {
 
   private final RecaptchaAction recaptchaAction = RecaptchaAction.custom("fire_app_check");
-  private final Task<RecaptchaTasksClient> recaptchaTasksClientTask;
+  private volatile Task<RecaptchaTasksClient> recaptchaTasksClientTask;
   private final Executor liteExecutor;
   private final Executor blockingExecutor;
   private final RetryManager retryManager;
   private final NetworkClient networkClient;
+  private String siteKey;
+  private Application application;
   private static final String TAG = "rCEAppCheckProvider";
 
   public RecaptchaEnterpriseAppCheckProvider(
@@ -63,11 +65,12 @@ public RecaptchaEnterpriseAppCheckProvider(
       @NonNull String siteKey,
       @Lightweight Executor liteExecutor,
       @Blocking Executor blockingExecutor) {
+    this.application = application;
+    this.siteKey = siteKey;
     this.liteExecutor = liteExecutor;
     this.blockingExecutor = blockingExecutor;
     this.retryManager = new RetryManager();
     this.networkClient = new NetworkClient(firebaseApp);
-    recaptchaTasksClientTask = Recaptcha.fetchTaskClient(application, siteKey);
   }
 
   @VisibleForTesting
@@ -111,6 +114,13 @@ public Task<AppCheckToken> getToken() {
 
   @NonNull
   private Task<String> getRecaptchaEnterpriseAttestation() {
+    if (recaptchaTasksClientTask == null) {
+      synchronized (this) {
+        if (recaptchaTasksClientTask == null) {
+          recaptchaTasksClientTask = Recaptcha.fetchTaskClient(application, siteKey);
+        }
+      }
+    }
     return recaptchaTasksClientTask.continueWithTask(
         blockingExecutor,
         task -> {

appcheck/firebase-appcheck-recaptchaenterprise/src/test/java/com/google/firebase/appcheck/recaptchaenterprise/internal/ExchangeRecaptchaEnterpriseTokenRequestTest.java

@@ -18,11 +18,8 @@
 
 import org.json.JSONObject;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
 
 /** Tests for {@link ExchangeRecaptchaEnterpriseTokenRequest}. */
-@RunWith(RobolectricTestRunner.class)
 public class ExchangeRecaptchaEnterpriseTokenRequestTest {
   private static final String RECAPTCHA_ENTERPRISE_TOKEN = "recaptchaEnterpriseToken";