From 2fbe8127e1c72824c251856c3988243f9138aaea Mon Sep 17 00:00:00 2001
From: mrousavy <mrousavy@donotreply.github.com>
Date: Sun, 1 Jul 2018 16:03:03 +0200
Subject: [PATCH] Fix Injector OOP instance

---
 Jellyfish.Demo/Injection/InjectionModel.cs      |  7 +++++++
 Jellyfish.Tests/TestInjector.cs                 |  3 +++
 .../DependencyInjection/InjectionExtensions.cs  |  6 +++---
 Jellyfish/DependencyInjection/Injector.cs       | 17 +++--------------
 Jellyfish/ViewModel.cs                          |  4 ++--
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Jellyfish.Demo/Injection/InjectionModel.cs b/Jellyfish.Demo/Injection/InjectionModel.cs
index c620380..d0ebf9f 100644
--- a/Jellyfish.Demo/Injection/InjectionModel.cs
+++ b/Jellyfish.Demo/Injection/InjectionModel.cs
@@ -4,6 +4,13 @@ namespace Jellyfish.Demo.Injection
 {
     public class InjectionModel
     {
+        private Injector Injector { get; }
+
+        public InjectionModel()
+        {
+            Injector = new Injector();
+        }
+
         public IUser TemplateUser()
         {
             Injector.Template<IUser>(() => new User());
diff --git a/Jellyfish.Tests/TestInjector.cs b/Jellyfish.Tests/TestInjector.cs
index e037696..7beab11 100644
--- a/Jellyfish.Tests/TestInjector.cs
+++ b/Jellyfish.Tests/TestInjector.cs
@@ -7,9 +7,12 @@ namespace Jellyfish.Tests
     [TestClass]
     public class TestInjector
     {
+        private Injector Injector { get; set; }
+
         [TestInitialize]
         public void Initialize()
         {
+            Injector = new Injector();
         }
 
         [TestMethod]
diff --git a/Jellyfish/DependencyInjection/InjectionExtensions.cs b/Jellyfish/DependencyInjection/InjectionExtensions.cs
index ffcaac2..8f28bd3 100644
--- a/Jellyfish/DependencyInjection/InjectionExtensions.cs
+++ b/Jellyfish/DependencyInjection/InjectionExtensions.cs
@@ -11,10 +11,10 @@ public static class InjectionExtensions
         /// <typeparam name="T">The type of the object</typeparam>
         /// <param name="reference">A reference of the object, or null if static</param>
         /// <exception cref="InjectorStoreException">Thrown if some dependencies could not be resolved</exception>
-        public static void Inject<T>(this T reference)
+        public static void Inject<T>(this T reference, Injector injector)
         {
-            InjectionResolver.InjectProperties(reference);
-            InjectionResolver.InjectFields(reference);
+            InjectionResolver.InjectProperties(reference, injector);
+            InjectionResolver.InjectFields(reference, injector);
         }
     }
 }
diff --git a/Jellyfish/DependencyInjection/Injector.cs b/Jellyfish/DependencyInjection/Injector.cs
index 2e1e326..3786354 100644
--- a/Jellyfish/DependencyInjection/Injector.cs
+++ b/Jellyfish/DependencyInjection/Injector.cs
@@ -69,10 +69,9 @@ public void Bind<TBase, TSubtype>(params object[] arguments) where TSubtype : TB
         ///     Declare a template for the given type `<see cref="TBase" />` on how to initialize a variable spontaneously
         /// </summary>
         /// <typeparam name="TBase">The type of the property or field that gets injected</typeparam>
-        /// <typeparam name="TSubtype">The `<see cref="TBase"/>`'s sub type to be used for initialization of the base</typeparam>
         /// <param name="initializer">The function to call everytime a property or field has to get initialized</param>
         /// <exception cref="InjectorStoreException">Thrown if the type `<see cref="TBase" />` could not be templated</exception>
-        public void Template<TBase, TSubtype>(Func<TSubtype> initializer) where TSubtype : TBase
+        public void Template<TBase>(Func<TBase> initializer)
         {
             Templates.AddOrUpdate(typeof(TBase), initializer as Func<object>);
         }
@@ -100,18 +99,8 @@ public void Define<TBase>(TBase instance)
             Instances.AddOrUpdate(typeof(TBase), instance);
         }
 
-        /// <summary>
-        ///     Declare a fixed variable for the given type `<see cref="TSubtype" />` to set all variables of type `
-        ///     <see cref="TBase" />` to
-        /// </summary>
-        /// <typeparam name="TBase">The type of the property or field that gets injected</typeparam>
-        /// <typeparam name="TSubtype">The type of the value to inject the property or field with</typeparam>
-        /// <param name="instance">The static instance to initialize all variables of type `<see cref="TBase" />` with</param>
-        /// <exception cref="InjectorStoreException">Thrown if the type `<see cref="TBase" />` could not be defined</exception>
-        public void Define<TBase, TSubtype>(TSubtype instance) where TSubtype : TBase
-        {
-            Instances.AddOrUpdate(typeof(TBase), instance);
-        }
+
+
 
         /// <summary>
         ///     Initialize the given type `<see cref="TBase" />` with either a templated function to call or a pre-defined instance
diff --git a/Jellyfish/ViewModel.cs b/Jellyfish/ViewModel.cs
index 20c4838..d6b9375 100644
--- a/Jellyfish/ViewModel.cs
+++ b/Jellyfish/ViewModel.cs
@@ -11,8 +11,8 @@ public abstract class ViewModel : ObservableObject
     {
         protected ViewModel()
         {
-            InjectionResolver.InjectProperties(this);
-            InjectionResolver.InjectFields(this);
+            //InjectionResolver.InjectProperties(this);
+            //InjectionResolver.InjectFields(this);
         }
     }
 }
\ No newline at end of file