Merge pull request #555 from robertcoltheart/refactor/remove-reflection

Use generic registration instead of reflection
castleproject · Oct 8, 2020 · 6ddf7c9 · 6ddf7c9
2 parents 5e4416d + a229be4
commit 6ddf7c9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/Extensions/ServiceDescriptorExtensions.cs b/src/Castle.Windsor.Extensions.DependencyInjection/Extensions/ServiceDescriptorExtensions.cs
@@ -14,8 +14,6 @@
 
 namespace Castle.Windsor.Extensions.DependencyInjection.Extensions
 {
-	using System.Reflection;
-
 	using Castle.MicroKernel.Registration;
 
 	public static class ServiceDescriptorExtensions
@@ -26,11 +24,8 @@ public static IRegistration CreateWindsorRegistration(this Microsoft.Extensions.
 			{
 				return RegistrationAdapter.FromOpenGenericServiceDescriptor(service);
 			}
-			else
-			{
-				var method = typeof(RegistrationAdapter).GetMethod("FromServiceDescriptor", BindingFlags.Static | BindingFlags.Public).MakeGenericMethod(service.ServiceType);
-				return method.Invoke(null, new object[] { service }) as IRegistration;
-			}
+
+			return RegistrationAdapter.FromServiceDescriptor(service);
 		}
 	}
 }
diff --git a/src/Castle.Windsor.Extensions.DependencyInjection/RegistrationAdapter.cs b/src/Castle.Windsor.Extensions.DependencyInjection/RegistrationAdapter.cs
@@ -41,25 +41,25 @@ public static IRegistration FromOpenGenericServiceDescriptor(Microsoft.Extension
 				.IsDefault();
 		}
 
-		public static IRegistration FromServiceDescriptor<TService>(Microsoft.Extensions.DependencyInjection.ServiceDescriptor service) where TService : class
+		public static IRegistration FromServiceDescriptor(Microsoft.Extensions.DependencyInjection.ServiceDescriptor service)
 		{
-			var registration = Component.For<TService>()
+			var registration = Component.For(service.ServiceType)
 				.NamedAutomatically(UniqueComponentName(service));
 
-			if(service.ImplementationFactory != null)
+			if (service.ImplementationFactory != null)
 			{
-				registration = UsingFactoryMethod<TService>(registration, service);
+				registration = UsingFactoryMethod(registration, service);
 			}
-			else if(service.ImplementationInstance != null)
+			else if (service.ImplementationInstance != null)
 			{
-				registration = UsingInstance<TService>(registration, service);
+				registration = UsingInstance(registration, service);
 			}
-			else if(service.ImplementationType != null)
+			else if (service.ImplementationType != null)
 			{
-				registration = UsingImplementation<TService>(registration, service);
+				registration = UsingImplementation(registration, service);
 			}
 
-			return ResolveLifestyle<TService>(registration, service)
+			return ResolveLifestyle(registration, service)
 				.IsDefault();
 		}