Fixes #123

Keboo · Jul 22, 2018 · a8d4df9 · a8d4df9
1 parent 3437640
commit a8d4df9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/AutoDI.Tests/ContainerMapTests.cs b/AutoDI.Tests/ContainerMapTests.cs
@@ -391,6 +391,22 @@ public void CanResolveMultipleArrayContructoreParameter()
                 @class.Parameter.Select(x => x.GetType()).ToArray());
         }
 
+        [TestMethod]
+        public void CanRemovedRegisteredMap()
+        {
+            var map = new ContainerMap();
+            var services = new AutoDIServiceCollection();
+            services.AddAutoDISingleton<IInterface, Derived1>();
+            services.AddAutoDISingleton<IInterface, Derived2>();
+            map.Add(services);
+
+            bool wasRemoved = map.Remove<IInterface>();
+            var interfaces = map.Get<IEnumerable<IInterface>>(null);
+
+            Assert.IsTrue(wasRemoved);
+            Assert.IsNull(interfaces);
+        }
+
         private interface IInterface { }
 
         private interface IInterface2 { }

diff --git a/AutoDI/ContainerMap.cs b/AutoDI/ContainerMap.cs
@@ -25,7 +25,6 @@ static ContainerMap()
 
         public void Add(IServiceCollection services)
         {
-            ////TODO: This re-grouping seems off somewhere...
             foreach (IGrouping<Type, ServiceDescriptor> serviceDescriptors in
                      from ServiceDescriptor service in services
                      let autoDIService = service as AutoDIServiceDescriptor
@@ -63,6 +62,10 @@ private void AddInternal(DelegateContainer container, Type key)
             }
         }
 
+        public bool Remove<T>() => Remove(typeof(T));
+
+        public bool Remove(Type serviceType) => _accessors.Remove(serviceType);
+
         public T Get<T>(IServiceProvider provider)
         {
             //https://github.com/Keboo/DoubleDownWat
@@ -74,15 +77,15 @@ public T Get<T>(IServiceProvider provider)
             return default(T);
         }
 
-        public object Get(Type key, IServiceProvider provider)
+        public object Get(Type serviceType, IServiceProvider provider)
         {
-            if (TryGet(key, provider ?? new ContainerServiceProvider(this), out object result))
+            if (TryGet(serviceType, provider ?? new ContainerServiceProvider(this), out object result))
             {
                 return result;
             }
 
             //Type key not found
-            var args = new TypeKeyNotFoundEventArgs(key);
+            var args = new TypeKeyNotFoundEventArgs(serviceType);
             TypeKeyNotFound?.Invoke(this, args);
             return args.Instance;
         }

diff --git a/AutoDI/IContainer.cs b/AutoDI/IContainer.cs
@@ -8,7 +8,10 @@ public interface IContainer : IEnumerable<Map>
         event EventHandler<TypeKeyNotFoundEventArgs> TypeKeyNotFound;
 
         T Get<T>(IServiceProvider provider);
-        object Get(Type key, IServiceProvider provider);
+        object Get(Type serviceType, IServiceProvider provider);
+
+        bool Remove<T>();
+        bool Remove(Type serviceType);
 
         IContainer CreatedNestedContainer();
     }

diff --git a/AutoDI/TypeKeyNotFoundEventArgs.cs b/AutoDI/TypeKeyNotFoundEventArgs.cs
@@ -4,13 +4,13 @@ namespace AutoDI
 {
     public class TypeKeyNotFoundEventArgs : EventArgs
     {
-        public Type ServiceKey { get; }
+        public Type ServiceType { get; }
 
         public object Instance { get; set; }
 
-        public TypeKeyNotFoundEventArgs(Type serviceKey)
+        public TypeKeyNotFoundEventArgs(Type serviceType)
         {
-            ServiceKey = serviceKey;
+            ServiceType = serviceType;
         }
     }
 }