Tidying

Author: SteveWilkes

AgileMapper/Members/ConfiguredSourceMember.cs

@@ -56,7 +56,11 @@ private ConfiguredSourceMember(
             _matchedTargetMemberJoinedNames = matchedTargetMemberJoinedNames;
             _mapperContext = mapperContext;
             _childMembers = childMembers ?? new[] { Member.RootSource(name, type) };
-            _childMemberCache = mapperContext.Cache.CreateNew<Member, ConfiguredSourceMember>();
+
+            if (!isSimple)
+            {
+                _childMemberCache = mapperContext.Cache.CreateNew<Member, ConfiguredSourceMember>();
+            }
         }
 
         public Type Type { get; }

AgileMapper/Members/MemberMapperDataExtensions.cs

@@ -111,6 +111,10 @@ public static Expression GetTargetMemberAccess(this IMemberMapperData mapperData
             return mapperData.TargetMember.GetAccess(subjectMapperData.TargetInstance, mapperData);
         }
 
+        [DebuggerStepThrough]
+        public static Expression GetTargetMemberDefault(this IBasicMapperData mapperData)
+            => mapperData.TargetMember.Type.ToDefaultExpression();
+
         public static ExpressionInfoFinder.ExpressionInfo GetExpressionInfoFor(
             this IMemberMapperData mapperData,
             Expression value,

AgileMapper/Members/QualifiedMember.cs

@@ -13,8 +13,8 @@ namespace AgileObjects.AgileMapper.Members
 
     internal class QualifiedMember : IQualifiedMember
     {
-        public static readonly QualifiedMember All = new QualifiedMember(Enumerable<Member>.EmptyArray, null, null);
-        public static readonly QualifiedMember None = new QualifiedMember(Enumerable<Member>.EmptyArray, null, null);
+        public static readonly QualifiedMember All = new QualifiedMember(default(Member), null);
+        public static readonly QualifiedMember None = new QualifiedMember(default(Member), null);
 
         private readonly MapperContext _mapperContext;
         private readonly Func<string> _pathFactory;
@@ -36,13 +36,8 @@ protected QualifiedMember(Member[] memberChain, QualifiedMember adaptedMember)
         }
 
         private QualifiedMember(Member[] memberChain, ICollection<string> joinedNames, MapperContext mapperContext)
-            : this(memberChain.LastOrDefault(), mapperContext)
+            : this(memberChain.Last(), mapperContext)
         {
-            if (LeafMember == null)
-            {
-                return;
-            }
-
             MemberChain = memberChain;
             JoinedNames = joinedNames;
             _pathFactory = () => MemberChain.GetFullName();

AgileMapper/ObjectPopulation/ComplexTypes/ComplexTypeConstructionFactory.cs

@@ -31,7 +31,7 @@ public Expression GetNewObjectCreation(IObjectMappingData mappingData)
                     key,
                     out var newingConstructorRequired);
 
-                if (newingConstructorRequired)
+                if (newingConstructorRequired && !key.MappingData.MapperData.TargetType.IsAbstract())
                 {
                     AddNewingConstruction(constructions, key);
                 }

AgileMapper/ObjectPopulation/ComplexTypes/ComplexTypeMappingExpressionFactory.cs

@@ -48,6 +48,12 @@ protected override bool TargetCannotBeMapped(IObjectMappingData mappingData, out
 
             var targetType = mappingData.MapperData.TargetType;
 
+            if (targetType.IsAbstract() && mappingData.MapperData.GetDerivedTargetTypes().Any())
+            {
+                nullMappingBlock = null;
+                return false;
+            }
+
             nullMappingBlock = Expression.Block(
                 ReadableExpression.Comment("Cannot construct an instance of " + targetType.GetFriendlyName()),
                 targetType.ToDefaultExpression());

AgileMapper/ObjectPopulation/ComplexTypes/TargetObjectResolutionFactory.cs

@@ -42,13 +42,16 @@ public static Expression GetObjectResolution(
             {
                 mapperData.TargetMember.IsReadOnly = true;
 
-                // Use the existing target object if the mapper can't create an instance:
-                return mapperData.TargetObject;
+                // Use the existing target object if it might have a value and
+                // the mapper can't create an instance:
+                return mapperData.TargetCouldBePopulated()
+                    ? mapperData.TargetObject
+                    : mapperData.GetTargetMemberDefault();
             }
 
             if (UseNullFallbackValue(mapperData, objectValue, memberPopulations))
             {
-                objectValue = mapperData.TargetMember.Type.ToDefaultExpression();
+                objectValue = mapperData.GetTargetMemberDefault();
                 mapperData.Context.UsesMappingDataObjectAsParameter = false;
             }
             else

AgileMapper/ObjectPopulation/DefaultValueDataSourceFactory.cs

@@ -1,7 +1,6 @@
 namespace AgileObjects.AgileMapper.ObjectPopulation
 {
     using DataSources;
-    using Extensions.Internal;
     using Members;
 
     internal class DefaultValueDataSourceFactory : IDataSourceFactory
@@ -14,7 +13,7 @@ public IDataSource Create(IMemberMapperData mapperData)
         private class DefaultValueDataSource : DataSourceBase
         {
             public DefaultValueDataSource(IMemberMapperData mapperData)
-                : base(mapperData.SourceMember, mapperData.TargetMember.Type.ToDefaultExpression())
+                : base(mapperData.SourceMember, mapperData.GetTargetMemberDefault())
             {
             }
         }

AgileMapper/ObjectPopulation/ExistingOrDefaultValueDataSourceFactory.cs

@@ -2,7 +2,6 @@ namespace AgileObjects.AgileMapper.ObjectPopulation
 {
     using System.Linq.Expressions;
     using DataSources;
-    using Extensions.Internal;
     using Members;
     using Members.Dictionaries;
 
@@ -25,7 +24,7 @@ private static Expression GetValue(IMemberMapperData mapperData)
                 if (mapperData.TargetMember.IsEnumerable)
                 {
                     return FallbackToNull(mapperData)
-                        ? mapperData.TargetMember.Type.ToDefaultExpression()
+                        ? mapperData.GetTargetMemberDefault()
                         : mapperData.GetFallbackCollectionValue();
                 }
 
@@ -34,7 +33,7 @@ private static Expression GetValue(IMemberMapperData mapperData)
                     return mapperData.GetTargetMemberAccess();
                 }
 
-                return mapperData.TargetMember.Type.ToDefaultExpression();
+                return mapperData.GetTargetMemberDefault();
             }
 
             private static bool FallbackToNull(IBasicMapperData mapperData)