Closed #90

Added design time Lifetime Manager validation
unitycontainer · Jan 18, 2019 · 23b26c3 · 23b26c3
1 parent db0615d
commit 23b26c3
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 53 deletions.
diff --git a/src/Extensions/Container/UnityContainer.cs b/src/Extensions/Container/UnityContainer.cs
@@ -39,7 +39,7 @@ public static IUnityContainer RegisterType<T>(this IUnityContainer container, pa
         /// of the returned instance.</param>
         /// <param name="injectionMembers">Injection configuration objects.</param>
         /// <returns>The <see cref="Unity.IUnityContainer"/> object that this method was called on.</returns>
-        public static IUnityContainer RegisterType<T>(this IUnityContainer container, LifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
+        public static IUnityContainer RegisterType<T>(this IUnityContainer container, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
         {
             return (container ?? throw new ArgumentNullException(nameof(container))).RegisterType((Type)null, typeof(T), null, lifetimeManager, injectionMembers);
         }
@@ -69,7 +69,7 @@ public static IUnityContainer RegisterType<T>(this IUnityContainer container, st
         /// of the returned instance.</param>
         /// <param name="injectionMembers">Injection configuration objects.</param>
         /// <returns>The <see cref="Unity.IUnityContainer"/> object that this method was called on.</returns>
-        public static IUnityContainer RegisterType<T>(this IUnityContainer container, string name, LifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
+        public static IUnityContainer RegisterType<T>(this IUnityContainer container, string name, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
         {
             return (container ?? throw new ArgumentNullException(nameof(container))).RegisterType((Type)null, typeof(T), name, lifetimeManager, injectionMembers);
         }
@@ -108,7 +108,7 @@ public static IUnityContainer RegisterType<T>(this IUnityContainer container, st
         /// of the returned instance.</param>
         /// <param name="injectionMembers">Injection configuration objects.</param>
         /// <returns>The <see cref="Unity.IUnityContainer"/> object that this method was called on.</returns>
-        public static IUnityContainer RegisterType<TFrom, TTo>(this IUnityContainer container, LifetimeManager lifetimeManager, params InjectionMember[] injectionMembers) where TTo : TFrom
+        public static IUnityContainer RegisterType<TFrom, TTo>(this IUnityContainer container, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers) where TTo : TFrom
         {
             return (container ?? throw new ArgumentNullException(nameof(container))).RegisterType(typeof(TFrom), typeof(TTo), null, lifetimeManager, injectionMembers);
         }
@@ -145,7 +145,7 @@ public static IUnityContainer RegisterType<T>(this IUnityContainer container, st
         /// of the returned instance.</param>
         /// <param name="injectionMembers">Injection configuration objects.</param>
         /// <returns>The <see cref="Unity.IUnityContainer"/> object that this method was called on.</returns>
-        public static IUnityContainer RegisterType<TFrom, TTo>(this IUnityContainer container, string name, LifetimeManager lifetimeManager, params InjectionMember[] injectionMembers) where TTo : TFrom
+        public static IUnityContainer RegisterType<TFrom, TTo>(this IUnityContainer container, string name, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers) where TTo : TFrom
         {
             return (container ?? throw new ArgumentNullException(nameof(container))).RegisterType(typeof(TFrom), typeof(TTo), name, lifetimeManager, injectionMembers);
         }
@@ -245,7 +245,7 @@ public static IUnityContainer RegisterType(this IUnityContainer container, Type
         /// of the returned instance.</param>
         /// <param name="injectionMembers">Injection configuration objects.</param>
         /// <returns>The <see cref="Unity.IUnityContainer"/> object that this method was called on.</returns>
-        public static IUnityContainer RegisterType(this IUnityContainer container, Type t, LifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
+        public static IUnityContainer RegisterType(this IUnityContainer container, Type t, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
         {
             return (container ?? throw new ArgumentNullException(nameof(container))).RegisterType((Type)null, t, null, lifetimeManager, injectionMembers);
         }
@@ -275,7 +275,7 @@ public static IUnityContainer RegisterType(this IUnityContainer container, Type
         /// of the returned instance.</param>
         /// <param name="injectionMembers">Injection configuration objects.</param>
         /// <returns>The <see cref="Unity.IUnityContainer"/> object that this method was called on.</returns>
-        public static IUnityContainer RegisterType(this IUnityContainer container, Type t, string name, LifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
+        public static IUnityContainer RegisterType(this IUnityContainer container, Type t, string name, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
         {
             return (container ?? throw new ArgumentNullException(nameof(container))).RegisterType((Type)null, t, name, lifetimeManager, injectionMembers);
         }
@@ -333,7 +333,7 @@ public static IUnityContainer RegisterType(this IUnityContainer container, Type
         /// of the returned instance.</param>
         /// <param name="injectionMembers">Injection configuration objects.</param>
         /// <returns>The <see cref="Unity.IUnityContainer"/> object that this method was called on.</returns>
-        public static IUnityContainer RegisterType(this IUnityContainer container, Type from, Type to, LifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
+        public static IUnityContainer RegisterType(this IUnityContainer container, Type from, Type to, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers)
         {
             return (container ?? throw new ArgumentNullException(nameof(container))).RegisterType(from, to, null, lifetimeManager, injectionMembers);
         }

diff --git a/src/Extensions/Lifetime/TypeLifetime.cs b/src/Extensions/Lifetime/TypeLifetime.cs
@@ -4,20 +4,20 @@ namespace Unity
 {
     public static class TypeLifetime
     {
-        public static LifetimeManager External => new ExternallyControlledLifetimeManager();
+        public static ITypeLifetimeManager External => new ExternallyControlledLifetimeManager();
 
-        public static LifetimeManager Singleton => new SingletonLifetimeManager();
+        public static ITypeLifetimeManager Singleton => new SingletonLifetimeManager();
 
-        public static LifetimeManager PerContainer => new ContainerControlledLifetimeManager();
+        public static ITypeLifetimeManager PerContainer => new ContainerControlledLifetimeManager();
 
-        public static LifetimeManager Hierarchical => new HierarchicalLifetimeManager();
+        public static ITypeLifetimeManager Hierarchical => new HierarchicalLifetimeManager();
 
-        public static LifetimeManager PerResolve => new PerResolveLifetimeManager();
+        public static ITypeLifetimeManager PerResolve => new PerResolveLifetimeManager();
 
-        public static LifetimeManager PerThread => new PerThreadLifetimeManager();
+        public static ITypeLifetimeManager PerThread => new PerThreadLifetimeManager();
 
-        public static LifetimeManager Transient { get; } = new TransientLifetimeManager();
+        public static ITypeLifetimeManager Transient { get; } = new TransientLifetimeManager();
 
-        public static LifetimeManager PerContainerTransient => new ContainerControlledTransientManager();
+        public static ITypeLifetimeManager PerContainerTransient => new ContainerControlledTransientManager();
     }
 }
diff --git a/src/IUnityContainer.cs b/src/IUnityContainer.cs
@@ -28,7 +28,7 @@ public interface IUnityContainer : IDisposable
         /// registration and instead will use registration for <paramref name="typeTo"/> type to create object.</remarks>
         /// <returns>The <see cref="IUnityContainer"/> object that this method was called on.</returns>
         /// <exception cref="InvalidRegistrationException"></exception>
-        IUnityContainer RegisterType(Type typeFrom, Type typeTo, string name, ILifetimeManager lifetimeManager, params InjectionMember[] injectionMembers);
+        IUnityContainer RegisterType(Type typeFrom, Type typeTo, string name, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers);
 
 
         /// <summary>

diff --git a/src/IUnityContainerAsync.cs b/src/IUnityContainerAsync.cs
@@ -27,7 +27,7 @@ public interface IUnityContainerAsync : IDisposable
         /// <param name="lifetimeManager">WithLifetime manager that will be responsible for managing created object's lifetime.</param>
         /// <param name="injectionMembers">Injection configuration objects.</param>
         /// <returns></returns>
-        IUnityContainer RegisterType(IEnumerable<Type> interfaces, Type type, string name, ILifetimeManager lifetimeManager, params InjectionMember[] injectionMembers);
+        IUnityContainer RegisterType(IEnumerable<Type> interfaces, Type type, string name, ITypeLifetimeManager lifetimeManager, params InjectionMember[] injectionMembers);
 
 
         /// <summary>

diff --git a/src/Lifetime/Abstracts/IFactoryLifetimeManager.cs b/src/Lifetime/Abstracts/IFactoryLifetimeManager.cs
@@ -1,6 +1,6 @@
 namespace Unity.Lifetime
 {
-    public interface IFactoryLifetimeManager : ILifetimeManager
+    public interface IFactoryLifetimeManager
     {
     }
 }
diff --git a/src/Lifetime/Abstracts/IInstanceLifetimeManager.cs b/src/Lifetime/Abstracts/IInstanceLifetimeManager.cs
@@ -1,6 +1,6 @@
 namespace Unity.Lifetime
 {
-    public interface IInstanceLifetimeManager : ILifetimeManager
+    public interface IInstanceLifetimeManager
     {
     }
 }
diff --git a/src/Lifetime/Abstracts/ILifetimeManager.cs b/src/Lifetime/Abstracts/ILifetimeManager.cs
diff --git a/src/Lifetime/Abstracts/ITypeLifetimeManager.cs b/src/Lifetime/Abstracts/ITypeLifetimeManager.cs
@@ -0,0 +1,6 @@
+namespace Unity.Lifetime
+{
+    public interface ITypeLifetimeManager
+    {
+    }
+}
diff --git a/src/Lifetime/Abstracts/LifetimeManager.cs b/src/Lifetime/Abstracts/LifetimeManager.cs
@@ -6,7 +6,7 @@ namespace Unity.Lifetime
     /// Base class for WithLifetime managers - classes that control how
     /// and when instances are created by the Unity container.
     /// </summary>
-    public abstract class LifetimeManager : ILifetimeManager
+    public abstract class LifetimeManager 
     {
         public virtual bool InUse { get; set; }
 

diff --git a/src/Lifetime/Managers/ContainerControlledLifetimeManager.cs b/src/Lifetime/Managers/ContainerControlledLifetimeManager.cs
@@ -9,7 +9,8 @@ namespace Unity.Lifetime
     /// </summary>
     public class ContainerControlledLifetimeManager : SynchronizedLifetimeManager, 
                                                       IInstanceLifetimeManager, 
-                                                      IFactoryLifetimeManager
+                                                      IFactoryLifetimeManager,
+                                                      ITypeLifetimeManager
     {
         #region Fields
 

diff --git a/src/Lifetime/Managers/ContainerControlledTransientManager.cs b/src/Lifetime/Managers/ContainerControlledTransientManager.cs
@@ -8,7 +8,8 @@ namespace Unity.Lifetime
     /// is disposed all these objects are disposed as well.
     /// </summary>
     public class ContainerControlledTransientManager : LifetimeManager,
-                                                       IFactoryLifetimeManager
+                                                       IFactoryLifetimeManager,
+                                                       ITypeLifetimeManager
     {
         public override void SetValue(object newValue, ILifetimeContainer container = null)
         {

diff --git a/src/Lifetime/Managers/ExternallyControlledLifetimeManager.cs b/src/Lifetime/Managers/ExternallyControlledLifetimeManager.cs
@@ -8,7 +8,8 @@ namespace Unity.Lifetime
     /// </summary>
     public class ExternallyControlledLifetimeManager : LifetimeManager,
                                                        IInstanceLifetimeManager, 
-                                                       IFactoryLifetimeManager
+                                                       IFactoryLifetimeManager,
+                                                       ITypeLifetimeManager
     {
         private WeakReference _value = new WeakReference(null);
 

diff --git a/src/Lifetime/Managers/HierarchicalLifetimeManager.cs b/src/Lifetime/Managers/HierarchicalLifetimeManager.cs
@@ -11,7 +11,8 @@ namespace Unity.Lifetime
     /// of the object, instead of sharing one in the common parent.
     /// </summary>
     public class HierarchicalLifetimeManager : SynchronizedLifetimeManager, 
-                                               IFactoryLifetimeManager
+                                               IFactoryLifetimeManager,
+                                               ITypeLifetimeManager
     {
         #region Fields
 

diff --git a/src/Lifetime/Managers/PerResolveLifetimeManager.cs b/src/Lifetime/Managers/PerResolveLifetimeManager.cs
@@ -7,7 +7,8 @@
     /// </summary>
     public class PerResolveLifetimeManager : LifetimeManager, 
                                              IInstanceLifetimeManager, 
-                                             IFactoryLifetimeManager
+                                             IFactoryLifetimeManager,
+                                             ITypeLifetimeManager
     {
         protected object value;
 

diff --git a/src/Lifetime/Managers/PerThreadLifetimeManager.cs b/src/Lifetime/Managers/PerThreadLifetimeManager.cs
@@ -13,7 +13,8 @@ namespace Unity.Lifetime
     /// </para>
     /// </remarks>
     public class PerThreadLifetimeManager : LifetimeManager,
-                                            IFactoryLifetimeManager
+                                            IFactoryLifetimeManager,
+                                            ITypeLifetimeManager
     {
         [ThreadStatic]
         private static Dictionary<Guid, object> _values;

diff --git a/src/Lifetime/Managers/SingletonLifetimeManager.cs b/src/Lifetime/Managers/SingletonLifetimeManager.cs
@@ -9,7 +9,8 @@ namespace Unity.Lifetime
     /// </summary>
     public class SingletonLifetimeManager : SynchronizedLifetimeManager,
                                             IInstanceLifetimeManager,
-                                            IFactoryLifetimeManager
+                                            IFactoryLifetimeManager,
+                                            ITypeLifetimeManager
     {
         #region Fields
 

diff --git a/src/Lifetime/Managers/TransientLifetimeManager.cs b/src/Lifetime/Managers/TransientLifetimeManager.cs
@@ -5,7 +5,8 @@
     /// thus ensuring that instances are created new every time.
     /// </summary>
     public class TransientLifetimeManager : LifetimeManager,
-                                            IFactoryLifetimeManager
+                                            IFactoryLifetimeManager,
+                                            ITypeLifetimeManager
     {
         public static TransientLifetimeManager Instance = new TransientLifetimeManager();