Refactoring to a much nicer way of registering both keyed and non key…

…ed services at once
MRCollective · May 27, 2014 · f8eea73 · f8eea73
1 parent 6d79dff
commit f8eea73
Showing 1 changed file with 2 additions and 21 deletions.
diff --git a/AutofacContrib.NSubstitute/NSubstituteRegistrationHandler.cs b/AutofacContrib.NSubstitute/NSubstituteRegistrationHandler.cs
@@ -27,27 +27,8 @@ public IEnumerable<IComponentRegistration> RegistrationsFor
         {
             if (service == null)
                 throw new ArgumentNullException("service");
-
-            var keyedService = service as KeyedService;
-            if (keyedService != null)
-            {
-                if (!keyedService.ServiceType.IsInterface ||
-                    keyedService.ServiceType.IsGenericType &&
-                    keyedService.ServiceType.GetGenericTypeDefinition() == typeof (IEnumerable<>) ||
-                    keyedService.ServiceType.IsArray ||
-                    typeof (IStartable).IsAssignableFrom(keyedService.ServiceType))
-                    return Enumerable.Empty<IComponentRegistration>();
-
-                return new[]
-                {
-                    RegistrationBuilder.ForDelegate((c, p) => Substitute.For(new[] { keyedService.ServiceType }, null))
-                    .As(service)
-                    .InstancePerLifetimeScope()
-                    .CreateRegistration()
-                };
-            }
-
-            var typedService = service as TypedService;
+
+            var typedService = service as IServiceWithType;
             if (typedService == null ||
                 !typedService.ServiceType.IsInterface ||
                 typedService.ServiceType.IsGenericType && typedService.ServiceType.GetGenericTypeDefinition() == typeof(IEnumerable<>) ||