Refactored component initialization.

Author: vkryachko

firebase-common/src/main/java/com/google/firebase/components/ComponentRuntime.java

@@ -60,13 +60,32 @@ public ComponentRuntime(
     CycleDetector.detect(componentsToAdd);
 
     for (Component<?> component : componentsToAdd) {
-      register(component);
-    }
-    validateDependencies();
+      Lazy<?> lazy =
+          new Lazy<>(
+              () ->
+                  component.getFactory().create(new RestrictedComponentContainer(component, this)));
 
+      components.put(component, lazy);
+    }
+    processInstanceComponents();
     processSetComponents();
   }
 
+  private void processInstanceComponents() {
+    for (Map.Entry<Component<?>, Lazy<?>> entry : components.entrySet()) {
+      Component<?> component = entry.getKey();
+      if (!component.isValue()) {
+        return;
+      }
+
+      Lazy<?> lazy = entry.getValue();
+      for (Class<?> anInterface : component.getProvidedInterfaces()) {
+        lazyInstanceMap.put(anInterface, lazy);
+      }
+    }
+    validateDependencies();
+  }
+
   /** Populates lazySetMap to make set components available for consumption via set dependencies. */
   private void processSetComponents() {
     Map<Class<?>, Set<Lazy<?>>> setIndex = new HashMap<>();
@@ -140,20 +159,6 @@ public void initializeEagerComponents(boolean isDefaultApp) {
     eventBus.enablePublishingAndFlushPending();
   }
 
-  private <T> void register(Component<T> component) {
-    Lazy<T> lazy =
-        new Lazy<>(
-            () -> component.getFactory().create(new RestrictedComponentContainer(component, this)));
-
-    components.put(component, lazy);
-    if (!component.isValue()) {
-      return;
-    }
-    for (Class<? super T> anInterface : component.getProvidedInterfaces()) {
-      lazyInstanceMap.put(anInterface, lazy);
-    }
-  }
-
   private void validateDependencies() {
     for (Component<?> component : components.keySet()) {
       for (Dependency dependency : component.getDependencies()) {