feat(DependencyInjector): add constructor for constructing injector u…

…sing DependencyAttributes
jonisavo · May 1, 2022 · 7b697b7 · 7b697b7
1 parent 9583b39
commit 7b697b7
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/Core/DependencyInjector.cs b/Core/DependencyInjector.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using UIComponents.Core.Exceptions;
-using UnityEngine;
 
 namespace UIComponents.Core
 {
@@ -36,13 +35,11 @@ public static DependencyInjector GetInjector(Type consumerType)
 
         private static DependencyInjector CreateInjector(Type consumerType)
         {
-            var injector = new DependencyInjector();
-
             var injectAttributes = (DependencyAttribute[])
                 consumerType.GetCustomAttributes(typeof(DependencyAttribute), true);
 
-            injector.PopulateFromDependencyAttributes(injectAttributes);
-            
+            var injector = new DependencyInjector(injectAttributes);
+
             InjectorDictionary.Add(consumerType, injector);
 
             return injector;
@@ -64,6 +61,20 @@ private static object CreateInstance(Type dependencyType)
 
             return instance;
         }
+
+        public DependencyInjector() {}
+
+        public DependencyInjector(IEnumerable<DependencyAttribute> dependencyAttributes)
+        {
+            foreach (var dependencyAttribute in dependencyAttributes)
+            {
+                var type = dependencyAttribute.DependencyType;
+                var providerType = dependencyAttribute.ProvideType;
+
+                if (!DependencyDictionary.ContainsKey(type))
+                    DependencyDictionary[type] = CreateInstance(providerType);
+            }
+        }
 
         public void SetDependency<T>([NotNull] T instance) where T : class
         {
@@ -96,17 +107,5 @@ private static object CreateInstance(Type dependencyType)
 
             return true;
         }
-
-        private void PopulateFromDependencyAttributes(IEnumerable<DependencyAttribute> dependencyAttributes)
-        {
-            foreach (var dependencyAttribute in dependencyAttributes)
-            {
-                var type = dependencyAttribute.DependencyType;
-                var providerType = dependencyAttribute.ProvideType;
-
-                if (!DependencyDictionary.ContainsKey(type))
-                    DependencyDictionary[type] = CreateInstance(providerType);
-            }
-        }
     }
 }