Lazy-loading ObjectMappingData Mappers through a method

SteveWilkes · SteveWilkes · commit ec57f72ad6e8 · 2018-06-16T08:58:03.000+01:00
diff --git a/AgileMapper/ObjectPopulation/IObjectMappingData.cs b/AgileMapper/ObjectPopulation/IObjectMappingData.cs
@@ -19,7 +19,7 @@ internal interface IObjectMappingData : IObjectMappingDataUntyped
 
         ObjectMapperData MapperData { get; }
 
-        IObjectMapper Mapper { get; set; }
+        IObjectMapper GetOrCreateMapper();
 
         IChildMemberMappingData GetChildMappingData(IMemberMapperData childMapperData);
 
diff --git a/AgileMapper/ObjectPopulation/MappingDataFactory.cs b/AgileMapper/ObjectPopulation/MappingDataFactory.cs
@@ -42,7 +42,7 @@ public static ObjectMappingData<TSource, TTarget> ForChild<TSource, TTarget>(
                     (md.DataSourceIndex == dataSourceIndex) &&
                     (md.TargetMember.RegistrationName == targetMemberRegistrationName));
 
-            mappingData.Mapper = mapperData.Mapper;
+            mappingData.SetMapper(mapperData.Mapper);
 
             return mappingData;
         }
@@ -59,8 +59,8 @@ public static ObjectMappingData<TSourceElement, TTargetElement> ForElement<TSour
 
             if (ChildMappersNeeded(mappingData.Parent))
             {
-                mappingData.Mapper =
-                    GetParentMappingData(mappingData).MapperData.ChildMapperDatas.First().Mapper;
+                mappingData.SetMapper(
+                    GetParentMappingData(mappingData).MapperData.ChildMapperDatas.First().Mapper);
             }
 
             return mappingData;
