Switching from MappingTypes.Fixed() to MappingTypes<>.Fixed

Author: SteveWilkes

AgileMapper/MappingExecutor.cs

@@ -68,7 +68,7 @@ private ObjectMappingData<TSource, TTarget> CreateTypedRootMappingData<TTarget>(
                 _source,
                 target,
                 null, // <- No enumerable index because we're at the root
-                new RootObjectMapperKey(MappingTypes.Fixed<TSource, TTarget>(), this),
+                new RootObjectMapperKey(MappingTypes<TSource, TTarget>.Fixed, this),
                 this,
                 parent: null);
         }

AgileMapper/Members/MappingTypes.cs

@@ -6,7 +6,7 @@ namespace AgileObjects.AgileMapper.Members
 
     internal class MappingTypes
     {
-        private MappingTypes(
+        public MappingTypes(
             Type sourceType,
             Type targetType,
             bool runtimeTypesAreTheSame,
@@ -20,13 +20,11 @@ private MappingTypes(
 
         #region Factory Method
 
-        public static MappingTypes Fixed<TSource, TTarget>() => MappingTypesCache<TSource, TTarget>.Instance;
-
         public static MappingTypes For<TSource, TTarget>(TSource source, TTarget target)
         {
-            if (MappingTypesCache<TSource, TTarget>.SkipTypesCheck)
+            if (MappingTypes<TSource, TTarget>.SkipTypesCheck)
             {
-                return Fixed<TSource, TTarget>();
+                return MappingTypes<TSource, TTarget>.Fixed;
             }
 
             var runtimeSourceTypeNeeded = TypeInfo<TSource>.RuntimeTypeNeeded;
@@ -78,7 +76,7 @@ public static MappingTypes For<TSource, TTarget>(TSource source, TTarget target)
 
             if (!runtimeTypesNeeded)
             {
-                return Fixed<TSource, TTarget>();
+                return MappingTypes<TSource, TTarget>.Fixed;
             }
 
             var isEnumerable = TypeInfo<TTarget>.IsEnumerable ||
@@ -121,17 +119,17 @@ public MappingTypes WithTypes<TNewSource, TNewTarget>()
                 RuntimeTypesAreTheSame,
                 IsEnumerable);
         }
+    }
 
-        private static class MappingTypesCache<TSource, TTarget>
-        {
-            public static readonly bool SkipTypesCheck =
-                !(TypeInfo<TSource>.RuntimeTypeNeeded || TypeInfo<TTarget>.RuntimeTypeNeeded);
-
-            public static readonly MappingTypes Instance = new MappingTypes(
-                typeof(TSource),
-                typeof(TTarget),
-                true, // <- runtimeTypesAreTheSame
-                TypeInfo<TTarget>.IsEnumerable);
-        }
+    internal static class MappingTypes<TSource, TTarget>
+    {
+        public static readonly bool SkipTypesCheck =
+            !(TypeInfo<TSource>.RuntimeTypeNeeded || TypeInfo<TTarget>.RuntimeTypeNeeded);
+
+        public static readonly MappingTypes Fixed = new MappingTypes(
+            typeof(TSource),
+            typeof(TTarget),
+            true, // <- runtimeTypesAreTheSame
+            TypeInfo<TTarget>.IsEnumerable);
     }
 }

AgileMapper/ObjectPopulation/MappingDataFactory.cs

@@ -25,7 +25,7 @@ public static ObjectMappingData<TSource, TTarget> ForChild<TSource, TTarget>(
             var mapperKey = new ChildObjectMapperKey(
                 targetMemberRegistrationName,
                 dataSourceIndex,
-                MappingTypes.Fixed<TSource, TTarget>());
+                MappingTypes<TSource, TTarget>.Fixed);
 
             var mappingData = CreateMappingData(source, target, enumerableIndex, mapperKey, parent);
 
@@ -53,7 +53,7 @@ public static ObjectMappingData<TSourceElement, TTargetElement> ForElement<TSour
             int enumerableIndex,
             IObjectMappingDataUntyped parent)
         {
-            var mapperKey = new ElementObjectMapperKey(MappingTypes.Fixed<TSourceElement, TTargetElement>());
+            var mapperKey = new ElementObjectMapperKey(MappingTypes<TSourceElement, TTargetElement>.Fixed);
 
             var mappingData = CreateMappingData(sourceElement, targetElement, enumerableIndex, mapperKey, parent);