Various optimisations brought in from OptimiseMapperSetup

Author: SteveWilkes

AgileMapper.UnitTests/Dictionaries/WhenCreatingRootDictionaryMembers.cs

@@ -3,15 +3,16 @@
     using System.Collections.Generic;
     using AgileMapper.Members;
     using AgileMapper.Members.Dictionaries;
+    using Members;
     using TestClasses;
     using Xunit;
 
-    public class WhenCreatingRootDictionaryMembers
+    public class WhenCreatingRootDictionaryMembers : MemberTestsBase
     {
         [Fact]
         public void ShouldVarySourceMembersByTargetType()
         {
-            var memberFactory = new QualifiedMemberFactory(MapperContext.Default);
+            var memberFactory = new QualifiedMemberFactory(DefaultMapperContext);
 
             var dictionaryToPersonArraySourceMember = memberFactory
                 .RootSource<Dictionary<string, Person[]>, Person[]>()

AgileMapper.UnitTests/Members/MemberTestsBase.cs

@@ -9,7 +9,7 @@
 
     public abstract class MemberTestsBase
     {
-        internal static readonly MapperContext DefaultMapperContext = MapperContext.Default;
+        internal static readonly MapperContext DefaultMapperContext = new MapperContext();
         internal static readonly MemberCache MemberCache = GlobalContext.Instance.MemberCache;
 
         internal IQualifiedMember SourceMemberFor<T>(T sourceObject)

AgileMapper.UnitTests/Members/WhenCreatingTargetMembersFromExpressions.cs

@@ -44,7 +44,7 @@ public void ShouldCreateASetMethodMember()
         {
             Expression<Func<PublicSetMethod<int>, Action<int>>> setMethodAccess = x => x.SetValue;
 
-            var fieldMember = setMethodAccess.Body.ToTargetMember(MapperContext.Default);
+            var fieldMember = setMethodAccess.Body.ToTargetMember(DefaultMapperContext);
 
             fieldMember.Members().Count().ShouldBe(2);
 

AgileMapper/Api/PlanTargetSelector.cs

@@ -35,12 +35,11 @@ internal PlanTargetSelector(MapperContext mapperContext)
         public MappingPlanSet To<TTarget>(
             Expression<Action<IFullMappingInlineConfigurator<TSource, TTarget>>>[] configurations)
         {
-            // TODO: Include projection mapping plans:
             return new MappingPlanSet(
                 _mapperContext
                     .RuleSets
                     .All
-                    .Except(new[] { _mapperContext.RuleSets.Project })
+                    .Where(ruleSet => ruleSet != _mapperContext.RuleSets.Project)
                     .Select(rs => GetMappingPlan(rs, configurations))
                     .ToArray());
         }

AgileMapper/Configuration/DerivedTypePair.cs

@@ -2,7 +2,7 @@
 {
     using System;
     using System.Globalization;
-    using System.Linq;
+    using Extensions.Internal;
     using Members;
     using NetStandardPolyfills;
     using ReadableExpressions.Extensions;

AgileMapper/Configuration/DerivedTypePairSet.cs

@@ -45,7 +45,7 @@ public void Add(DerivedTypePair typePair)
 
         private static void RemoveConflictingPairIfAppropriate(
             DerivedTypePair typePair,
-            ICollection<DerivedTypePair> typePairs)
+            IList<DerivedTypePair> typePairs)
         {
             if (typePair.HasConfiguredCondition)
             {

AgileMapper/Configuration/Dictionaries/DictionarySettings.cs

@@ -94,7 +94,7 @@ public string GetMemberKeyOrNull(Member member, IMemberMapperData mapperData)
             => FindKeyOrNull(_configuredMemberKeys, member, mapperData)?.Key;
 
         private static CustomDictionaryKey FindKeyOrNull(
-            IEnumerable<CustomDictionaryKey> keys,
+            IList<CustomDictionaryKey> keys,
             Member member,
             IMemberMapperData mapperData)
             => keys.FirstOrDefault(k => k.AppliesTo(member, mapperData));
@@ -121,7 +121,7 @@ public void Add(ElementKeyPartFactory keyPartFactory)
 
         private static void ThrowIfConflictingKeyPartFactoryExists<TKeyPartFactory>(
             TKeyPartFactory factory,
-            ICollection<TKeyPartFactory> existingFactories)
+            IList<TKeyPartFactory> existingFactories)
             where TKeyPartFactory : DictionaryKeyPartFactoryBase
         {
             if (existingFactories.HasOne())

AgileMapper/Configuration/Dictionaries/ElementKeyPartFactory.cs

@@ -60,7 +60,11 @@ public static ElementKeyPartFactory UnderscoredIndexForTargetDynamics(MapperCont
         }
 
         public static ElementKeyPartFactory SquareBracketedIndex(MapperContext mapperContext)
-            => new ElementKeyPartFactory("[", "]", MappingConfigInfo.AllRuleSetsSourceTypesAndTargetTypes(mapperContext));
+        {
+            return new ElementKeyPartFactory(
+                   "[", "]",
+                    MappingConfigInfo.AllRuleSetsAndSourceTypes(mapperContext).ForAllTargetTypes());
+        }
 
         private static readonly Regex _patternMatcher = new Regex("^(?<Prefix>[^i]*)i{1}(?<Suffix>[^i]*)$"
 #if !NET_STANDARD

AgileMapper/Configuration/Dictionaries/JoiningNameFactory.cs

@@ -57,7 +57,7 @@ public static JoiningNameFactory UnderscoredForTargetDynamics(MapperContext mapp
         }
 
         public static JoiningNameFactory Dotted(MapperContext mapperContext)
-            => ForDefault(".", MappingConfigInfo.AllRuleSetsSourceTypesAndTargetTypes(mapperContext));
+            => ForDefault(".", MappingConfigInfo.AllRuleSetsSourceTypesAndTargetTypes);
 
         public static JoiningNameFactory Flattened(MappingConfigInfo configInfo)
             => For(string.Empty, configInfo);

AgileMapper/Configuration/MappedObjectCachingSettings.cs

@@ -7,13 +7,10 @@ internal class MappedObjectCachingSettings : UserConfiguredItemBase
         #region Singleton Instances
 
         public static readonly MappedObjectCachingSettings CacheAll =
-            new MappedObjectCachingSettings(ForAllMappings(MapperContext.Default), cache: true);
+            new MappedObjectCachingSettings(MappingConfigInfo.AllRuleSetsSourceTypesAndTargetTypes, cache: true);
 
         public static readonly MappedObjectCachingSettings CacheNone =
-            new MappedObjectCachingSettings(ForAllMappings(MapperContext.Default), cache: false);
-
-        private static MappingConfigInfo ForAllMappings(MapperContext mapperContext)
-            => MappingConfigInfo.AllRuleSetsSourceTypesAndTargetTypes(mapperContext);
+            new MappedObjectCachingSettings(MappingConfigInfo.AllRuleSetsSourceTypesAndTargetTypes, cache: false);
 
         #endregion