add support for keyed required service

Author: DominicUllmann

src/Ninject.Web.AspNetCore.Test/Unit/ServiceProviderKeyedTest.cs

@@ -78,6 +78,71 @@ public void ExistingMultipleServices_ResolvesNonKeyedToNull()
 			provider.GetService(typeof(IWarrior)).Should().BeNull();
 		}
 
+		[Fact]
+		public void RequiredKeyedServiceCollectionExisting_CorrectServiceResolved()
+		{
+			var collection = new ServiceCollection();
+			collection.Add(new ServiceDescriptor(typeof(IWarrior),"Samurai", typeof(Samurai), ServiceLifetime.Transient));
+			collection.Add(new ServiceDescriptor(typeof(IWarrior), "Ninja", new Ninja("test")));
+			var kernel = CreateTestKernel(collection);
+			var provider = CreateServiceProvider(kernel);
+
+			provider.GetRequiredKeyedService(typeof(IWarrior), "Ninja").Should().NotBeNull().And.BeOfType(typeof(Ninja));
+			provider.GetRequiredKeyedService(typeof(IWarrior), "Samurai").Should().NotBeNull().And.BeOfType(typeof(Samurai));
+
+		}
+
+		[Fact]
+		public void RequiredKeyedNinjectDirectBindingExisting_CorrectServiceResolved()
+		{
+			var kernel = CreateTestKernel();
+			kernel.Bind<IWarrior>().To<Samurai>().WithMetadata(nameof(ServiceKey), new ServiceKey("Samurai"));
+			kernel.Bind<IWarrior>().ToConstant(new Ninja("test")).WithMetadata(nameof(ServiceKey), new ServiceKey("Ninja"));
+			var provider = CreateServiceProvider(kernel);
+
+			provider.GetRequiredKeyedService(typeof(IWarrior), "Samurai").Should().NotBeNull().And.BeOfType(typeof(Samurai));
+			provider.GetRequiredKeyedService(typeof(IWarrior), "Ninja").Should().NotBeNull().And.BeOfType(typeof(Ninja));
+		}
+
+		[Fact]
+		public void RequiredKeyedNonExisting_SingleServiceResolvedToException()
+		{
+			var kernel = CreateTestKernel();
+			var provider = CreateServiceProvider(kernel);
+
+			Action action = () => provider.GetRequiredKeyedService(typeof(IWarrior), "Samurai");
+			action.Should().Throw<ActivationException>().WithMessage("*No matching bindings are available*");
+		}
+
+		[Fact]
+		public void RequiredExistingMultipleKeydServices_ResolvedQueriedAsList()
+		{
+			var kernel = CreateTestKernel();
+			kernel.Bind<IWarrior>().To<Samurai>().WithMetadata(nameof(ServiceKey), new ServiceKey("Samurai"));;
+			kernel.Bind<IWarrior>().ToConstant(new Ninja("test")).WithMetadata(nameof(ServiceKey), new ServiceKey("Ninja"));
+			var provider = CreateServiceProvider(kernel);
+
+			var result = provider.GetRequiredService(typeof(IList<IWarrior>)) as IEnumerable<IWarrior>;
+
+			result.Should().NotBeNull();
+			var resultList = result.ToList();
+			resultList.Should().HaveCount(2);
+			resultList.Should().Contain(x => x is Samurai);
+			resultList.Should().Contain(x => x is Ninja);
+		}
+
+		[Fact]
+		public void ExistingMultipleServices_ResolvesNonKeyedToException()
+		{
+			var kernel = CreateTestKernel();
+			kernel.Bind<IWarrior>().To<Samurai>().WithMetadata(nameof(ServiceKey), new ServiceKey("Samurai"));;
+			kernel.Bind<IWarrior>().ToConstant(new Ninja("test")).WithMetadata(nameof(ServiceKey), new ServiceKey("Ninja"));
+			var provider = CreateServiceProvider(kernel);
+
+			Action action = () => provider.GetRequiredService(typeof(IWarrior));
+			action.Should().Throw<ActivationException>().WithMessage("*More than one matching bindings are available*");
+		}
+
 		private IServiceProvider CreateServiceProvider(AspNetCoreKernel kernel)
 		{
 			NinjectServiceProviderBuilder builder = CreateServiceProviderBuilder(kernel);

src/Ninject.Web.AspNetCore/NinjectServiceProvider.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Ninject.Syntax;
 using System;
+using Ninject.Planning.Bindings;
 
 namespace Ninject.Web.AspNetCore
 {
@@ -52,12 +53,18 @@ public void Dispose()
 #if NET8_0_OR_GREATER
 		public object GetKeyedService(Type serviceType, object serviceKey)
 		{
-			return _resolutionRoot.TryGet(serviceType, metadata => metadata.Get<ServiceKey>(nameof(ServiceKey))?.Key == serviceKey);
+			var result = _resolutionRoot.TryGet(serviceType, metadata => DoesMetadataMatchServiceKey(serviceKey, metadata));
+			return result;
 		}
 
 		public object GetRequiredKeyedService(Type serviceType, object serviceKey)
 		{
-			throw new NotImplementedException();
+			return _resolutionRoot.Get(serviceType, metadata => DoesMetadataMatchServiceKey(serviceKey, metadata));
+		}
+
+		private static bool DoesMetadataMatchServiceKey(object serviceKey, IBindingMetadata metadata)
+		{
+			return metadata.Get<ServiceKey>(nameof(ServiceKey))?.Key == serviceKey;
 		}
 #endif
 	}