tidy up optimized code

Author: fsimonazzi

source/Unity.Configuration/Src/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="1.2" targetFramework="net45" />
+  <package id="CommonServiceLocator" version="1.0" targetFramework="net45" />
 </packages>

source/Unity.Interception/Src/ContainerIntegration/ObjectBuilder/TypeInterceptionStrategy.cs

@@ -145,7 +145,7 @@ private static SelectedConstructor FindNewConstructor(SelectedConstructor origin
 
                 SelectedConstructor newConstructor = new SelectedConstructor(newConstructorInfo);
 
-                foreach (var resolver in originalConstructor.GetParameterResolvers())
+                foreach (IDependencyResolverPolicy resolver in originalConstructor.GetParameterResolvers())
                 {
                     newConstructor.AddParameterResolver(resolver);
                 }

source/Unity/Src/ObjectBuilder/BuilderContext.cs

@@ -19,7 +19,7 @@ public class BuilderContext : IBuilderContext
         readonly NamedTypeBuildKey originalBuildKey;
         private readonly IPolicyList persistentPolicies;
         readonly IPolicyList policies;
-        private  CompositeResolverOverride resolverOverrides = new CompositeResolverOverride();
+        private CompositeResolverOverride resolverOverrides = new CompositeResolverOverride();
 
         /// <summary>
         /// Initialize a new instance of the <see cref="BuilderContext"/> class.
@@ -147,7 +147,6 @@ public IPolicyList Policies
             get { return policies; }
         }
 
-
         /// <summary>
         /// Gets the collection of <see cref="IRequiresRecovery"/> objects
         /// that need to execute in event of an exception.
@@ -207,11 +206,9 @@ public object NewBuildUp(NamedTypeBuildKey newBuildKey)
             this.ChildContext =
                 new BuilderContext(chain, lifetime, persistentPolicies, policies, newBuildKey, null)
                     {
-                        resolverOverrides = resolverOverrides
+                        resolverOverrides = this.resolverOverrides
                     };
 
-            //ChildContext.AddResolverOverrides(Sequence.Collect(resolverOverrides));
-
             object result = this.ChildContext.Strategies.ExecuteBuildUp(this.ChildContext);
 
             this.ChildContext = null;
