Replacing MapperSpecifier use with MapUsing(), DeepCloneUsing() and FlattenUsing() extension methods

Author: SteveWilkes

AgileMapper.UnitTests/Extensions/WhenFlatteningToQueryStringViaExtensionMethods.cs

@@ -27,7 +27,7 @@ public void ShouldFlattenWithASpecifiedMapper()
                 mapper.After.MappingEnds.Call(ctx => callbackCalled = true);
 
                 var source = new Address { Line1 = "Here", Line2 = "There" };
-                var result = source.Flatten(_ => _.Using(mapper)).ToQueryString();
+                var result = source.FlattenUsing(mapper).ToQueryString();
 
                 callbackCalled.ShouldBeTrue();
                 result.ShouldBe("Line1=Here&Line2=There");

AgileMapper.UnitTests/Extensions/WhenFlatteningViaExtensionMethods.cs

@@ -43,7 +43,7 @@ public void ShouldFlattenToDynamicWithASpecifiedMapper()
                     new Address { Line1 = "3_1", Line2 = "3_2" }
                 };
 
-                var result = source.Flatten(_ => _.Using(mapper)).ToDynamic();
+                var result = source.FlattenUsing(mapper).ToDynamic();
 
                 ((string)result._0Line1).ShouldBe("1_1");
                 ((string)result._0Line2).ShouldBe("1_2");
@@ -93,7 +93,7 @@ public void ShouldFlattenToDynamicWithInlineConfigurationAndASpecifiedMapper()
                     new Address { Line1 = "3_1", Line2 = "3_2" }
                 };
 
-                var result = source.Flatten(_ => _.Using(mapper)).ToDynamic(cfg => cfg
+                var result = source.FlattenUsing(mapper).ToDynamic(cfg => cfg
                     .ForDynamics
                     .UseElementKeyPattern("_i_"));
 
@@ -144,7 +144,7 @@ public void ShouldFlattenToDictionaryWithASpecifiedMapper()
                     new Address { Line1 = "3_1", Line2 = "3_2" }
                 };
 
-                var result = source.Flatten(_ => _.Using(mapper)).ToDictionary();
+                var result = source.FlattenUsing(mapper).ToDictionary();
 
                 result["-0-Line1"].ShouldBe("1_1");
                 result["-0-Line2"].ShouldBe("1_2");
@@ -199,7 +199,7 @@ public void ShouldFlattenToDictionaryWithInlineConfigurationAndASpecifiedMapper(
                     new Address { Line1 = "2_1", Line2 = "2_2" }
                 };
 
-                var result = source.Flatten(_ => _.Using(mapper)).ToDictionary(cfg => cfg
+                var result = source.FlattenUsing(mapper).ToDictionary(cfg => cfg
                     .ForDictionaries
                     .UseElementKeyPattern("(i)"));
 
@@ -248,7 +248,7 @@ public void ShouldFlattenToStringDictionaryWithASpecifiedMapper()
                     new Address { Line1 = "3_1", Line2 = "3_2" }
                 };
 
-                var result = source.Flatten(_ => _.Using(mapper)).ToDictionary<string>();
+                var result = source.FlattenUsing(mapper).ToDictionary<string>();
 
                 result["-0-Line1"].ShouldBe("1_1");
                 result["-0-Line2"].ShouldBe("1_2");

AgileMapper.UnitTests/Extensions/WhenMappingViaExtensionMethods.cs

@@ -29,7 +29,7 @@ public void ShouldCreateNewWithASpecifiedMapper()
                     .ToCtor<string>();
 
                 var source = new PublicField<int> { Value = 20 };
-                var result = source.Map(_ => _.Using(mapper)).ToANew<PublicCtorStruct<string>>();
+                var result = source.MapUsing(mapper).ToANew<PublicCtorStruct<string>>();
 
                 result.Value.ShouldBe("40");
             }
@@ -72,7 +72,7 @@ public void ShouldDeepCloneWithASpecifiedMapper()
                     .To(p => p.Value1);
 
                 var source = new PublicTwoFieldsStruct<int, int> { Value1 = 123, Value2 = 456 };
-                var result = source.DeepClone(_ => _.Using(mapper));
+                var result = source.DeepCloneUsing(mapper);
 
                 result.ShouldNotBe(source);
                 result.Value1.ShouldBe(456);
@@ -131,7 +131,7 @@ public void ShouldMergeWithASpecifiedMapper()
                 var source = new PublicField<int> { Value = 20 };
                 var target = new PublicField<string>();
 
-                source.Map(_ => _.Using(mapper)).OnTo(target);
+                source.MapUsing(mapper).OnTo(target);
 
                 target.Value.ShouldBe("10");
             }
@@ -186,7 +186,7 @@ public void ShouldOverwriteWithASpecifiedMapper()
                 var source = new PublicField<int> { Value = 20 };
                 var target = new PublicProperty<string>();
 
