Resolves comments

Author: hiteshmaurya56

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

@@ -46,11 +46,15 @@ android {
 }
 
 dependencies {
+    implementation(libs.dagger.dagger)
+
     api project(':appcheck:firebase-appcheck')
     api 'com.google.firebase:firebase-common'
     api 'com.google.firebase:firebase-components'
     api 'com.google.android.recaptcha:recaptcha:18.7.1'
 
+    annotationProcessor(libs.dagger.compiler)
+
     testImplementation(project(":integ-testing")) {
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'

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

@@ -15,13 +15,15 @@
 package com.google.firebase.appcheck.recaptchaenterprise;
 
 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;
+import com.google.firebase.appcheck.recaptchaenterprise.internal.ProviderMultiResourceComponent;
 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.appcheck.recaptchaenterprise.internal.DaggerProviderComponent;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import java.util.Arrays;
 import java.util.List;
@@ -43,14 +45,19 @@ public List<Component<?>> getComponents() {
     Qualified<Executor> blockingExecutor = Qualified.qualified(Blocking.class, Executor.class);
 
     return Arrays.asList(
-        Component.builder(FirebaseExecutors.class)
+        Component.builder(ProviderMultiResourceComponent.class)
             .name(LIBRARY_NAME)
+            .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(liteExecutor))
             .add(Dependency.required(blockingExecutor))
             .factory(
                 container ->
-                    new FirebaseExecutors(
-                        container.get(liteExecutor), container.get(blockingExecutor)))
+                    DaggerProviderComponent.builder()
+                        .setFirebaseApp(container.get(FirebaseApp.class))
+                        .setLiteExecutor(container.get(liteExecutor))
+                        .setBlockingExecutor(container.get(blockingExecutor))
+                        .build()
+                        .getMultiResourceComponent())
             .build(),
         LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }

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

@@ -14,13 +14,12 @@
 
 package com.google.firebase.appcheck.recaptchaenterprise;
 
-import android.app.Application;
 import androidx.annotation.NonNull;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.AppCheckProvider;
 import com.google.firebase.appcheck.AppCheckProviderFactory;
 import com.google.firebase.appcheck.FirebaseAppCheck;
-import com.google.firebase.appcheck.recaptchaenterprise.internal.FirebaseExecutors;
+import com.google.firebase.appcheck.recaptchaenterprise.internal.ProviderMultiResourceComponent;
 import com.google.firebase.appcheck.recaptchaenterprise.internal.RecaptchaEnterpriseAppCheckProvider;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -31,7 +30,6 @@
  */
 public class RecaptchaEnterpriseAppCheckProviderFactory implements AppCheckProviderFactory {
 
-  private static FirebaseExecutors firebaseExecutors;
   private static final Map<String, RecaptchaEnterpriseAppCheckProviderFactory> factoryInstances =
       new ConcurrentHashMap<>();
   private final String siteKey;
@@ -55,18 +53,9 @@ public AppCheckProvider create(@NonNull FirebaseApp firebaseApp) {
     if (provider == null) {
       synchronized (this) {
         if (provider == null) {
-          if (RecaptchaEnterpriseAppCheckProviderFactory.firebaseExecutors == null) {
-            firebaseExecutors = firebaseApp.get(FirebaseExecutors.class);
-          }
-          Application application = (Application) firebaseApp.getApplicationContext();
-
-          provider =
-              new RecaptchaEnterpriseAppCheckProvider(
-                  firebaseApp,
-                  application,
-                  siteKey,
-                  firebaseExecutors.getLiteExecutor(),
-                  firebaseExecutors.getBlockingExecutor());
+          ProviderMultiResourceComponent component =
+              firebaseApp.get(ProviderMultiResourceComponent.class);
+          provider = component.get(siteKey);
         }
       }
     }

appcheck/firebase-appcheck-recaptchaenterprise/src/main/java/com/google/firebase/appcheck/recaptchaenterprise/internal/FirebaseExecutors.java renamed to appcheck/firebase-appcheck-recaptchaenterprise/src/main/java/com/google/firebase/appcheck/recaptchaenterprise/internal/ProviderComponent.java

@@ -14,30 +14,34 @@
 
 package com.google.firebase.appcheck.recaptchaenterprise.internal;
 
+import com.google.firebase.FirebaseApp;
 import com.google.firebase.annotations.concurrent.Blocking;
 import com.google.firebase.annotations.concurrent.Lightweight;
 import java.util.concurrent.Executor;
+import javax.inject.Singleton;
+import dagger.BindsInstance;
+import dagger.Component;
+import dagger.Module;
 
-/**
- * This class encapsulates a {@link com.google.firebase.annotations.concurrent.Lightweight} executor
- * and a {@link com.google.firebase.annotations.concurrent.Blocking} executor, making them available
- * for various asynchronous operations related to reCAPTCHA Enterprise App Check.
- */
-public class FirebaseExecutors {
-  private final Executor liteExecutor;
-  private final Executor blockingExecutor;
-
-  public FirebaseExecutors(
-      @Lightweight Executor liteExecutor, @Blocking Executor blockingExecutor) {
-    this.liteExecutor = liteExecutor;
-    this.blockingExecutor = blockingExecutor;
-  }
+@Singleton
+@Component(modules = ProviderComponent.MainModule.class)
+public interface ProviderComponent {
+  ProviderMultiResourceComponent getMultiResourceComponent();
 
-  public Executor getLiteExecutor() {
-    return liteExecutor;
-  }
+  @Component.Builder
+  interface Builder {
+    @BindsInstance
+    Builder setFirebaseApp(FirebaseApp firebaseApp);
+
+    @BindsInstance
+    Builder setLiteExecutor(@Lightweight Executor liteExecutor);
 
-  public Executor getBlockingExecutor() {
-    return blockingExecutor;
+    @BindsInstance
+    Builder setBlockingExecutor(@Blocking Executor blockingExecutor);
+
+    ProviderComponent build();
   }
+
+  @Module
+  abstract class MainModule {}
 }

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

@@ -0,0 +1,48 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.firebase.appcheck.recaptchaenterprise.internal;
+
+import androidx.annotation.NonNull;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import dagger.assisted.Assisted;
+import dagger.assisted.AssistedFactory;
+
+/** Multi-resource container for RecaptchaEnterpriseAppCheckProvider */
+@Singleton
+public final class ProviderMultiResourceComponent {
+  private final RecaptchaEnterpriseAppCheckProviderFactory providerFactory;
+
+  private final Map<String, RecaptchaEnterpriseAppCheckProvider> instances =
+      new ConcurrentHashMap<>();
+
+  @Inject
+  ProviderMultiResourceComponent(RecaptchaEnterpriseAppCheckProviderFactory providerFactory) {
+    this.providerFactory = providerFactory;
+  }
+
+  @NonNull
+  public RecaptchaEnterpriseAppCheckProvider get(@NonNull String siteKey) {
+    return instances.computeIfAbsent(siteKey, providerFactory::create);
+  }
+
+  @AssistedFactory
+  interface RecaptchaEnterpriseAppCheckProviderFactory {
+    RecaptchaEnterpriseAppCheckProvider create(@Assisted String siteKey);
+  }
+}

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

@@ -34,6 +34,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.concurrent.Executor;
+import dagger.assisted.Assisted;
+import dagger.assisted.AssistedInject;
 
 /**
  * An implementation of {@link AppCheckProvider} that uses reCAPTCHA Enterprise for device
@@ -59,13 +61,13 @@ public class RecaptchaEnterpriseAppCheckProvider implements AppCheckProvider {
   private Application application;
   private static final String TAG = "rCEAppCheckProvider";
 
+  @AssistedInject
   public RecaptchaEnterpriseAppCheckProvider(
       @NonNull FirebaseApp firebaseApp,
-      @NonNull Application application,
-      @NonNull String siteKey,
+      @Assisted @NonNull String siteKey,
       @Lightweight Executor liteExecutor,
       @Blocking Executor blockingExecutor) {
-    this.application = application;
+    this.application = (Application) firebaseApp.getApplicationContext();
     this.siteKey = siteKey;
     this.liteExecutor = liteExecutor;
     this.blockingExecutor = blockingExecutor;

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

@@ -21,7 +21,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.app.Application;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.android.recaptcha.RecaptchaAction;
@@ -62,7 +61,6 @@ public class RecaptchaEnterpriseAppCheckProviderTest {
   private final String siteKey = "siteKey";
 
   @Mock private NetworkClient mockNetworkClient;
-  @Mock private Application mockApplication;
   @Mock FirebaseApp mockFirebaseApp;
   @Mock RecaptchaTasksClient mockRecaptchaTasksClient;
   @Mock RetryManager mockRetryManager;
@@ -82,7 +80,6 @@ public void testPublicConstructor_nullFirebaseApp_expectThrows() {
         () ->
             new RecaptchaEnterpriseAppCheckProvider(
                 null,
-                mockApplication,
                 siteKey,
                 TestOnlyExecutors.lite(),
                 TestOnlyExecutors.blocking()));
@@ -95,7 +92,6 @@ public void testPublicConstructor_nullSiteKey_expectThrows() {
         () ->
             new RecaptchaEnterpriseAppCheckProvider(
                 mockFirebaseApp,
-                mockApplication,
                 null,
                 TestOnlyExecutors.lite(),
                 TestOnlyExecutors.blocking()));