lazy initialization of heartbeat (#1925)

* lazy initialization of heartbeat

* google java format

Author: VinayGuthal

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

@@ -26,6 +26,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.heartbeatinfo.HeartBeatInfo;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsException.Status;
 import com.google.firebase.installations.local.IidStore;
 import com.google.firebase.installations.local.PersistedInstallation;
@@ -117,8 +118,8 @@ public Thread newThread(Runnable r) {
   /** package private constructor. */
   FirebaseInstallations(
       FirebaseApp firebaseApp,
-      @Nullable UserAgentPublisher publisher,
-      @Nullable HeartBeatInfo heartbeatInfo) {
+      @NonNull Provider<UserAgentPublisher> publisher,
+      @NonNull Provider<HeartBeatInfo> heartbeatInfo) {
     this(
         new ThreadPoolExecutor(
             CORE_POOL_SIZE,

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

@@ -34,14 +34,14 @@ public List<Component<?>> getComponents() {
     return Arrays.asList(
         Component.builder(FirebaseInstallationsApi.class)
             .add(Dependency.required(FirebaseApp.class))
-            .add(Dependency.required(HeartBeatInfo.class))
-            .add(Dependency.required(UserAgentPublisher.class))
+            .add(Dependency.optionalProvider(HeartBeatInfo.class))
+            .add(Dependency.optionalProvider(UserAgentPublisher.class))
             .factory(
                 c ->
                     new FirebaseInstallations(
                         c.get(FirebaseApp.class),
-                        c.get(UserAgentPublisher.class),
-                        c.get(HeartBeatInfo.class)))
+                        c.getProvider(UserAgentPublisher.class),
+                        c.getProvider(HeartBeatInfo.class)))
             .build(),
         LibraryVersionComponent.create("fire-installations", BuildConfig.VERSION_NAME));
   }

firebase-installations/src/main/java/com/google/firebase/installations/remote/FirebaseInstallationServiceClient.java

@@ -30,6 +30,7 @@
 import com.google.android.gms.common.util.VisibleForTesting;
 import com.google.firebase.heartbeatinfo.HeartBeatInfo;
 import com.google.firebase.heartbeatinfo.HeartBeatInfo.HeartBeat;
+import com.google.firebase.inject.Provider;
 import com.google.firebase.installations.FirebaseInstallationsException;
 import com.google.firebase.installations.FirebaseInstallationsException.Status;
 import com.google.firebase.installations.remote.InstallationResponse.ResponseCode;
@@ -101,13 +102,13 @@ public class FirebaseInstallationServiceClient {
   static final String PARSING_EXPIRATION_TIME_ERROR_MESSAGE = "Invalid Expiration Timestamp.";
 
   private final Context context;
-  private final UserAgentPublisher userAgentPublisher;
-  private final HeartBeatInfo heartbeatInfo;
+  private final Provider<UserAgentPublisher> userAgentPublisher;
+  private final Provider<HeartBeatInfo> heartbeatInfo;
 
   public FirebaseInstallationServiceClient(
       @NonNull Context context,
-      @Nullable UserAgentPublisher publisher,
-      @Nullable HeartBeatInfo heartbeatInfo) {
+      @NonNull Provider<UserAgentPublisher> publisher,
+      @NonNull Provider<HeartBeatInfo> heartbeatInfo) {
     this.context = context;
     this.userAgentPublisher = publisher;
     this.heartbeatInfo = heartbeatInfo;
@@ -433,10 +434,12 @@ private HttpURLConnection openHttpURLConnection(URL url, String apiKey)
     httpURLConnection.addRequestProperty(CONTENT_ENCODING_HEADER_KEY, GZIP_CONTENT_ENCODING);
     httpURLConnection.addRequestProperty(CACHE_CONTROL_HEADER_KEY, CACHE_CONTROL_DIRECTIVE);
     httpURLConnection.addRequestProperty(X_ANDROID_PACKAGE_HEADER_KEY, context.getPackageName());
-    if (heartbeatInfo != null && userAgentPublisher != null) {
-      HeartBeat heartbeat = heartbeatInfo.getHeartBeatCode(FIREBASE_INSTALLATIONS_ID_HEARTBEAT_TAG);
+    if ((heartbeatInfo.get() != null) && (userAgentPublisher.get() != null)) {
+      HeartBeat heartbeat =
+          heartbeatInfo.get().getHeartBeatCode(FIREBASE_INSTALLATIONS_ID_HEARTBEAT_TAG);
       if (heartbeat != HeartBeat.NONE) {
-        httpURLConnection.addRequestProperty(USER_AGENT_HEADER, userAgentPublisher.getUserAgent());
+        httpURLConnection.addRequestProperty(
+            USER_AGENT_HEADER, userAgentPublisher.get().getUserAgent());
         httpURLConnection.addRequestProperty(
             HEART_BEAT_HEADER, Integer.toString(heartbeat.getCode()));
       }