Refactor

z4kn4fein · Mar 13, 2017 · 0dcf9eb · 0dcf9eb
1 parent 0539768
commit 0dcf9eb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 30 deletions.
diff --git a/src/stashbox.tests/AttributeTests.cs b/src/stashbox.tests/AttributeTests.cs
@@ -49,7 +49,7 @@ public void AttributeTests_Resolve_Activator()
             container.RegisterType<ITest1, Test11>("test11");
             container.RegisterType<ITest1, Test12>("test12");
 
-            var inst = container.ActivationContext.Activate(ResolutionInfo.New(), new TypeInformation { Type = typeof(ITest1), DependencyName = "test12" });
+            var inst = container.ActivationContext.Activate(ResolutionInfo.New(), typeof(ITest1), "test12");
             Assert.IsNotNull(inst);
             Assert.IsInstanceOfType(inst, typeof(Test12));
         }
@@ -62,7 +62,7 @@ public void AttributeTests_Resolve_Activator_Resolver()
             container.RegisterType<ITest1, Test11>("test11");
             container.RegisterType<ITest1, Test12>("test12");
 
-            var inst = container.ActivationContext.Activate(ResolutionInfo.New(), new TypeInformation { Type = typeof(IEnumerable<ITest1>) });
+            var inst = container.ActivationContext.Activate(ResolutionInfo.New(), typeof(IEnumerable<ITest1>));
             Assert.IsNotNull(inst);
             Assert.IsInstanceOfType(inst, typeof(IEnumerable<ITest1>));
             Assert.AreEqual(3, ((IEnumerable<ITest1>)inst).Count());

diff --git a/src/stashbox/Infrastructure/Registration/IRegistrationRepository.cs b/src/stashbox/Infrastructure/Registration/IRegistrationRepository.cs
@@ -12,19 +12,19 @@ public interface IRegistrationRepository
         /// <summary>
         /// Adds or updates an element in the repository.
         /// </summary>
-        /// <param name="typeKey">The key type.</param>
-        /// <param name="nameKey">The name of the registration.</param>
+        /// <param name="type">The type.</param>
+        /// <param name="name">The name of the registration.</param>
         /// <param name="canUpdate">Indicates that update is allowed</param>
         /// <param name="registration">The registration.</param>
-        void AddOrUpdateRegistration(Type typeKey, string nameKey, bool canUpdate, IServiceRegistration registration);
+        void AddOrUpdateRegistration(Type type, string name, bool canUpdate, IServiceRegistration registration);
 
         /// <summary>
         /// Retrieves a registration.
         /// </summary>
         /// <param name="type">The requested type.</param>
         /// <param name="name">The requested name.</param>
         /// <returns>The registration or null, if it doesn't exist.</returns>
-        IServiceRegistration GetRegistrationOrDefault(Type type, string name);
+        IServiceRegistration GetRegistrationOrDefault(Type type, string name = null);
 
         /// <summary>
         /// Retrieves a registration.

diff --git a/src/stashbox/Infrastructure/Resolution/IActivationContext.cs b/src/stashbox/Infrastructure/Resolution/IActivationContext.cs
@@ -20,9 +20,10 @@ public interface IActivationContext
         /// Activates a type.
         /// </summary>
         /// <param name="resolutionInfo">The resolution info.</param>
-        /// <param name="typeInfo">The type info.</param>
+        /// <param name="type">The type.</param>
+        /// <param name="name">The service name.</param>
         /// <returns>The resolved object.</returns>
-        object Activate(ResolutionInfo resolutionInfo, TypeInformation typeInfo);
+        object Activate(ResolutionInfo resolutionInfo, Type type, string name = null);
 
         /// <summary>
         /// Activates a type via a delegate.

diff --git a/src/stashbox/Registration/RegistrationRepository.cs b/src/stashbox/Registration/RegistrationRepository.cs
@@ -21,13 +21,13 @@ public RegistrationRepository(IContainerConfigurator containerConfigurator)
             this.conditionalRepository = new ConcurrentTree<Type, ConcurrentTree<string, IServiceRegistration>>();
         }
 
-        public void AddOrUpdateRegistration(Type typeKey, string nameKey, bool canUpdate, IServiceRegistration registration)
+        public void AddOrUpdateRegistration(Type type, string name, bool canUpdate, IServiceRegistration registration)
         {
-            this.AddOrUpdateRegistration(typeKey, nameKey, canUpdate, registration,
+            this.AddOrUpdateRegistration(type, name, canUpdate, registration,
                 registration.HasCondition ? this.conditionalRepository : this.serviceRepository);
         }
 
-        public IServiceRegistration GetRegistrationOrDefault(Type type, string name) =>
+        public IServiceRegistration GetRegistrationOrDefault(Type type, string name = null) =>
             name != null ? this.GetNamedRegistrationOrDefault(type, name) : this.GetDefaultRegistrationOrDefault(type);
 
         public IServiceRegistration GetRegistrationOrDefault(TypeInformation typeInfo, bool checkConditions = false)

diff --git a/src/stashbox/Resolution/ActivationContext.cs b/src/stashbox/Resolution/ActivationContext.cs
@@ -22,19 +22,16 @@ public ActivationContext(IContainerContext containerContext, IResolverSelector r
         public object Activate(Type type, string name = null)
         {
             var cachedFactory = this.containerContext.DelegateRepository.GetDelegateCacheOrDefault(type, name);
-            return cachedFactory != null ? cachedFactory() : this.ActivateType(ResolutionInfo.New(), type, name);
+            return cachedFactory != null ? cachedFactory() : this.Activate(ResolutionInfo.New(), type, name);
         }
 
         public Delegate ActivateFactory(Type type, Type[] parameterTypes, string name = null)
         {
             var cachedFactory = this.containerContext.DelegateRepository.GetFactoryDelegateCacheOrDefault(type, parameterTypes, name);
             return cachedFactory ?? ActivateFactoryDelegate(type, parameterTypes, name);
         }
-
-        public object Activate(ResolutionInfo resolutionInfo, TypeInformation typeInfo) =>
-            this.ActivateType(resolutionInfo, typeInfo);
-
-        private object ActivateType(ResolutionInfo resolutionInfo, Type type, string name)
+
+        public object Activate(ResolutionInfo resolutionInfo, Type type, string name)
         {
             var registration = this.containerContext.RegistrationRepository.GetRegistrationOrDefault(type, name);
             if (registration != null)
@@ -53,19 +50,6 @@ private object ActivateType(ResolutionInfo resolutionInfo, Type type, string nam
             return factory();
         }
 
-        private object ActivateType(ResolutionInfo resolutionInfo, TypeInformation typeInformation)
-        {
-            var registration = this.containerContext.RegistrationRepository.GetRegistrationOrDefault(typeInformation);
-            if (registration != null)
-                return registration.GetExpression(resolutionInfo, typeInformation.Type).CompileDelegate()();
-
-            var expr = this.resolverSelector.GetResolverExpression(containerContext, typeInformation, resolutionInfo);
-            if (expr == null)
-                throw new ResolutionFailedException(typeInformation.Type.FullName);
-
-            return expr.CompileDelegate()();
-        }
-
         private Delegate ActivateFactoryDelegate(Type type, Type[] parameterTypes, string name = null)
         {
             var resolutionInfo = new ResolutionInfo