-                source.Map(_ => _.Using(mapper)).Over(target);
+                source.MapUsing(mapper).Over(target);
 
                 target.Value.ShouldBe("30");
             }
@@ -223,7 +223,7 @@ public void ShouldOverwriteWithInlineConfigurationAndASpecifiedMapper()
                 var source = new PublicTwoFields<int, int> { Value1 = 20, Value2 = 20 };
                 var target = new PublicTwoFields<string, string>();
 
-                source.Map(_ => _.Using(mapper)).Over(target, cfg => cfg
+                source.MapUsing(mapper).Over(target, cfg => cfg
                     .Map((s, t) => s.Value2 + 5)
                     .To(ptf => ptf.Value2));
 

AgileMapper/Extensions/MapperSpecifier.cs

@@ -20,21 +20,17 @@ public static class MappingExtensions
         public static ITargetSelector<TSource> Map<TSource>(this TSource source) => Mapper.Map(source);
 
         /// <summary>
-        /// Perform a mapping operation on this <paramref name="source"/> object using the <see cref="IMapper"/> 
-        /// specified by the <paramref name="mapperSpecifier"/>.
+        /// Perform a mapping operation on this <paramref name="source"/> object using the given 
+        /// <paramref name="mapper"/>.
         /// </summary>
         /// <typeparam name="TSource">The type of source object on which to perform the mapping.</typeparam>
         /// <param name="source">The source object on which to perform the mapping.</param>
-        /// <param name="mapperSpecifier">
-        /// A func supplying the <see cref="IMapper"/> instance with which to perform the object creation.
+        /// <param name="mapper">
+        /// The <see cref="IMapper"/> instance with which to perform the object creation.
         /// </param>
         /// <returns>A TargetSelector with which to specify the type of mapping to perform.</returns>
-        public static ITargetSelector<TSource> Map<TSource>(
-            this TSource source,
-            Func<MapperSpecifier, IMapper> mapperSpecifier)
-        {
-            return MapperSpecifier.Get(mapperSpecifier).Map(source);
-        }
+        public static ITargetSelector<TSource> MapUsing<TSource>(this TSource source, IMapper mapper)
+            => mapper.Map(source);
 
         /// <summary>
         /// Perform a deep clone of this <paramref name="instance"/> using the default <see cref="IMapper"/>.
@@ -45,17 +41,14 @@ public static ITargetSelector<TSource> Map<TSource>(
         public static T DeepClone<T>(this T instance) => Mapper.Default.DeepClone(instance);
 
         /// <summary>
-        /// Perform a deep clone of this <paramref name="instance"/> using the <see cref="IMapper"/> 
-        /// specified by the <paramref name="mapperSpecifier"/>.
+        /// Perform a deep clone of this <paramref name="instance"/> using the given <paramref name="mapper"/>.
         /// </summary>
         /// <typeparam name="T">The Type of object to clone.</typeparam>
         /// <param name="instance">The object to clone.</param>
-        /// <param name="mapperSpecifier">
-        /// A func supplying the <see cref="IMapper"/> instance with which to perform the deep clone.
-        /// </param>
+        /// <param name="mapper">The <see cref="IMapper"/> instance with which to perform the deep clone.</param>
         /// <returns>A deep clone of this <paramref name="instance"/>.</returns>
-        public static T DeepClone<T>(this T instance, Func<MapperSpecifier, IMapper> mapperSpecifier)
-            => MapperSpecifier.Get(mapperSpecifier).DeepClone(instance);
+        public static T DeepCloneUsing<T>(this T instance, IMapper mapper)
+            => mapper.DeepClone(instance);
 
         /// <summary>
         /// Perform a deep clone of this <paramref name="instance"/> using the default <see cref="IMapper"/> and
@@ -87,19 +80,15 @@ public static IFlatteningSelector<TSource> Flatten<TSource>(this TSource source)
 
         /// <summary>
         /// Flatten the given <paramref name="source"/> object so it has only value-type or string members, 
-        /// using the Mapper specified by the <paramref name="mapperSpecifier"/>.
+        /// using the given <paramref name="mapper"/>.
         /// </summary>
         /// <typeparam name="TSource">The type of object to flatten.</typeparam>
         /// <param name="source">The object to flatten.</param>
-        /// <param name="mapperSpecifier">
-        /// A func supplying the <see cref="IMapper"/> instance with which to perform the flattening.
+        /// <param name="mapper">
+        /// The <see cref="IMapper"/> instance with which to perform the flattening.
         /// </param>
         /// <returns>A FlatteningTypeSelector with which to select the type of flattening to perform.</returns>
-        public static IFlatteningSelector<TSource> Flatten<TSource>(
-            this TSource source,
-            Func<MapperSpecifier, IMapper> mapperSpecifier)
-        {
-            return MapperSpecifier.Get(mapperSpecifier).Flatten(source);
-        }
+        public static IFlatteningSelector<TSource> FlattenUsing<TSource>(this TSource source, IMapper mapper)
+            => mapper.Flatten(source);
     }
 }