Review comments

Author: samtstern

firebase-functions/src/androidTest/java/com/google/firebase/functions/CallTest.java

@@ -25,6 +25,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.emulators.EmulatedServiceSettings;
 import com.google.firebase.functions.FirebaseFunctionsException.Code;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -39,6 +40,8 @@
 public class CallTest {
   private static FirebaseApp app;
 
+  private static final EmulatedServiceSettings NO_EMULATOR = null;
+
   @BeforeClass
   public static void setUp() {
     FirebaseApp.initializeApp(InstrumentationRegistry.getContext());
@@ -91,7 +94,7 @@ public void testToken() throws InterruptedException, ExecutionException {
               HttpsCallableContext context = new HttpsCallableContext("token", null);
               return Tasks.forResult(context);
             },
-            null);
+            NO_EMULATOR);
 
     HttpsCallableReference function = functions.getHttpsCallable("tokenTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());
@@ -112,7 +115,7 @@ public void testInstanceId() throws InterruptedException, ExecutionException {
               HttpsCallableContext context = new HttpsCallableContext(null, "iid");
               return Tasks.forResult(context);
             },
-            null);
+            NO_EMULATOR);
 
     HttpsCallableReference function = functions.getHttpsCallable("instanceIdTest");
     Task<HttpsCallableResult> result = function.call(new HashMap<>());

firebase-functions/src/main/java/com/google/firebase/functions/FirebaseFunctions.java

@@ -28,7 +28,6 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.emulators.EmulatedServiceSettings;
-import com.google.firebase.emulators.EmulatorSettings;
 import com.google.firebase.emulators.FirebaseEmulator;
 import com.google.firebase.functions.FirebaseFunctionsException.Code;
 import java.io.IOException;
@@ -54,6 +53,10 @@ public class FirebaseFunctions {
    * Emulator identifier, see {@link
    * com.google.firebase.emulators.EmulatorSettings.Builder#addEmulatedService(FirebaseEmulator,
    * EmulatedServiceSettings)}
+   *
+   * <p>TODO(samstern): Un-hide this once Firestore, Database, and Functions are implemented
+   *
+   * @hide
    */
   public static final FirebaseEmulator EMULATOR = FirebaseEmulator.forName("functions");
 
@@ -215,9 +218,7 @@ URL getURL(String function) {
    * https://firebase.google.com/docs/functions/local-emulator
    *
    * @param origin The origin of the local emulator, such as "http://10.0.2.2:5005".
-   * @deprecated see {@link FirebaseApp#enableEmulators(EmulatorSettings)}
    */
-  @Deprecated
   public void useFunctionsEmulator(@NonNull String origin) {
     Preconditions.checkNotNull(origin, "origin cannot be null");
     urlFormat = origin + "/%2$s/%1$s/%3$s";