diff --git a/AgileMapper/ObjectPopulation/MappingFactory.cs b/AgileMapper/ObjectPopulation/MappingFactory.cs
@@ -150,7 +150,7 @@ public static Expression GetInlineMappingBlock(
             MappingValues mappingValues,
             Expression createMappingDataCall)
         {
-            var mapper = mappingData.Mapper;
+            var mapper = mappingData.GetOrCreateMapper();
 
             if (mapper.IsNullObject)
             {
diff --git a/AgileMapper/ObjectPopulation/ObjectMapper.cs b/AgileMapper/ObjectPopulation/ObjectMapper.cs
@@ -140,7 +140,7 @@ public object MapSubObject(IObjectMappingData mappingData)
                 mappingData.MapperKey,
                 key =>
                 {
-                    var mapperToCache = key.MappingData.Mapper;
+                    var mapperToCache = key.MappingData.GetOrCreateMapper();
 
                     key.MappingData = null;
 
diff --git a/AgileMapper/ObjectPopulation/ObjectMapperFactory.cs b/AgileMapper/ObjectPopulation/ObjectMapperFactory.cs
@@ -57,7 +57,7 @@ public ObjectMapper<TSource, TTarget> GetOrCreateRoot<TSource, TTarget>(ObjectMa
                 mappingData.MapperKey,
                 key =>
                 {
-                    var mapperToCache = key.MappingData.Mapper;
+                    var mapperToCache = key.MappingData.GetOrCreateMapper();
                     var data = key.MappingData;
 
                     key.MappingData = null;
diff --git a/AgileMapper/ObjectPopulation/ObjectMappingData.cs b/AgileMapper/ObjectPopulation/ObjectMappingData.cs
@@ -68,15 +68,11 @@ private ObjectMappingData(
 
         public ObjectMapperKeyBase MapperKey { get; }
 
-        public IObjectMapper Mapper
-        {
-            get => _mapper ?? (_mapper = MapperContext.ObjectMapperFactory.Create(this));
-            set
-            {
-                _mapper = (ObjectMapper<TSource, TTarget>)value;
-                _mapperData = _mapper.MapperData;
-            }
-        }
+        public IObjectMapper GetOrCreateMapper()
+            => _mapper ?? (_mapper = MapperContext.ObjectMapperFactory.Create(this));
+
+        public void SetMapper(IObjectMapper mapper)
+            => _mapper = (ObjectMapper<TSource, TTarget>)mapper;
 
         public ObjectMapperData MapperData
         {
diff --git a/AgileMapper/ObjectPopulation/Recursion/RecursionMapperFunc.cs b/AgileMapper/ObjectPopulation/Recursion/RecursionMapperFunc.cs
@@ -53,7 +53,7 @@ private void CreateMapperFunc(IObjectMappingData mappingData)
             mappingData.MapperKey.MappingData = mappingData;
             mappingData.MapperKey.MapperData = mappingData.MapperData;
 
-            MappingLambda = mappingData.Mapper.MappingLambda;
+            MappingLambda = mappingData.GetOrCreateMapper().MappingLambda;
 
             var typedMappingLambda = (Expression<MapperFunc<TChildSource, TChildTarget>>)MappingLambda;
             _recursionMapperFunc = typedMappingLambda.Compile();
diff --git a/AgileMapper/Plans/MappingPlan.cs b/AgileMapper/Plans/MappingPlan.cs
@@ -28,7 +28,8 @@ internal MappingPlan(IObjectMapper cachedMapper)
             }
         }
 
-        internal static MappingPlan For(IObjectMappingData mappingData) => new MappingPlan(mappingData.Mapper);
+        internal static MappingPlan For(IObjectMappingData mappingData) 
+            => new MappingPlan(mappingData.GetOrCreateMapper());
 
         /// <summary>
         /// Converts the given <paramref name="mappingPlan"/> to its string representation.

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static ObjectMappingData<TSource, TTarget> ForChild<TSource, TTarget>(`
`42`	`42`	`(md.DataSourceIndex == dataSourceIndex) &&`
`43`	`43`	`(md.TargetMember.RegistrationName == targetMemberRegistrationName));`
`44`	`44`
`45`		`- mappingData.Mapper = mapperData.Mapper;`
	`45`	`+ mappingData.SetMapper(mapperData.Mapper);`
`46`	`46`
`47`	`47`	`return mappingData;`
`48`	`48`	`}`
`@@ -59,8 +59,8 @@ public static ObjectMappingData<TSourceElement, TTargetElement> ForElement<TSour`
`59`	`59`
`60`	`60`	`if (ChildMappersNeeded(mappingData.Parent))`
`61`	`61`	`{`
`62`		`- mappingData.Mapper =`
`63`		`- GetParentMappingData(mappingData).MapperData.ChildMapperDatas.First().Mapper;`
	`62`	`+ mappingData.SetMapper(`
	`63`	`+ GetParentMappingData(mappingData).MapperData.ChildMapperDatas.First().Mapper);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`return mappingData;`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public static Expression GetInlineMappingBlock(`
`150`	`150`	`MappingValues mappingValues,`
`151`	`151`	`Expression createMappingDataCall)`
`152`	`152`	`{`
`153`		`- var mapper = mappingData.Mapper;`
	`153`	`+ var mapper = mappingData.GetOrCreateMapper();`
`154`	`154`
`155`	`155`	`if (mapper.IsNullObject)`
`156`	`156`	`{`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public object MapSubObject(IObjectMappingData mappingData)`
`140`	`140`	`mappingData.MapperKey,`
`141`	`141`	`key =>`
`142`	`142`	`{`
`143`		`- var mapperToCache = key.MappingData.Mapper;`
	`143`	`+ var mapperToCache = key.MappingData.GetOrCreateMapper();`
`144`	`144`
`145`	`145`	`key.MappingData = null;`
`146`	`146`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public ObjectMapper<TSource, TTarget> GetOrCreateRoot<TSource, TTarget>(ObjectMa`
`57`	`57`	`mappingData.MapperKey,`
`58`	`58`	`key =>`
`59`	`59`	`{`
`60`		`- var mapperToCache = key.MappingData.Mapper;`
	`60`	`+ var mapperToCache = key.MappingData.GetOrCreateMapper();`
`61`	`61`	`var data = key.MappingData;`
`62`	`62`
`63`	`63`	`key.MappingData = null;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ internal MappingPlan(IObjectMapper cachedMapper)`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`- internal static MappingPlan For(IObjectMappingData mappingData) => new MappingPlan(mappingData.Mapper);`
	`31`	`+ internal static MappingPlan For(IObjectMappingData mappingData)`
	`32`	`+ => new MappingPlan(mappingData.GetOrCreateMapper());`
`32`	`33`
`33`	`34`	`/// <summary>`
`34`	`35`	`/// Converts the given <paramref name="mappingPlan"/> to its string representation.`