From 19a20ffd92a3b34a9022a6e150f6dd7d51e7a65a Mon Sep 17 00:00:00 2001
From: Simon G <simon.gockner@gmail.com>
Date: Wed, 29 Jan 2020 15:04:57 +0100
Subject: [PATCH] - don't allow registration of  lifestyle.multiton without
 iMultitonRegistration

- add iLifestyleProvider and move Lifestyle from IRegistratrionBase<> to it
- add non generic IMultitonRegistration as base class
---
 .../Registrations/ILifestyleProvider.cs       | 17 ++++++++++++++++
 .../Registrations/IMultitonRegistration.cs    | 10 +++++++++-
 .../Registrations/IRegistrationBase.cs        |  7 ++-----
 LightweightIocContainer/IocContainer.cs       |  6 +++++-
 .../LightweightIocContainer.xml               | 20 ++++++++++++++-----
 .../IocContainerTest.cs                       |  6 ++++++
 6 files changed, 54 insertions(+), 12 deletions(-)
 create mode 100644 LightweightIocContainer/Interfaces/Registrations/ILifestyleProvider.cs

diff --git a/LightweightIocContainer/Interfaces/Registrations/ILifestyleProvider.cs b/LightweightIocContainer/Interfaces/Registrations/ILifestyleProvider.cs
new file mode 100644
index 0000000..084849b
--- /dev/null
+++ b/LightweightIocContainer/Interfaces/Registrations/ILifestyleProvider.cs
@@ -0,0 +1,17 @@
+// // Author: Simon Gockner
+// // Created: 2020-01-29
+// // Copyright(c) 2020 SimonG. All Rights Reserved.
+
+namespace LightweightIocContainer.Interfaces.Registrations
+{
+    /// <summary>
+    /// Provides a <see cref="LightweightIocContainer.Lifestyle"/> to an <see cref="IRegistration"/>
+    /// </summary>
+    public interface ILifestyleProvider
+    {
+        /// <summary>
+        /// The Lifestyle of Instances that are created with this <see cref="IRegistration"/>
+        /// </summary>
+        Lifestyle Lifestyle { get; }
+    }
+}
\ No newline at end of file
diff --git a/LightweightIocContainer/Interfaces/Registrations/IMultitonRegistration.cs b/LightweightIocContainer/Interfaces/Registrations/IMultitonRegistration.cs
index ec32045..2106215 100644
--- a/LightweightIocContainer/Interfaces/Registrations/IMultitonRegistration.cs
+++ b/LightweightIocContainer/Interfaces/Registrations/IMultitonRegistration.cs
@@ -6,10 +6,18 @@ using System;
 
 namespace LightweightIocContainer.Interfaces.Registrations
 {
+    /// <summary>
+    /// Non generic <see cref="IMultitonRegistration{TInterface}"/>
+    /// </summary>
+    public interface IMultitonRegistration
+    {
+
+    }
+
     /// <summary>
     /// A base <see cref="IMultitonRegistration{TInterface}"/> without implementation
     /// </summary>
-    public interface IMultitonRegistration<TInterface> : IRegistrationBase<TInterface>
+    public interface IMultitonRegistration<TInterface> : IRegistrationBase<TInterface>, IMultitonRegistration
     {
         /// <summary>
         /// The <see cref="Type"/> of the multiton scope
diff --git a/LightweightIocContainer/Interfaces/Registrations/IRegistrationBase.cs b/LightweightIocContainer/Interfaces/Registrations/IRegistrationBase.cs
index b90b444..69179ed 100644
--- a/LightweightIocContainer/Interfaces/Registrations/IRegistrationBase.cs
+++ b/LightweightIocContainer/Interfaces/Registrations/IRegistrationBase.cs
@@ -10,11 +10,8 @@ namespace LightweightIocContainer.Interfaces.Registrations
     /// The <see cref="IRegistrationBase{TInterface}"/> that is used to register an Interface
     /// </summary>
     /// <typeparam name="TInterface">The registered Interface</typeparam>
-    public interface IRegistrationBase<TInterface> : IRegistration, IWithParameters<TInterface>
+    public interface IRegistrationBase<TInterface> : IRegistration, ILifestyleProvider, IWithParameters<TInterface>
     {
-        /// <summary>
-        /// The Lifestyle of Instances that are created with this <see cref="IRegistrationBase{TInterface}"/>
-        /// </summary>
-        Lifestyle Lifestyle { get; }
+        
     }
 }
\ No newline at end of file
diff --git a/LightweightIocContainer/IocContainer.cs b/LightweightIocContainer/IocContainer.cs
index b6f9bcc..6f114be 100644
--- a/LightweightIocContainer/IocContainer.cs
+++ b/LightweightIocContainer/IocContainer.cs
@@ -188,12 +188,16 @@ namespace LightweightIocContainer
         /// </summary>
         /// <param name="registration">The given <see cref="IRegistration"/></param>
         /// <exception cref="MultipleRegistrationException">The <see cref="Type"/> is already registered in this <see cref="IocContainer"/></exception>
-        private void Register(IRegistration registration) //FixMe: Don't allow lifestyle.multiton without iMultitonRegistration
+        private void Register(IRegistration registration)
         {
             //if type is already registered
             if (_registrations.Any(r => r.InterfaceType == registration.InterfaceType))
                 throw new MultipleRegistrationException(registration.InterfaceType);
 
+            //don't allow lifestyle.multiton without iMultitonRegistration
+            if (registration is ILifestyleProvider lifestyleProvider && lifestyleProvider.Lifestyle == Lifestyle.Multiton && !(registration is IMultitonRegistration))
+                throw new InvalidRegistrationException("Can't register a type as Lifestyle.Multiton without a scope (Registration is not of type IMultitonRegistration).");
+
             _registrations.Add(registration);
         }
 
diff --git a/LightweightIocContainer/LightweightIocContainer.xml b/LightweightIocContainer/LightweightIocContainer.xml
index 436ab93..cce9467 100644
--- a/LightweightIocContainer/LightweightIocContainer.xml
+++ b/LightweightIocContainer/LightweightIocContainer.xml
@@ -527,6 +527,16 @@
             <typeparam name="TInterface">The <see cref="T:System.Type"/> of the interface</typeparam>
             <typeparam name="TImplementation">The <see cref="T:System.Type"/> of the implementation</typeparam>
         </member>
+        <member name="T:LightweightIocContainer.Interfaces.Registrations.ILifestyleProvider">
+            <summary>
+            Provides a <see cref="T:LightweightIocContainer.Lifestyle"/> to an <see cref="T:LightweightIocContainer.Interfaces.Registrations.IRegistration"/>
+            </summary>
+        </member>
+        <member name="P:LightweightIocContainer.Interfaces.Registrations.ILifestyleProvider.Lifestyle">
+            <summary>
+            The Lifestyle of Instances that are created with this <see cref="T:LightweightIocContainer.Interfaces.Registrations.IRegistration"/>
+            </summary>
+        </member>
         <member name="T:LightweightIocContainer.Interfaces.Registrations.IMultipleRegistration`2">
             <summary>
             The base interface for every <see cref="T:LightweightIocContainer.Interfaces.Registrations.IMultipleRegistration`3"/> to register multiple interfaces
@@ -577,6 +587,11 @@
             <typeparam name="TInterface5">The fifth interface</typeparam>
             <typeparam name="TImplementation">The implementation</typeparam>
         </member>
+        <member name="T:LightweightIocContainer.Interfaces.Registrations.IMultitonRegistration">
+            <summary>
+            Non generic <see cref="T:LightweightIocContainer.Interfaces.Registrations.IMultitonRegistration`1"/>
+            </summary>
+        </member>
         <member name="T:LightweightIocContainer.Interfaces.Registrations.IMultitonRegistration`1">
             <summary>
             A base <see cref="T:LightweightIocContainer.Interfaces.Registrations.IMultitonRegistration`1"/> without implementation
@@ -615,11 +630,6 @@
             </summary>
             <typeparam name="TInterface">The registered Interface</typeparam>
         </member>
-        <member name="P:LightweightIocContainer.Interfaces.Registrations.IRegistrationBase`1.Lifestyle">
-            <summary>
-            The Lifestyle of Instances that are created with this <see cref="T:LightweightIocContainer.Interfaces.Registrations.IRegistrationBase`1"/>
-            </summary>
-        </member>
         <member name="T:LightweightIocContainer.Interfaces.Registrations.ISingleTypeRegistration`1">
             <summary>
             The <see cref="T:LightweightIocContainer.Interfaces.Registrations.IRegistrationBase`1"/> to register either only an interface or only a <see cref="T:System.Type"/>
diff --git a/Test.LightweightIocContainer/IocContainerTest.cs b/Test.LightweightIocContainer/IocContainerTest.cs
index ac56340..3812233 100644
--- a/Test.LightweightIocContainer/IocContainerTest.cs
+++ b/Test.LightweightIocContainer/IocContainerTest.cs
@@ -182,6 +182,12 @@ namespace Test.LightweightIocContainer
             Assert.DoesNotThrow(() => _iocContainer.RegisterMultiton<ITest, Test, MultitonScope>());
         }
 
+        [Test]
+        public void TestInvalidMultitonRegistration()
+        {
+            Assert.Throws<InvalidRegistrationException>(() => _iocContainer.Register<ITest, Test>(Lifestyle.Multiton));
+        }
+
         [Test]
         public void TestRegisterFactory()
         {