FIS getAuthToken implementation.

firebase-installations-interop/api.txt

@@ -13,7 +13,7 @@ package com.google.firebase.installations {
     ctor public InstallationTokenResult.Builder();
     method @NonNull public abstract com.google.firebase.installations.InstallationTokenResult build();
     method @NonNull public abstract com.google.firebase.installations.InstallationTokenResult.Builder setToken(@NonNull String);
-    method @NonNull public abstract com.google.firebase.installations.InstallationTokenResult.Builder setTokenExpirationInSecs(@NonNull long);
+    method @NonNull public abstract com.google.firebase.installations.InstallationTokenResult.Builder setTokenExpirationInSecs(long);
   }
 
 }

firebase-installations-interop/src/main/java/com/google/firebase/installations/InstallationTokenResult.java

@@ -45,7 +45,7 @@ public abstract static class Builder {
     public abstract Builder setToken(@NonNull String value);
 
     @NonNull
-    public abstract Builder setTokenExpirationInSecs(@NonNull long value);
+    public abstract Builder setTokenExpirationInSecs(long value);
 
     @NonNull
     public abstract InstallationTokenResult build();

firebase-installations/src/androidTest/java/com/google/firebase/installations/FirebaseInstallationsInstrumentedTest.java

@@ -50,18 +50,17 @@
 import com.google.firebase.installations.remote.InstallationResponse;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
+import org.mockito.AdditionalAnswers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.internal.stubbing.answers.AnswersWithDelay;
 import org.mockito.internal.stubbing.answers.Returns;
 
 /**
@@ -126,7 +125,7 @@ public class FirebaseInstallationsInstrumentedTest {
   public void setUp() throws FirebaseInstallationServiceException {
     MockitoAnnotations.initMocks(this);
     FirebaseApp.clearInstancesForTest();
-    executor = new ThreadPoolExecutor(0, 4, 10L, TimeUnit.SECONDS, new SynchronousQueue<>());
+    executor = Executors.newSingleThreadExecutor();
     firebaseApp =
         FirebaseApp.initializeApp(
             ApplicationProvider.getApplicationContext(),
@@ -268,13 +267,12 @@ public void testGetId_PersistedFidError_BackendOk() throws InterruptedException
       Tasks.await(firebaseInstallations.getId());
       fail("Could not update local storage.");
     } catch (ExecutionException expected) {
-      Throwable cause = expected.getCause();
       assertWithMessage("Exception class doesn't match")
           .that(expected)
           .hasCauseThat()
           .isInstanceOf(FirebaseInstallationsException.class);
       assertWithMessage("Exception status doesn't match")
-          .that(((FirebaseInstallationsException) cause).getStatus())
+          .that(((FirebaseInstallationsException) expected.getCause()).getStatus())
           .isEqualTo(FirebaseInstallationsException.Status.CLIENT_ERROR);
     }
   }
@@ -310,13 +308,12 @@ public void testGetAuthToken_PersistedFidError_failure() throws Exception {
           firebaseInstallations.getAuthToken(FirebaseInstallationsApi.DO_NOT_FORCE_REFRESH));
       fail("Could not update local storage.");
     } catch (ExecutionException expected) {
-      Throwable cause = expected.getCause();
       assertWithMessage("Exception class doesn't match")
           .that(expected)
           .hasCauseThat()
           .isInstanceOf(FirebaseInstallationsException.class);
       assertWithMessage("Exception status doesn't match")
-          .that(((FirebaseInstallationsException) cause).getStatus())
+          .that(((FirebaseInstallationsException) expected.getCause()).getStatus())
           .isEqualTo(FirebaseInstallationsException.Status.SDK_INTERNAL_ERROR);
     }
   }
@@ -395,22 +392,21 @@ public void testGetAuthToken_serverError_failure() throws Exception {
       Tasks.await(firebaseInstallations.getAuthToken(FirebaseInstallationsApi.FORCE_REFRESH));
       fail("getAuthToken() failed due to Server Error.");
     } catch (ExecutionException expected) {
-      Throwable cause = expected.getCause();
       assertWithMessage("Exception class doesn't match")
           .that(expected)
           .hasCauseThat()
           .isInstanceOf(FirebaseInstallationsException.class);
       assertWithMessage("Exception status doesn't match")
-          .that(((FirebaseInstallationsException) cause).getStatus())
+          .that(((FirebaseInstallationsException) expected.getCause()).getStatus())
           .isEqualTo(FirebaseInstallationsException.Status.SDK_INTERNAL_ERROR);
     }
   }
 
   @Test
   public void testGetAuthToken_multipleCallsDoNotForceRefresh_fetchedNewTokenOnce()
       throws Exception {
-    // Using mockPersistedFid to ensure the order of returning persistedFidEntry  to 2 tasks
-    // triggered simultaneously. Task2 waits for Task1 to complete.On Task1 completion, task2 reads
+    // Using mockPersistedFid to ensure the order of returning persistedFidEntry to 2 tasks
+    // triggered simultaneously. Task2 waits for Task1 to complete. On Task1 completion, task2 reads
     // the UPDATED_AUTH_TOKEN_FID_ENTRY by Task1 on execution.
     when(mockPersistedFid.readPersistedFidEntryValue())
         .thenReturn(
@@ -444,19 +440,19 @@ public void testGetAuthToken_multipleCallsDoNotForceRefresh_fetchedNewTokenOnce(
   public void testGetAuthToken_multipleCallsForceRefresh_fetchedNewTokenTwice() throws Exception {
     when(mockPersistedFid.readPersistedFidEntryValue()).thenReturn(REGISTERED_FID_ENTRY);
     // Use a mock ServiceClient for network calls with delay(1000ms) to ensure first task is not
-    // completed before the second task starts. Hence, we can test multiple calls to getAUthToken()
+    // completed before the second task starts. Hence, we can test multiple calls to getAuthToken()
     // and verify one task waits for another task to complete.
 
     doAnswer(
-            new AnswersWithDelay(
+            AdditionalAnswers.answersWithDelay(
                 1000,
                 new Returns(
                     InstallationTokenResult.builder()
                         .setToken(TEST_AUTH_TOKEN_3)
                         .setTokenExpirationInSecs(TEST_TOKEN_EXPIRATION_TIMESTAMP)
                         .build())))
         .doAnswer(
-            new AnswersWithDelay(
+            AdditionalAnswers.answersWithDelay(
                 1000,
                 new Returns(
                     InstallationTokenResult.builder()
@@ -480,10 +476,10 @@ public void testGetAuthToken_multipleCallsForceRefresh_fetchedNewTokenTwice() th
     // As we cannot ensure which task got executed first, verifying with both expected values
     assertWithMessage("Persisted Auth Token doesn't match")
         .that(task1.getResult().getToken())
-        .isAnyOf(TEST_AUTH_TOKEN_3, TEST_AUTH_TOKEN_4);
+        .isEqualTo(TEST_AUTH_TOKEN_3);
     assertWithMessage("Persisted Auth Token doesn't match")
         .that(task2.getResult().getToken())
-        .isAnyOf(TEST_AUTH_TOKEN_4, TEST_AUTH_TOKEN_3);
+        .isEqualTo(TEST_AUTH_TOKEN_4);
     verify(backendClientReturnsOk, times(2))
         .generateAuthToken(TEST_API_KEY, TEST_FID_1, TEST_PROJECT_ID, TEST_REFRESH_TOKEN);
   }

firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java

@@ -30,8 +30,7 @@
 import com.google.firebase.installations.remote.FirebaseInstallationServiceException;
 import com.google.firebase.installations.remote.InstallationResponse;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -61,7 +60,7 @@ public class FirebaseInstallations implements FirebaseInstallationsApi {
   FirebaseInstallations(FirebaseApp firebaseApp) {
     this(
         DefaultClock.getInstance(),
-        new ThreadPoolExecutor(0, 1, 30L, TimeUnit.SECONDS, new SynchronousQueue<>()),
+        Executors.newSingleThreadExecutor(),
         firebaseApp,
         new FirebaseInstallationServiceClient(),
         new PersistedFid(firebaseApp),