Updating and refactoring

Author: ENikS

src/Builder/IBuilderContext.cs

@@ -157,7 +157,6 @@ public static object NewBuildUp(this IBuilderContext context, INamedType newBuil
                 .NewBuildUp(newBuildKey?.Type, newBuildKey?.Name, childCustomizationBlock);
         }
 
-
         /// <summary>
         /// Start a recursive build up operation to retrieve the default
         /// value for the given <typeparamref name="TResult"/> type.

src/Builder/Selection/SelectedProperty.cs

@@ -32,7 +32,7 @@ public SelectedProperty(PropertyInfo property, IResolverPolicy resolver)
         public PropertyInfo Property { get; }
 
         /// <summary>
-        /// IDependencyResolverPolicy for this property
+        /// IResolverPolicy for this property
         /// </summary>
         public IResolverPolicy Resolver { get; }
     }

src/Extension/ExtensionContext.cs

@@ -16,40 +16,58 @@ namespace Unity.Extension
     /// </summary>
     public abstract class ExtensionContext
     {
+        #region Container
+
         /// <summary>
         /// The container that this context is associated with.
         /// </summary>
         /// <value>The <see cref="IUnityContainer"/> object.</value>
         public abstract IUnityContainer Container { get; }
 
+        /// <summary>
+        /// The <see cref="ILifetimeContainer"/> that this container uses.
+        /// </summary>
+        /// <value>The <see cref="ILifetimeContainer"/> is used to manage <see cref="IDisposable"/> objects that the container is managing.</value>
+        public abstract ILifetimeContainer Lifetime { get; }
+
+        #endregion
+
+
+        #region Strategies
+
         /// <summary>
         /// The strategies this container uses.
         /// </summary>
         /// <value>The <see cref="IStagedStrategyChain{TStrategyType,TStageEnum}"/> that the container uses to build objects.</value>
-        public abstract IStagedStrategyChain<IBuilderStrategy,UnityBuildStage> Strategies { get; }
-        
+        public abstract IStagedStrategyChain<IBuilderStrategy, UnityBuildStage> Strategies { get; }
+
         /// <summary>
         /// The strategies this container uses to construct build plans.
         /// </summary>
         /// <value>The <see cref="IStagedStrategyChain{TStrategyType,TStageEnum}"/> that this container uses when creating
         /// build plans.</value>
         public abstract IStagedStrategyChain<IBuilderStrategy, BuilderStage> BuildPlanStrategies { get; }
 
+        #endregion
+
+
+        #region Policy Lists
+
         /// <summary>
         /// The policies this container uses.
         /// </summary>
         /// <remarks>The <see cref="IPolicyList"/> the that container uses to build objects.</remarks>
         public abstract IPolicyList Policies { get; }
 
-        /// <summary>
-        /// The <see cref="ILifetimeContainer"/> that this container uses.
-        /// </summary>
-        /// <value>The <see cref="ILifetimeContainer"/> is used to manage <see cref="IDisposable"/> objects that the container is managing.</value>
-        public abstract ILifetimeContainer Lifetime { get; }
+        #endregion
+
+
+        #region Events
 
         /// <summary>
-        /// This event is raised when the <see cref="IUnityContainer.RegisterType(Type,Type,string,LifetimeManager, Unity.Registration.InjectionMember[])"/> method,
-        /// or one of its overloads, is called.
+        /// This event is raised when the 
+        /// <see cref="IUnityContainer.RegisterType(Type,Type,string,LifetimeManager, Unity.Registration.InjectionMember[])"/> 
+        /// method, or one of its overloads, is called.
         /// </summary>
         public abstract event EventHandler<RegisterEventArgs> Registering;
 
@@ -64,5 +82,7 @@ public abstract class ExtensionContext
         /// the newly created child container to extensions to act on as they see fit.
         /// </summary>
         public abstract event EventHandler<ChildContainerCreatedEventArgs> ChildContainerCreated;
+
+        #endregion
     }
 }

src/Injection/InjectionFactory.cs

@@ -69,8 +69,7 @@ public void BuildUp(IBuilderContext context)
         {
             if ((context ?? throw new ArgumentNullException(nameof(context))).Existing == null)
             {
-                var currentContainer = context.NewBuildUp<IUnityContainer>();
-                context.Existing = _factoryFunc(currentContainer, context.BuildKey.Type, context.BuildKey.Name);
+                context.Existing = _factoryFunc(context.Container, context.BuildKey.Type, context.BuildKey.Name);
                 context.SetPerBuildSingleton();
             }
         }

src/ResolverPolicy/FixedTypeResolverPolicy.cs

@@ -24,7 +24,7 @@ public FixedTypeResolverPolicy(Type typeToBuild)
             _keyToBuild = new NamedTypeBuildKey(typeToBuild);
         }
 
-        #region IDependencyResolverPolicy Members
+        #region IResolverPolicy Members
 
         /// <summary>
         /// GetOrDefault the value for a dependency.
@@ -33,7 +33,7 @@ public FixedTypeResolverPolicy(Type typeToBuild)
         /// <returns>The value for the dependency.</returns>
         public object Resolve(IBuilderContext context)
         {
-            return (context ?? throw new ArgumentNullException(nameof(context))).NewBuildUp(_keyToBuild);
+            return (context ?? throw new ArgumentNullException(nameof(context))).NewBuildUp(_keyToBuild.Type, _keyToBuild.Name);
         }
 
         #endregion

src/ResolverPolicy/NamedTypeDependencyResolverPolicy.cs

@@ -33,7 +33,7 @@ public NamedTypeDependencyResolverPolicy(Type type, string name)
         public object Resolve(IBuilderContext context)
         {
             return (context ?? throw new ArgumentNullException(nameof(context)))
-                .NewBuildUp(new NamedTypeBuildKey(Type, Name));
+                .NewBuildUp(Type, Name);
         }
 
         /// <summary>

src/ResolverPolicy/OptionalDependencyResolverPolicy.cs

@@ -54,7 +54,7 @@ public OptionalDependencyResolverPolicy(Type type)
         /// </summary>
         public string Name { get; }
 
-        #region IDependencyResolverPolicy Members
+        #region IResolverPolicy Members
 
         /// <summary>
         /// GetOrDefault the value for a dependency.
@@ -63,10 +63,9 @@ public OptionalDependencyResolverPolicy(Type type)
         /// <returns>The value for the dependency.</returns>
         public object Resolve(IBuilderContext context)
         {
-            var newKey = new NamedTypeBuildKey(DependencyType, Name);
             try
             {
-                return (context ?? throw new ArgumentNullException(nameof(context))).NewBuildUp(newKey);
+                return (context ?? throw new ArgumentNullException(nameof(context))).NewBuildUp(DependencyType, Name);
             }
             catch (Exception)
             {