@@ -237,11 +234,9 @@ public object NewBuildUp(NamedTypeBuildKey newBuildKey, Action<IBuilderContext>
             ChildContext =
                 new BuilderContext(chain, lifetime, persistentPolicies, policies, newBuildKey, null)
                 {
-                    resolverOverrides = resolverOverrides
+                    resolverOverrides = this.resolverOverrides
                 };
 
-            //ChildContext.AddResolverOverrides(Sequence.Collect(resolverOverrides));
-
             childCustomizationBlock(ChildContext);
 
             object result = ChildContext.Strategies.ExecuteBuildUp(ChildContext);

source/Unity/Src/ObjectBuilder/Policies/PolicyList.cs

@@ -14,12 +14,11 @@ namespace Microsoft.Practices.ObjectBuilder2
     /// </summary>
     public class PolicyList : IPolicyList
     {
-        private static readonly PolicyKeyEqualityComparer Comparer = new PolicyKeyEqualityComparer();
         private readonly IPolicyList innerPolicyList;
         private readonly object lockObject = new object();
         // Does not need to be volatile. It is fine if a slightly out of date version of the current snapshot is read
         // as long as replacing a snapshot when adding or removing policies is thread safe
-        private Dictionary<PolicyKey, IBuilderPolicy> policies = new Dictionary<PolicyKey, IBuilderPolicy>(Comparer);
+        private Dictionary<PolicyKey, IBuilderPolicy> policies = new Dictionary<PolicyKey, IBuilderPolicy>(PolicyKeyEqualityComparer.Default);
 
         /// <summary>
         /// Initialize a new instance of a <see cref="PolicyList"/> class.
@@ -73,7 +72,7 @@ public void ClearAll()
         {
             lock (lockObject)
             {
-                this.policies = new Dictionary<PolicyKey, IBuilderPolicy>(Comparer);
+                this.policies = new Dictionary<PolicyKey, IBuilderPolicy>(PolicyKeyEqualityComparer.Default);
             }
         }
 
@@ -211,7 +210,7 @@ public void SetDefault(Type policyInterface,
 
         private Dictionary<PolicyKey, IBuilderPolicy> ClonePolicies()
         {
-            return new Dictionary<PolicyKey, IBuilderPolicy>(policies, Comparer);
+            return new Dictionary<PolicyKey, IBuilderPolicy>(policies, PolicyKeyEqualityComparer.Default);
         }
 
         private static bool TryGetType(object buildKey, out Type type)
@@ -338,15 +337,12 @@ private static int SafeGetHashCode(object obj)
             {
                 return obj != null ? obj.GetHashCode() : 0;
             }
-
-            public bool Equals(PolicyKey other)
-            {
-                return this == other;
-            }
         }
 
         class PolicyKeyEqualityComparer : IEqualityComparer<PolicyKey>
         {
+            public static readonly PolicyKeyEqualityComparer Default = new PolicyKeyEqualityComparer();
+
             public bool Equals(PolicyKey x, PolicyKey y)
             {
                 return x.PolicyType == y.PolicyType &&

source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/ConstructorSelectorPolicyBase.cs

@@ -25,7 +25,7 @@ public abstract class ConstructorSelectorPolicyBase<TInjectionConstructorMarkerA
         /// <param name="resolverPolicyDestination">The <see cref='IPolicyList'/> to add any
         /// generated resolver objects into.</param>
         /// <returns>The chosen constructor.</returns>
-        [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", Justification="Validation done by Guard class")]
+        [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", Justification = "Validation done by Guard class")]
         public SelectedConstructor SelectConstructor(IBuilderContext context, IPolicyList resolverPolicyDestination)
         {
             Guard.ArgumentNotNull(context, "context");
@@ -41,17 +41,12 @@ public SelectedConstructor SelectConstructor(IBuilderContext context, IPolicyLis
         private SelectedConstructor CreateSelectedConstructor(IBuilderContext context, IPolicyList resolverPolicyDestination, ConstructorInfo ctor)
         {
             var result = new SelectedConstructor(ctor);
-            
-            foreach(ParameterInfo param in ctor.GetParameters())
+
+            foreach (ParameterInfo param in ctor.GetParameters())
             {
-                string key = Guid.NewGuid().ToString();
-                var policy = CreateResolver(param);
-                resolverPolicyDestination.Set(policy, key);
-                DependencyResolverTrackerPolicy.TrackKey(resolverPolicyDestination,
-                    context.BuildKey,
-                    key);
-                result.AddParameterResolver(policy);
+                result.AddParameterResolver(this.CreateResolver(param));
             }
+
             return result;
         }
 
@@ -72,7 +67,7 @@ private static ConstructorInfo FindInjectionConstructor(Type typeToConstruct)
                                                                                 typeof(TInjectionConstructorMarkerAttribute),
                                                                                 true))
                                                         .ToArray();
-            switch(injectionConstructors.Length)
+            switch (injectionConstructors.Length)
             {
                 case 0:
                     return null;
@@ -96,7 +91,7 @@ private static ConstructorInfo FindLongestConstructor(Type typeToConstruct)
             ConstructorInfo[] constructors = typeToConstructReflector.InstanceConstructors.ToArray();
             Array.Sort(constructors, new ConstructorLengthComparer());
 
-            switch(constructors.Length)
+            switch (constructors.Length)
             {
                 case 0:
                     return null;
@@ -106,7 +101,7 @@ private static ConstructorInfo FindLongestConstructor(Type typeToConstruct)
 
                 default:
                     int paramLength = constructors[0].GetParameters().Length;
-                    if(constructors[1].GetParameters().Length == paramLength)
+                    if (constructors[1].GetParameters().Length == paramLength)
                     {
                         throw new InvalidOperationException(
                             string.Format(

source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Creation/SelectedMemberWithParameters.cs

@@ -6,25 +6,26 @@ namespace Microsoft.Practices.ObjectBuilder2
 {
     /// <summary>
     /// Base class for return of selector policies that need
-    /// to keep track of a set of parameter keys.
+    /// to keep track of a set of parameter resolvers.
     /// </summary>
     public class SelectedMemberWithParameters
     {
         private readonly List<IDependencyResolverPolicy> parameterResolvers = new List<IDependencyResolverPolicy>();
 
         /// <summary>
-        /// Adds the parameter resolver.
+        /// Adds the parameter resolver. Resolvers are assumed
+        /// to be in the order of the parameters to the member.
         /// </summary>
-        /// <param name="newKey">The new key.</param>
-        public void AddParameterResolver(IDependencyResolverPolicy newKey)
+        /// <param name="newResolver">The new resolver.</param>
+        public void AddParameterResolver(IDependencyResolverPolicy newResolver)
         {
-            parameterResolvers.Add(newKey);
+            parameterResolvers.Add(newResolver);
         }
 
         /// <summary>
         /// Gets the parameter resolvers.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>An array with the parameter resolvers.</returns>
         public IDependencyResolverPolicy[] GetParameterResolvers()
         {
             return parameterResolvers.ToArray();

source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Creation/DynamicMethodConstructorStrategy.cs

@@ -2,17 +2,14 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
 using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.Practices.ObjectBuilder2;
-using System.Globalization;
+using Microsoft.Practices.Unity;
 using Microsoft.Practices.Unity.Properties;
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.Practices.Unity.Utility;
-using Microsoft.Practices.Unity;
 
 namespace Microsoft.Practices.ObjectBuilder2
 {
@@ -169,7 +166,7 @@ private IEnumerable<Expression> BuildConstructionParameterExpressions(DynamicBui
             int i = 0;
             var constructionParameters = selectedConstructor.Constructor.GetParameters();
 
-            foreach (var parameterResolver in selectedConstructor.GetParameterResolvers())
+            foreach (IDependencyResolverPolicy parameterResolver in selectedConstructor.GetParameterResolvers())
             {
                 yield return buildContext.CreateParameterExpression(
                                 parameterResolver,

source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/DynamicBuildPlanGenerationContext.cs

@@ -19,11 +19,11 @@ public class DynamicBuildPlanGenerationContext
         private readonly ParameterExpression contextParameter;
         private readonly Queue<Expression> buildPlanExpressions;
 
-        private static readonly MethodInfo GetResolveDependencyMethod =
+        private static readonly MethodInfo ResolveDependencyMethod =
             StaticReflection.GetMethodInfo((IDependencyResolverPolicy r) => r.Resolve(null));
 
         private static readonly MethodInfo GetResolverMethod =
-            StaticReflection.GetMethodInfo(() => GetResolver(null, null, null as IDependencyResolverPolicy));
+            StaticReflection.GetMethodInfo(() => GetResolver(null, null, (IDependencyResolverPolicy)null));
 
         private static readonly MemberInfo GetBuildContextExistingObjectProperty =
             StaticReflection.GetMemberInfo((IBuilderContext c) => c.Existing);
@@ -120,7 +120,7 @@ internal Expression GetResolveDependencyExpression(Type dependencyType, IDepende
                                                ContextParameter,
                                                Expression.Constant(dependencyType, typeof(Type)),
                                                Expression.Constant(resolver, typeof(IDependencyResolverPolicy))),
-                               GetResolveDependencyMethod,
+                               ResolveDependencyMethod,
                                ContextParameter),
                            dependencyType);
         }
@@ -174,12 +174,10 @@ private Expression SaveCurrentOperationExpression(ParameterExpression saveExpres
         /// <param name="resolverKey">Key the resolver was stored under.</param>
         /// <returns>The found dependency resolver.</returns>
         [SuppressMessage("Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", Justification = "Validation done by Guard class")]
+        [Obsolete("Resolvers are no longer stored as policies.")]
         public static IDependencyResolverPolicy GetResolver(IBuilderContext context, Type dependencyType, string resolverKey)
         {
-            Guard.ArgumentNotNull(context, "context");
-
-            var resolver = context.GetOverriddenResolver(dependencyType);
-            return resolver ?? context.Policies.Get<IDependencyResolverPolicy>(resolverKey);
+            throw new NotSupportedException("This method is no longer used");
         }
 
         /// <summary>

source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/DynamicMethod/Method/DynamicMethodCallStrategy.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
@@ -12,8 +11,6 @@
 
 namespace Microsoft.Practices.ObjectBuilder2
 {
-    using System.Runtime.CompilerServices;
-
     /// <summary>
     /// A <see cref="BuilderStrategy"/> that generates IL to call
     /// chosen methods (as specified by the current <see cref="IMethodSelectorPolicy"/>)
@@ -39,7 +36,7 @@ public override void PreBuildUp(IBuilderContext context)
             Guard.ArgumentNotNull(context, "context");
 
             var dynamicBuildContext = (DynamicBuildPlanGenerationContext)(context.Existing);
-            
+
             IPolicyList resolverPolicyDestination;
             var selector = context.Policies.Get<IMethodSelectorPolicy>(context.BuildKey, out resolverPolicyDestination);
 
@@ -75,14 +72,14 @@ public override void PreBuildUp(IBuilderContext context)
             }
         }
 
-       
+
 
         private IEnumerable<Expression> BuildMethodParameterExpressions(DynamicBuildPlanGenerationContext context, SelectedMethod method, string methodSignature)
         {
             int i = 0;
             var methodParameters = method.Method.GetParameters();
 
-            foreach (var parameterResolver in method.GetParameterResolvers())
+            foreach (IDependencyResolverPolicy parameterResolver in method.GetParameterResolvers())
             {
                 yield return context.CreateParameterExpression(
                                 parameterResolver,
@@ -94,8 +91,6 @@ private IEnumerable<Expression> BuildMethodParameterExpressions(DynamicBuildPlan
                                     context.ContextParameter));
                 i++;
             }
-
-            yield break;
         }
 
         private static void GuardMethodIsNotOpenGeneric(MethodInfo method)

source/Unity/Src/ObjectBuilder/Strategies/BuildPlan/Method/MethodSelectorPolicyBase.cs

@@ -32,7 +32,7 @@ public virtual IEnumerable<SelectedMethod> SelectMethods(IBuilderContext context
 
             foreach (MethodInfo method in candidateMethods)
             {
-                if(method.IsDefined(typeof(TMarkerAttribute), false))
+                if (method.IsDefined(typeof(TMarkerAttribute), false))
                 {
                     yield return CreateSelectedMethod(context, resolverPolicyDestination, method);
                 }
@@ -42,16 +42,11 @@ public virtual IEnumerable<SelectedMethod> SelectMethods(IBuilderContext context
         private SelectedMethod CreateSelectedMethod(IBuilderContext context, IPolicyList resolverPolicyDestination, MethodInfo method)
         {
             var result = new SelectedMethod(method);
-            foreach(ParameterInfo parameter in method.GetParameters())
+            foreach (ParameterInfo parameter in method.GetParameters())
             {
-                string key = Guid.NewGuid().ToString();
-                var resolver = CreateResolver(parameter);
-                resolverPolicyDestination.Set(resolver, key);
-                DependencyResolverTrackerPolicy.TrackKey(context.PersistentPolicies,
-                    context.BuildKey,
-                    key);
-                result.AddParameterResolver(resolver);
+                result.AddParameterResolver(this.CreateResolver(parameter));
             }
+
             return result;
         }