Fix lint and build errors.

Author: tusharkhandelwal8

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

@@ -35,8 +35,8 @@
 import com.google.firebase.remoteconfig.internal.ConfigContainer;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
 import java.util.Date;
 import java.util.HashMap;

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

@@ -33,8 +33,8 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler.FetchResponse;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.DefaultsXmlParser;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
 import java.util.ArrayList;
@@ -667,11 +667,11 @@ private Task<Void> setDefaultsWithStringsMapAsync(Map<String, String> defaultsSt
   @NonNull
   public Task<Void> setCustomSignals(@NonNull Map<String, Object> customSignals) {
     return Tasks.call(
-            executor,
-            () -> {
-              frcMetadata.setCustomSignals(customSignals);
-              return null;
-            });
+        executor,
+        () -> {
+          frcMetadata.setCustomSignals(customSignals);
+          return null;
+        });
   }
 
   /**

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

@@ -36,8 +36,8 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHttpClient;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.ConfigStorageClient;
 import com.google.firebase.remoteconfig.internal.Personalization;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateFactory;
@@ -268,7 +268,9 @@ ConfigFetchHttpClient getFrcBackendApiClient(
 
   @VisibleForTesting
   synchronized ConfigFetchHandler getFetchHandler(
-      String namespace, ConfigCacheClient fetchedCacheClient, ConfigSharedPrefsClient metadataClient) {
+      String namespace,
+      ConfigCacheClient fetchedCacheClient,
+      ConfigSharedPrefsClient metadataClient) {
     return new ConfigFetchHandler(
         firebaseInstallations,
         isPrimaryApp(firebaseApp) ? analyticsConnector : () -> null,
@@ -306,7 +308,8 @@ private ConfigGetParameterHandler getGetHandler(
   }
 
   @VisibleForTesting
-  static ConfigSharedPrefsClient getMetadataClient(Context context, String appId, String namespace) {
+  static ConfigSharedPrefsClient getMetadataClient(
+      Context context, String appId, String namespace) {
     String fileName =
         String.format(
             "%s_%s_%s_%s",

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

@@ -308,7 +308,7 @@ private JSONObject createFetchRequestBody(
       String installationAuthToken,
       Map<String, String> analyticsUserProperties,
       Long firstOpenTime)
-          throws FirebaseRemoteConfigClientException {
+      throws FirebaseRemoteConfigClientException {
     Map<String, Object> requestBodyMap = new HashMap<>();
 
     if (installationId == null) {

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

@@ -30,16 +30,13 @@
 import androidx.annotation.WorkerThread;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo;
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.lang.annotation.Retention;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Objects;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 /**
  * Client for handling Firebase Remote Config (FRC) metadata that is saved to disk and persisted
@@ -265,17 +262,25 @@ public void setCustomSignals(Map<String, Object> newCustomSignals) {
       // Retrieve existing custom signals
       Map<String, Object> existingCustomSignals = getCustomSignals();
 
-      // Merge new signals with existing ones (new signals take precedence)
-      existingCustomSignals.putAll(newCustomSignals);
-
-      // Ignore key-value pairs with null values, which signify unset signals.
-      existingCustomSignals.values().removeIf(Objects::isNull);
+      for (Map.Entry<String, Object> entry : newCustomSignals.entrySet()) {
+        String key = entry.getKey();
+        Object value = entry.getValue();
+
+        // Merge new signals with existing ones, overwriting existing keys.
+        // Also, remove entries where the new value is null.
+        if (value != null) {
+          existingCustomSignals.put(key, value);
+        } else {
+          existingCustomSignals.remove(key);
+        }
+      }
       frcMetadata
-              .edit()
-              .putString(CUSTOM_SIGNALS, new JSONObject(existingCustomSignals).toString())
-              .commit();
+          .edit()
+          .putString(CUSTOM_SIGNALS, new JSONObject(existingCustomSignals).toString())
+          .commit();
     }
   }
+
   public Map<String, Object> getCustomSignals() {
     String jsonString = frcMetadata.getString(CUSTOM_SIGNALS, "{}");
     try {
@@ -292,7 +297,6 @@ public Map<String, Object> getCustomSignals() {
     }
   }
 
-
   void resetBackoff() {
     setBackoffMetadata(NO_FAILED_FETCHES, NO_BACKOFF_TIME);
   }

firebase-config/src/test/java/com/google/firebase/remoteconfig/FirebaseRemoteConfigTest.java

@@ -72,9 +72,9 @@
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler;
 import com.google.firebase.remoteconfig.internal.ConfigFetchHandler.FetchResponse;
 import com.google.firebase.remoteconfig.internal.ConfigGetParameterHandler;
-import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler;
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHttpClient;
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient;
 import com.google.firebase.remoteconfig.internal.FakeHttpURLConnection;
 import com.google.firebase.remoteconfig.internal.Personalization;
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler;
@@ -350,7 +350,8 @@ public void onError(@NonNull FirebaseRemoteConfigException error) {
             mockRetryListener,
             scheduledExecutorService);
     realtimeMetadataClient =
-        new ConfigSharedPrefsClient(context.getSharedPreferences("test_file", Context.MODE_PRIVATE));
+        new ConfigSharedPrefsClient(
+            context.getSharedPreferences("test_file", Context.MODE_PRIVATE));
     configRealtimeHttpClient =
         new ConfigRealtimeHttpClient(
             firebaseApp,

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

@@ -29,8 +29,8 @@ import com.google.firebase.platforminfo.UserAgentPublisher
 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.ConfigSharedPrefsClient
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient
 import com.google.firebase.remoteconfig.internal.rollouts.RolloutsStateSubscriptionsHandler
 import org.junit.After
 import org.junit.Before

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

@@ -23,27 +23,27 @@ import com.google.firebase.installations.FirebaseInstallationsApi
 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.ConfigSharedPrefsClient
 import com.google.firebase.remoteconfig.internal.ConfigRealtimeHandler
+import com.google.firebase.remoteconfig.internal.ConfigSharedPrefsClient
 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: ConfigSharedPrefsClient,
+  realtimeHandler: ConfigRealtimeHandler,
+  rolloutsStateSubscriptionsHandler: RolloutsStateSubscriptionsHandler
 ): FirebaseRemoteConfig {
   return FirebaseRemoteConfig(
     context,

firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHandlerTest.java

@@ -143,7 +143,8 @@ public void setUp() throws Exception {
     context = ApplicationProvider.getApplicationContext();
     mockClock = new MockClock(0L);
     metadataClient =
-        new ConfigSharedPrefsClient(context.getSharedPreferences("test_file", Context.MODE_PRIVATE));
+        new ConfigSharedPrefsClient(
+            context.getSharedPreferences("test_file", Context.MODE_PRIVATE));
 
     loadBackendApiClient();
     loadInstallationIdAndAuthToken();

firebase-config/src/test/java/com/google/firebase/remoteconfig/internal/ConfigFetchHttpClientTest.java

@@ -86,10 +86,10 @@ public class ConfigFetchHttpClientTest {
       "etag-" + PROJECT_NUMBER + "-" + DEFAULT_NAMESPACE + "-fetch-%d";
   private static final String FIRST_ETAG = String.format(ETAG_FORMAT, 1);
   private static final String SECOND_ETAG = String.format(ETAG_FORMAT, 2);
-  private static final Map<String, Object> SAMPLE_CUSTOM_SIGNALS = ImmutableMap.of(
+  private static final Map<String, Object> SAMPLE_CUSTOM_SIGNALS =
+      ImmutableMap.of(
           "subscription", "premium",
-          "age", "20"
-  );
+          "age", "20");
 
   private Context context;
   private ConfigFetchHttpClient configFetchHttpClient;
@@ -245,7 +245,7 @@ public void fetch_setsAllElementsOfRequestBody_sendsRequestBodyToServer() throws
     assertThat(requestBody.getJSONObject(ANALYTICS_USER_PROPERTIES).toString())
         .isEqualTo(new JSONObject(customUserProperties).toString());
     assertThat(requestBody.getJSONObject(CUSTOM_SIGNALS).toString())
-            .isEqualTo(new JSONObject(SAMPLE_CUSTOM_SIGNALS).toString());
+        .isEqualTo(new JSONObject(SAMPLE_CUSTOM_SIGNALS).toString());
   }
 
   @Test