chore: Project housekeeping (#90)

* chore: Project housekeeping

* spotless

* wip

* wip init cleanup

* fix test

* all tests pass

* spotless

* fix welp

* remove shared prefs unused method

* info instead of warn

Author: felipecsl

Makefile

@@ -48,7 +48,7 @@ test: test-data
 	# $(INFO)Uninstalling old version of test app(END)
 	adb uninstall cloud.eppo.android.test
 	# $(INFO)Running tests(END)
-	./gradlew runEppoTests
+	./gradlew connectedCheck
 
 check-maven-credentials-and-publish:
 	# $(INFO)Checking required gradle configuration(END)

eppo/build.gradle

@@ -158,13 +158,6 @@ publishing {
     }
 }
 
-task runEppoTests(type: GradleBuild) {
-    tasks = [
-        ':eppo:testDebugUnitTest',
-        ':eppo:connectedDebugAndroidTest'
-    ]
-}
-
 // Custom task to ensure we can conditionally publish either a release or snapshot artifact
 // based on a command line switch. See github workflow files for more details on usage.
 task checkVersion {

eppo/src/androidTest/java/cloud/eppo/android/EppoClientTest.java

@@ -20,6 +20,7 @@
 
 import android.content.res.AssetManager;
 import android.util.Log;
+import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
 import cloud.eppo.android.helpers.AssignmentTestCase;
 import cloud.eppo.android.helpers.AssignmentTestCaseDeserializer;
@@ -37,7 +38,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -62,44 +62,50 @@ public class EppoClientTest {
       "https://us-central1-eppo-qa.cloudfunctions.net/serveGitHubRacTestFile";
   private static final String INVALID_HOST = "https://thisisabaddomainforthistest.com";
   private final ObjectMapper mapper = new ObjectMapper().registerModule(module());
-
   private AssignmentLogger mockAssignmentLogger;
 
   private void initClient(
       String host,
       boolean throwOnCallbackError,
       boolean shouldDeleteCacheFiles,
       boolean isGracefulMode,
+      boolean obfuscateConfig,
+      @Nullable EppoHttpClient httpClientOverride,
+      @Nullable ConfigurationStore configurationStoreOverride,
       String apiKey) {
     if (shouldDeleteCacheFiles) {
       clearCacheFile(apiKey);
     }
     mockAssignmentLogger = mock(AssignmentLogger.class);
     CountDownLatch lock = new CountDownLatch(1);
 
+    InitializationCallback callback =
+        new InitializationCallback() {
+          @Override
+          public void onCompleted() {
+            Log.i(TAG, "Test client onCompleted callback");
+            lock.countDown();
+          }
+
+          @Override
+          public void onError(String errorMessage) {
+            Log.w(TAG, "Test client onError callback");
+            if (throwOnCallbackError) {
+              throw new RuntimeException("Unable to initialize: " + errorMessage);
+            }
+            lock.countDown();
+          }
+        };
     new EppoClient.Builder()
         .application(ApplicationProvider.getApplicationContext())
         .apiKey(apiKey)
         .isGracefulMode(isGracefulMode)
         .host(host)
         .assignmentLogger(mockAssignmentLogger)
-        .callback(
-            new InitializationCallback() {
-              @Override
-              public void onCompleted() {
-                Log.w(TAG, "Test client onCompleted callback");
-                lock.countDown();
-              }
-
-              @Override
-              public void onError(String errorMessage) {
-                Log.w(TAG, "Test client onError callback");
-                if (throwOnCallbackError) {
-                  throw new RuntimeException("Unable to initialize: " + errorMessage);
-                }
-                lock.countDown();
-              }
-            })
+        .obfuscateConfig(obfuscateConfig)
+        .httpClient(httpClientOverride)
+        .configStore(configurationStoreOverride)
+        .callback(callback)
         .buildAndInit();
 
     // Wait for initialization to succeed or fail, up to 10 seconds, before continuing
@@ -120,10 +126,6 @@ public void cleanUp() {
     for (String apiKey : apiKeys) {
       clearCacheFile(apiKey);
     }
-    // Reset any development overrides
-    setIsConfigObfuscatedField(true);
-    setHttpClientOverrideField(null);
-    setConfigurationStoreOverrideField(null);
   }
 
   private void clearCacheFile(String apiKey) {
@@ -135,20 +137,19 @@ private void clearCacheFile(String apiKey) {
 
   @Test
   public void testUnobfuscatedAssignments() {
-    setIsConfigObfuscatedField(false);
-    initClient(TEST_HOST, true, true, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, true, true, false, false, null, null, DUMMY_API_KEY);
     runTestCases();
   }
 
   @Test
   public void testAssignments() {
-    initClient(TEST_HOST, true, true, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, true, true, false, true, null, null, DUMMY_API_KEY);
     runTestCases();
   }
 
   @Test
   public void testErrorGracefulModeOn() throws JSONException {
-    initClient(TEST_HOST, false, true, true, DUMMY_API_KEY);
+    initClient(TEST_HOST, false, true, true, true, null, null, DUMMY_API_KEY);
 
     EppoClient realClient = EppoClient.getInstance();
     EppoClient spyClient = spy(realClient);
@@ -200,7 +201,7 @@ public void testErrorGracefulModeOn() throws JSONException {
 
   @Test
   public void testErrorGracefulModeOff() {
-    initClient(TEST_HOST, false, true, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, false, true, false, true, null, null, DUMMY_API_KEY);
 
     EppoClient realClient = EppoClient.getInstance();
     EppoClient spyClient = spy(realClient);
@@ -277,15 +278,30 @@ private void runTestCases() {
   @Test
   public void testCachedAssignments() {
     // First initialize successfully
-    initClient(TEST_HOST, true, true, false, DUMMY_API_KEY); // ensure cache is populated
+    initClient(
+        TEST_HOST,
+        true,
+        true,
+        false,
+        false,
+        null,
+        null,
+        DUMMY_API_KEY); // ensure cache is populated
 
     // wait for a bit since cache file is written asynchronously
     waitForPopulatedCache();
 
     // Then reinitialize with a bad host so we know it's using the cached UFC built from the first
     // initialization
     initClient(
-        INVALID_HOST, false, false, false, DUMMY_API_KEY); // invalid host to force to use cache
+        INVALID_HOST,
+        false,
+        false,
+        false,
+        false,
+        null,
+        null,
+        DUMMY_API_KEY); // invalid host to force to use cache
 
     runTestCases();
   }
@@ -414,8 +430,7 @@ public void testInvalidConfigJSON() {
         .when(mockHttpClient)
         .get(anyString(), any(RequestCallback.class));
 
-    setHttpClientOverrideField(mockHttpClient);
-    initClient(TEST_HOST, true, true, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, true, true, false, false, mockHttpClient, null, DUMMY_API_KEY);
 
     String result =
         EppoClient.getInstance()
@@ -431,7 +446,7 @@ public void testCachedBadResponseRequiresFetch() {
             ApplicationProvider.getApplicationContext(), safeCacheKey(DUMMY_API_KEY));
     cacheFile.setContents("{ invalid }");
 
-    initClient(TEST_HOST, true, false, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, true, false, false, true, null, null, DUMMY_API_KEY);
 
     double assignment = EppoClient.getInstance().getDoubleAssignment("numeric_flag", "alice", 0.0);
     assertEquals(3.1415926, assignment, 0.0000001);
@@ -445,14 +460,14 @@ public void testEmptyFlagsResponseRequiresFetch() {
             ApplicationProvider.getApplicationContext(), safeCacheKey(DUMMY_API_KEY));
     cacheFile.setContents("{\"flags\": {}}");
 
-    initClient(TEST_HOST, true, false, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, true, false, false, true, null, null, DUMMY_API_KEY);
     double assignment = EppoClient.getInstance().getDoubleAssignment("numeric_flag", "alice", 0.0);
     assertEquals(3.1415926, assignment, 0.0000001);
   }
 
   @Test
   public void testDifferentCacheFilesPerKey() {
-    initClient(TEST_HOST, true, true, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, true, true, false, true, null, null, DUMMY_API_KEY);
     // API Key 1 will fetch and then populate its cache with the usual test data
     double apiKey1Assignment =
         EppoClient.getInstance().getDoubleAssignment("numeric_flag", "alice", 0.0);
@@ -495,15 +510,15 @@ public void testDifferentCacheFilesPerKey() {
             + "  }\n"
             + "}");
 
-    initClient(TEST_HOST, true, false, false, DUMMY_OTHER_API_KEY);
+    initClient(TEST_HOST, true, false, false, true, null, null, DUMMY_OTHER_API_KEY);
 
     // Ensure API key 2 uses its cache
     double apiKey2Assignment =
         EppoClient.getInstance().getDoubleAssignment("numeric_flag", "alice", 0.0);
     assertEquals(1.2345, apiKey2Assignment, 0.0000001);
 
     // Reinitialize API key 1 to be sure it used its cache
-    initClient(TEST_HOST, true, false, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, true, false, false, true, null, null, DUMMY_API_KEY);
     // API Key 1 will fetch and then populate its cache with the usual test data
     apiKey1Assignment = EppoClient.getInstance().getDoubleAssignment("numeric_flag", "alice", 0.0);
     assertEquals(3.1415926, apiKey1Assignment, 0.0000001);
@@ -531,8 +546,7 @@ protected FlagConfigResponse readCacheFile() {
           }
         };
 
-    setConfigurationStoreOverrideField(slowStore);
-    initClient(TEST_HOST, true, false, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, true, false, false, true, null, slowStore, DUMMY_API_KEY);
 
     // Give time for async slow cache read to finish
     try {
@@ -574,7 +588,7 @@ private void waitForPopulatedCache() {
   @Test
   public void testAssignmentEventCorrectlyCreated() {
     Date testStart = new Date();
-    initClient(TEST_HOST, true, false, false, DUMMY_API_KEY);
+    initClient(TEST_HOST, true, false, false, true, null, null, DUMMY_API_KEY);
     SubjectAttributes subjectAttributes = new SubjectAttributes();
     subjectAttributes.put("age", EppoValue.valueOf(30));
     subjectAttributes.put("employer", EppoValue.valueOf("Eppo"));
@@ -619,33 +633,6 @@ public void testAssignmentEventCorrectlyCreated() {
     assertEquals(expectedMeta, capturedAssignment.getMetaData());
   }
 
-  private void setHttpClientOverrideField(EppoHttpClient httpClient) {
-    setOverrideField("httpClientOverride", httpClient);
-  }
-
-  private void setConfigurationStoreOverrideField(ConfigurationStore configurationStore) {
-    setOverrideField("configurationStoreOverride", configurationStore);
-  }
-
-  /**
-   * @noinspection SameParameterValue
-   */
-  private void setIsConfigObfuscatedField(boolean isConfigObfuscated) {
-    setOverrideField("isConfigObfuscated", isConfigObfuscated);
-  }
-
-  private <T> void setOverrideField(String fieldName, T override) {
-    try {
-      // Use reflection to set the httpClientOverride field
-      Field httpClientOverrideField = EppoClient.class.getDeclaredField(fieldName);
-      httpClientOverrideField.setAccessible(true);
-      httpClientOverrideField.set(null, override);
-      httpClientOverrideField.setAccessible(false);
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   private static SimpleModule module() {
     SimpleModule module = new SimpleModule();
     module.addDeserializer(AssignmentTestCase.class, new AssignmentTestCaseDeserializer());

eppo/src/main/java/cloud/eppo/android/ConfigurationRequestor.java

@@ -3,6 +3,7 @@
 import static cloud.eppo.android.util.Utils.logTag;
 
 import android.util.Log;
+import androidx.annotation.Nullable;
 import cloud.eppo.ufc.dto.FlagConfig;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -19,7 +20,7 @@ public ConfigurationRequestor(ConfigurationStore configurationStore, EppoHttpCli
     this.client = client;
   }
 
-  public void load(InitializationCallback callback) {
+  public void load(@Nullable InitializationCallback callback) {
     // We have two at-bats to load the configuration: loading from cache and fetching
     // The below variables help them keep track of each other's progress
     AtomicBoolean cacheLoadInProgress = new AtomicBoolean(true);