Remove the builder in RemoteConfig.java

Author: lahirumaramba

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

@@ -20,8 +20,6 @@
 
 import com.google.api.core.ApiFuture;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.ImplFirebaseTrampolines;
 import com.google.firebase.internal.CallableOperation;
@@ -37,11 +35,16 @@ public final class FirebaseRemoteConfig {
 
   private static final String SERVICE_ID = FirebaseRemoteConfig.class.getName();
   private final FirebaseApp app;
-  private final Supplier<? extends FirebaseRemoteConfigClient> remoteConfigClient;
+  private final FirebaseRemoteConfigClient remoteConfigClient;
 
-  private FirebaseRemoteConfig(Builder builder) {
-    this.app = checkNotNull(builder.firebaseApp);
-    this.remoteConfigClient = Suppliers.memoize(builder.remoteConfigClient);
+  @VisibleForTesting
+  FirebaseRemoteConfig(FirebaseApp app, FirebaseRemoteConfigClient client) {
+    this.app = checkNotNull(app);
+    this.remoteConfigClient = checkNotNull(client);
+  }
+
+  private FirebaseRemoteConfig(FirebaseApp app) {
+    this(app, FirebaseRemoteConfigClientImpl.fromApp(app));
   }
 
   /**
@@ -99,23 +102,11 @@ protected RemoteConfigTemplate execute() throws FirebaseRemoteConfigException {
 
   @VisibleForTesting
   FirebaseRemoteConfigClient getRemoteConfigClient() {
-    return remoteConfigClient.get();
+    return remoteConfigClient;
   }
 
   private static FirebaseRemoteConfig fromApp(final FirebaseApp app) {
-    return FirebaseRemoteConfig.builder()
-            .setFirebaseApp(app)
-            .setRemoteConfigClient(new Supplier<FirebaseRemoteConfigClient>() {
-              @Override
-              public FirebaseRemoteConfigClient get() {
-                return FirebaseRemoteConfigClientImpl.fromApp(app);
-              }
-            })
-            .build();
-  }
-
-  static Builder builder() {
-    return new Builder();
+    return new FirebaseRemoteConfig(app);
   }
 
   private static class FirebaseRemoteConfigService extends FirebaseService<FirebaseRemoteConfig> {
@@ -131,27 +122,4 @@ public void destroy() {
       // will hit FirebaseApp, which will throw once the app is deleted.
     }
   }
-
-  static class Builder {
-
-    private FirebaseApp firebaseApp;
-    private Supplier<? extends FirebaseRemoteConfigClient> remoteConfigClient;
-
-    private Builder() { }
-
-    FirebaseRemoteConfig.Builder setFirebaseApp(FirebaseApp firebaseApp) {
-      this.firebaseApp = firebaseApp;
-      return this;
-    }
-
-    FirebaseRemoteConfig.Builder setRemoteConfigClient(
-            Supplier<? extends FirebaseRemoteConfigClient> remoteConfigClient) {
-      this.remoteConfigClient = remoteConfigClient;
-      return this;
-    }
-
-    FirebaseRemoteConfig build() {
-      return new FirebaseRemoteConfig(this);
-    }
-  }
 }

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

@@ -17,12 +17,11 @@
 package com.google.firebase.remoteconfig;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
 import com.google.firebase.ErrorCode;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
@@ -33,6 +32,7 @@
 import org.junit.Test;
 
 public class FirebaseRemoteConfigTest {
+
   private static final FirebaseOptions TEST_OPTIONS = FirebaseOptions.builder()
           .setCredentials(new MockGoogleCredentials("test-token"))
           .setProjectId("test-project")
@@ -77,14 +77,16 @@ public void testDefaultRemoteConfigClient() {
   }
 
   @Test
-  public void testPostDeleteApp() {
+  public void testAppDelete() {
     FirebaseApp app = FirebaseApp.initializeApp(TEST_OPTIONS, "custom-app");
+    FirebaseRemoteConfig remoteConfig = FirebaseRemoteConfig.getInstance(app);
+    assertNotNull(remoteConfig);
 
     app.delete();
 
     try {
       FirebaseRemoteConfig.getInstance(app);
-      fail("No error thrown for deleted app");
+      fail("No error thrown when getting remote config instance after deleting app");
     } catch (IllegalStateException expected) {
       // expected
     }
@@ -96,10 +98,9 @@ public void testRemoteConfigClientWithoutProjectId() {
             .setCredentials(new MockGoogleCredentials("test-token"))
             .build();
     FirebaseApp.initializeApp(options);
-    FirebaseRemoteConfig remoteConfig = FirebaseRemoteConfig.getInstance();
 
     try {
-      remoteConfig.getRemoteConfigClient();
+      FirebaseRemoteConfig.getInstance();
       fail("No error thrown for missing project ID");
     } catch (IllegalArgumentException expected) {
       String message = "Project ID is required to access Remote Config service. Use a service "
@@ -116,7 +117,7 @@ public void testRemoteConfigClientWithoutProjectId() {
   public void testGetTemplate() throws FirebaseRemoteConfigException {
     MockRemoteConfigClient client = MockRemoteConfigClient.fromTemplate(
             new RemoteConfigTemplate().setETag(TEST_ETAG));
-    FirebaseRemoteConfig remoteConfig = getRemoteConfig(Suppliers.ofInstance(client));
+    FirebaseRemoteConfig remoteConfig = getRemoteConfig(client);
 
     RemoteConfigTemplate template = remoteConfig.getTemplate();
 
@@ -126,7 +127,7 @@ public void testGetTemplate() throws FirebaseRemoteConfigException {
   @Test
   public void testGetTemplateFailure() {
     MockRemoteConfigClient client = MockRemoteConfigClient.fromException(TEST_EXCEPTION);
-    FirebaseRemoteConfig remoteConfig = getRemoteConfig(Suppliers.ofInstance(client));
+    FirebaseRemoteConfig remoteConfig = getRemoteConfig(client);
 
     try {
       remoteConfig.getTemplate();
@@ -139,7 +140,7 @@ public void testGetTemplateFailure() {
   public void testGetTemplateAsync() throws Exception {
     MockRemoteConfigClient client = MockRemoteConfigClient.fromTemplate(
             new RemoteConfigTemplate().setETag(TEST_ETAG));
-    FirebaseRemoteConfig remoteConfig = getRemoteConfig(Suppliers.ofInstance(client));
+    FirebaseRemoteConfig remoteConfig = getRemoteConfig(client);
 
     RemoteConfigTemplate template = remoteConfig.getTemplateAsync().get();
 
@@ -149,7 +150,7 @@ public void testGetTemplateAsync() throws Exception {
   @Test
   public void testGetTemplateAsyncFailure() throws InterruptedException {
     MockRemoteConfigClient client = MockRemoteConfigClient.fromException(TEST_EXCEPTION);
-    FirebaseRemoteConfig remoteConfig = getRemoteConfig(Suppliers.ofInstance(client));
+    FirebaseRemoteConfig remoteConfig = getRemoteConfig(client);
 
     try {
       remoteConfig.getTemplateAsync().get();
@@ -158,12 +159,8 @@ public void testGetTemplateAsyncFailure() throws InterruptedException {
     }
   }
 
-  private FirebaseRemoteConfig getRemoteConfig(
-          Supplier<? extends FirebaseRemoteConfigClient> supplier) {
+  private FirebaseRemoteConfig getRemoteConfig(FirebaseRemoteConfigClient client) {
     FirebaseApp app = FirebaseApp.initializeApp(TEST_OPTIONS);
-    return FirebaseRemoteConfig.builder()
-            .setFirebaseApp(app)
-            .setRemoteConfigClient(supplier)
-            .build();
+    return new FirebaseRemoteConfig(app, client);
   }
 }