Merge pull request #191 from hadashiA/ku/resolve-last-one

Make conflict registration always resolve with the last one
hadashiA · Apr 23, 2021 · 5f101a2 · 5f101a2 · vercel · Apr 23, 2021
2 parents a7d8065 + 051c2da
commit 5f101a2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Internal/FixedTypeKeyHashTableRegistry.cs b/VContainer/Assets/VContainer/Runtime/Internal/FixedTypeKeyHashTableRegistry.cs
@@ -59,6 +59,9 @@ static void AddToBuildBuffer(IDictionary<Type, IRegistration> buf, Type service,
                     AddCollectionToBuildBuffer(buf, collection);
                 }
                 collection.Add(registration);
+
+                // Overwritten by the later registration
+                buf[service] = registration;
             }
             else
             {

diff --git a/VContainer/Assets/VContainer/Tests/ContainerTest.cs b/VContainer/Assets/VContainer/Tests/ContainerTest.cs
@@ -197,6 +197,24 @@ public void ResolveCollection()
             Assert.That(empty, Is.Empty);
         }
 
+        [Test]
+        public void ResolveLastOneWhenConflicted()
+        {
+            var builder = new ContainerBuilder();
+            builder.Register<I1, MultipleInterfaceServiceA>(Lifetime.Transient);
+            builder.Register<I1, MultipleInterfaceServiceB>(Lifetime.Transient);
+
+            builder.Register<I3, MultipleInterfaceServiceB>(Lifetime.Transient);
+            builder.Register<I3, MultipleInterfaceServiceA>(Lifetime.Transient);
+            builder.Register<I3, MultipleInterfaceServiceB>(Lifetime.Transient);
+
+            var container = builder.Build();
+            var i1 = container.Resolve<I1>();
+            var i3 = container.Resolve<I3>();
+            Assert.That(i1, Is.InstanceOf<MultipleInterfaceServiceB>());
+            Assert.That(i3, Is.InstanceOf<MultipleInterfaceServiceB>());
+        }
+
         [Test]
         public void ResolveOnceAsCollection()
         {