Rename ConfigMetadataClient to ConfigSharedPrefsClient in a different pull request.

Author: tusharkhandelwal8

firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/TestConstructorUtil.kt

@@ -24,26 +24,26 @@ import com.google.firebase.remoteconfig.internal.ConfigCacheClient
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import java.util.concurrent.Executor
 
 // This method is a workaround for testing. It enable us to create a FirebaseRemoteConfig object
 // with mocks using the package-private constructor.
 fun createRemoteConfig(
-  context: Context?,
-  firebaseApp: FirebaseApp,
-  firebaseInstallations: FirebaseInstallationsApi,
-  firebaseAbt: FirebaseABTesting?,
-  executor: Executor,
-  fetchedConfigsCache: ConfigCacheClient,
-  activatedConfigsCache: ConfigCacheClient,
-  defaultConfigsCache: ConfigCacheClient,
-  fetchHandler: ConfigFetchHandler,
-  getHandler: ConfigGetParameterHandler,
-  frcMetadata: ConfigSharedPrefsClient,
-  realtimeHandler: ConfigRealtimeHandler,
-  rolloutsStateSubscriptionsHandler: RolloutsStateSubscriptionsHandler
+    context: Context?,
+    firebaseApp: FirebaseApp,
+    firebaseInstallations: FirebaseInstallationsApi,
+    firebaseAbt: FirebaseABTesting?,
+    executor: Executor,
+    fetchedConfigsCache: ConfigCacheClient,
+    activatedConfigsCache: ConfigCacheClient,
+    defaultConfigsCache: ConfigCacheClient,
+    fetchHandler: ConfigFetchHandler,
+    getHandler: ConfigGetParameterHandler,
+    frcMetadata: ConfigMetadataClient,
+    realtimeHandler: ConfigRealtimeHandler,
+    rolloutsStateSubscriptionsHandler: RolloutsStateSubscriptionsHandler
 ): FirebaseRemoteConfig {
   return FirebaseRemoteConfig(
     context,

firebase-config/ktx/src/test/kotlin/com/google/firebase/remoteconfig/ktx/RemoteConfigTests.kt

@@ -33,7 +33,7 @@ import com.google.firebase.remoteconfig.internal.ConfigCacheClient
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import org.junit.After
 import org.junit.Before
@@ -142,7 +142,7 @@ class ConfigTests : BaseTestCase() {
         defaultConfigsCache = mock(ConfigCacheClient::class.java),
         fetchHandler = mock(ConfigFetchHandler::class.java),
         getHandler = mockGetHandler,
-        frcMetadata = mock(ConfigSharedPrefsClient::class.java),
+        frcMetadata = mock(ConfigMetadataClient::class.java),
         realtimeHandler = mock(ConfigRealtimeHandler::class.java),
         rolloutsStateSubscriptionsHandler = mock(RolloutsStateSubscriptionsHandler::class.java)
       )

firebase-config/src/androidTest/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigIntegrationTest.java

@@ -36,7 +36,7 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
 import java.util.Date;
 import java.util.HashMap;
@@ -60,7 +60,7 @@ public class FirebaseRemoteConfigIntegrationTest {
   @Mock private ConfigCacheClient mockDefaultsCache;
   @Mock private ConfigFetchHandler mockFetchHandler;
   @Mock private ConfigGetParameterHandler mockGetHandler;
-  @Mock private ConfigSharedPrefsClient metadataClient;
+  @Mock private ConfigMetadataClient metadataClient;
   @Mock private ConfigRealtimeHandler mockConfigRealtimeHandler;
   @Mock private RolloutsStateSubscriptionsHandler mockRolloutsStateSubscriptionHandler;
 

firebase-config/src/main/java/com/google/firebase/remoteconfig/FirebaseRemoteConfig.java

@@ -34,7 +34,7 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler.FetchResponse;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient;
 import com.google.firebase.remoteconfig.internal.DefaultsXmlParser;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
 import java.util.ArrayList;
@@ -160,7 +160,7 @@ public static FirebaseRemoteConfig getInstance(@NonNull FirebaseApp app) {
   private final ConfigCacheClient defaultConfigsCache;
   private final ConfigFetchHandler fetchHandler;
   private final ConfigGetParameterHandler getHandler;
-  private final ConfigSharedPrefsClient frcMetadata;
+  private final ConfigMetadataClient frcMetadata;
   private final FirebaseInstallationsApi firebaseInstallations;
   private final ConfigRealtimeHandler configRealtimeHandler;
   private final RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler;
@@ -181,7 +181,7 @@ public static FirebaseRemoteConfig getInstance(@NonNull FirebaseApp app) {
       ConfigCacheClient defaultConfigsCache,
       ConfigFetchHandler fetchHandler,
       ConfigGetParameterHandler getHandler,
-      ConfigSharedPrefsClient frcMetadata,
+      ConfigMetadataClient frcMetadata,
       ConfigRealtimeHandler configRealtimeHandler,
       RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler) {
     this.context = context;

firebase-config/src/main/java/com/google/firebase/remoteconfig/RemoteConfigComponent.java

@@ -37,7 +37,7 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHttpClient;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient;
 import com.google.firebase.remoteconfig.internal.ConfigStorageClient;
 import com.google.firebase.remoteconfig.internal.Personalization;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateFactory;
@@ -166,7 +166,7 @@ public synchronized FirebaseRemoteConfig get(String namespace) {
     ConfigCacheClient fetchedCacheClient = getCacheClient(namespace, FETCH_FILE_NAME);
     ConfigCacheClient activatedCacheClient = getCacheClient(namespace, ACTIVATE_FILE_NAME);
     ConfigCacheClient defaultsCacheClient = getCacheClient(namespace, DEFAULTS_FILE_NAME);
-    ConfigSharedPrefsClient metadataClient = getMetadataClient(context, appId, namespace);
+    ConfigMetadataClient metadataClient = getMetadataClient(context, appId, namespace);
 
     ConfigGetParameterHandler getHandler = getGetHandler(activatedCacheClient, defaultsCacheClient);
     Personalization personalization =
@@ -206,7 +206,7 @@ synchronized FirebaseRemoteConfig get(
       ConfigCacheClient defaultsClient,
       ConfigFetchHandler fetchHandler,
       ConfigGetParameterHandler getHandler,
-      ConfigSharedPrefsClient metadataClient,
+      ConfigMetadataClient metadataClient,
       RolloutsStateSubscriptionsHandler rolloutsStateSubscriptionsHandler) {
     if (!frcNamespaceInstances.containsKey(namespace)) {
       FirebaseRemoteConfig in =
@@ -254,7 +254,7 @@ private ConfigCacheClient getCacheClient(String namespace, String configStoreTyp
 
   @VisibleForTesting
   ConfigFetchHttpClient getFrcBackendApiClient(
-      String apiKey, String namespace, ConfigSharedPrefsClient metadataClient) {
+      String apiKey, String namespace, ConfigMetadataClient metadataClient) {
     String appId = firebaseApp.getOptions().getApplicationId();
     return new ConfigFetchHttpClient(
         context,
@@ -270,7 +270,7 @@ ConfigFetchHttpClient getFrcBackendApiClient(
   synchronized ConfigFetchHandler getFetchHandler(
       String namespace,
       ConfigCacheClient fetchedCacheClient,
-      ConfigSharedPrefsClient metadataClient) {
+      ConfigMetadataClient metadataClient) {
     return new ConfigFetchHandler(
         firebaseInstallations,
         isPrimaryApp(firebaseApp) ? analyticsConnector : () -> null,
@@ -290,7 +290,7 @@ synchronized ConfigRealtimeHandler getRealtime(
       ConfigCacheClient activatedCacheClient,
       Context context,
       String namespace,
-      ConfigSharedPrefsClient metadataClient) {
+      ConfigMetadataClient metadataClient) {
     return new ConfigRealtimeHandler(
         firebaseApp,
         firebaseInstallations,
@@ -308,14 +308,14 @@ private ConfigGetParameterHandler getGetHandler(
   }
 
   @VisibleForTesting
-  static ConfigSharedPrefsClient getMetadataClient(
+  static ConfigMetadataClient getMetadataClient(
       Context context, String appId, String namespace) {
     String fileName =
         String.format(
             "%s_%s_%s_%s",
             FIREBASE_REMOTE_CONFIG_FILE_NAME_PREFIX, appId, namespace, PREFERENCES_FILE_NAME);
     SharedPreferences preferences = context.getSharedPreferences(fileName, Context.MODE_PRIVATE);
-    return new ConfigSharedPrefsClient(preferences);
+    return new ConfigMetadataClient(preferences);
   }
 
   @Nullable

firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandler.java

@@ -14,7 +14,7 @@
 
 package com.google.firebase.remoteconfig.internal;
 
-import static com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.LAST_FETCH_TIME_NO_FETCH_YET;
+import static com.google.firebase.remoteconfig.internal.ConfigMetadataClient.LAST_FETCH_TIME_NO_FETCH_YET;
 import static java.net.HttpURLConnection.HTTP_BAD_GATEWAY;
 import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
 import static java.net.HttpURLConnection.HTTP_GATEWAY_TIMEOUT;
@@ -43,7 +43,7 @@
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigFetchThrottledException;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigServerException;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler.FetchResponse.Status;
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.BackoffMetadata;
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient.BackoffMetadata;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.HttpURLConnection;
@@ -96,7 +96,7 @@ public class ConfigFetchHandler {
   private final Random randomGenerator;
   private final ConfigCacheClient fetchedConfigsCache;
   private final ConfigFetchHttpClient frcBackendApiClient;
-  private final ConfigSharedPrefsClient frcMetadata;
+  private final ConfigMetadataClient frcMetadata;
 
   private final Map<String, String> customHttpHeaders;
 
@@ -109,7 +109,7 @@ public ConfigFetchHandler(
       Random randomGenerator,
       ConfigCacheClient fetchedConfigsCache,
       ConfigFetchHttpClient frcBackendApiClient,
-      ConfigSharedPrefsClient frcMetadata,
+      ConfigMetadataClient frcMetadata,
       Map<String, String> customHttpHeaders) {
     this.firebaseInstallations = firebaseInstallations;
     this.analyticsConnector = analyticsConnector;
@@ -124,7 +124,7 @@ public ConfigFetchHandler(
 
   /**
    * Calls {@link #fetch(long)} with the {@link
-   * ConfigSharedPrefsClient#getMinimumFetchIntervalInSeconds()}.
+   * ConfigMetadataClient#getMinimumFetchIntervalInSeconds()}.
    */
   public Task<FetchResponse> fetch() {
     return fetch(frcMetadata.getMinimumFetchIntervalInSeconds());
@@ -228,7 +228,7 @@ public Task<FetchResponse> fetchNowWithTypeAndAttemptNumber(
    * currently throttled.
    *
    * <p>If a fetch request is made to the backend, updates the last fetch status, last successful
-   * fetch time and {@link BackoffMetadata} in {@link ConfigSharedPrefsClient}.
+   * fetch time and {@link BackoffMetadata} in {@link ConfigMetadataClient}.
    */
   private Task<FetchResponse> fetchIfCacheExpiredAndNotThrottled(
       Task<ConfigContainer> cachedFetchConfigsTask,

firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigSharedPrefsClient.java renamed to firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigMetadataClient.java

@@ -44,7 +44,7 @@
  *
  * @author Miraziz Yusupov
  */
-public class ConfigSharedPrefsClient {
+public class ConfigMetadataClient {
   @Retention(SOURCE)
   @IntDef({
     LAST_FETCH_STATUS_SUCCESS,
@@ -88,7 +88,7 @@ public class ConfigSharedPrefsClient {
   private final Object realtimeBackoffMetadataLock;
   private final Object customSignalsLock;
 
-  public ConfigSharedPrefsClient(SharedPreferences frcMetadata) {
+  public ConfigMetadataClient(SharedPreferences frcMetadata) {
     this.frcMetadata = frcMetadata;
     this.frcInfoLock = new Object();
     this.backoffMetadataLock = new Object();

firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigRealtimeHandler.java

@@ -39,7 +39,7 @@ public class ConfigRealtimeHandler {
   private final ConfigCacheClient activatedCacheClient;
   private final Context context;
   private final String namespace;
-  private final ConfigSharedPrefsClient metadataClient;
+  private final ConfigMetadataClient metadataClient;
   private final ScheduledExecutorService scheduledExecutorService;
 
   public ConfigRealtimeHandler(
@@ -49,7 +49,7 @@ public ConfigRealtimeHandler(
       ConfigCacheClient activatedCacheClient,
       Context context,
       String namespace,
-      ConfigSharedPrefsClient metadataClient,
+      ConfigMetadataClient metadataClient,
       ScheduledExecutorService scheduledExecutorService) {
 
     this.listeners = new LinkedHashSet<>();

firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/ConfigRealtimeHttpClient.java

@@ -110,7 +110,7 @@ public class ConfigRealtimeHttpClient {
   private final String namespace;
   private final Random random;
   private final Clock clock;
-  private final ConfigSharedPrefsClient metadataClient;
+  private final ConfigMetadataClient metadataClient;
 
   public ConfigRealtimeHttpClient(
       FirebaseApp firebaseApp,
@@ -120,7 +120,7 @@ public ConfigRealtimeHttpClient(
       Context context,
       String namespace,
       Set<ConfigUpdateListener> listeners,
-      ConfigSharedPrefsClient metadataClient,
+      ConfigMetadataClient metadataClient,
       ScheduledExecutorService scheduledExecutorService) {
 
     this.listeners = listeners;
@@ -473,7 +473,7 @@ public void beginRealtimeHttpStream() {
       return;
     }
 
-    ConfigSharedPrefsClient.RealtimeBackoffMetadata backoffMetadata =
+    ConfigMetadataClient.RealtimeBackoffMetadata backoffMetadata =
         metadataClient.getRealtimeBackoffMetadata();
     Date currentTime = new Date(clock.currentTimeMillis());
     if (currentTime.before(backoffMetadata.getBackoffEndTime())) {

firebase-config/src/main/java/com/google/firebase/remoteconfig/internal/FirebaseRemoteConfigInfoImpl.java

@@ -16,7 +16,7 @@
 
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient.LastFetchStatus;
+import com.google.firebase.remoteconfig.internal.ConfigMetadataClient.LastFetchStatus;
 
 /**
  * Impl class for FirebaseRemoteConfigInfo.