Delegating whether a ReadOnlyCollectionWrapper can be used to SourceEnumerableAdapter

SteveWilkes · SteveWilkes · commit f95f037ee2c2 · 2016-12-23T11:05:04.000Z
diff --git a/AgileMapper/ObjectPopulation/Enumerables/DefaultSourceEnumerableAdapter.cs b/AgileMapper/ObjectPopulation/Enumerables/DefaultSourceEnumerableAdapter.cs
@@ -3,42 +3,37 @@ namespace AgileObjects.AgileMapper.ObjectPopulation.Enumerables
     using System.Linq.Expressions;
     using NetStandardPolyfills;
 
-    internal class DefaultSourceEnumerableAdapter : ISourceEnumerableAdapter
+    internal class DefaultSourceEnumerableAdapter : SourceEnumerableAdapterBase, ISourceEnumerableAdapter
     {
-        private readonly EnumerablePopulationBuilder _builder;
-
         public DefaultSourceEnumerableAdapter(EnumerablePopulationBuilder builder)
+            : base(builder)
         {
-            _builder = builder;
         }
 
-        public Expression GetSourceValue() => _builder.MapperData.SourceObject;
-
-        public Expression GetSourceValues() => _builder.SourceValue;
+        public Expression GetSourceValues() => SourceValue;
 
         public Expression GetSourceCountAccess()
         {
-            if (_builder.SourceTypeHelper.IsArray)
+            if (SourceTypeHelper.IsArray)
             {
-                return Expression.Property(_builder.SourceValue, "Length");
+                return Expression.Property(SourceValue, "Length");
             }
 
-            var countPropertyInfo = _builder
-                .SourceTypeHelper
+            var countPropertyInfo = SourceTypeHelper
                 .CollectionInterfaceType
                 .GetPublicInstanceProperty("Count");
 
-            return Expression.Property(_builder.SourceValue, countPropertyInfo);
+            return Expression.Property(SourceValue, countPropertyInfo);
         }
 
         public IPopulationLoopData GetPopulationLoopData()
         {
-            if (_builder.SourceTypeHelper.HasListInterface)
+            if (SourceTypeHelper.HasListInterface)
             {
-                return new IndexedSourcePopulationLoopData(_builder);
+                return new IndexedSourcePopulationLoopData(Builder);
             }
 
-            return new EnumerableSourcePopulationLoopData(_builder);
+            return new EnumerableSourcePopulationLoopData(Builder);
         }
     }
 }
diff --git a/AgileMapper/ObjectPopulation/Enumerables/EnumerablePopulationBuilder.cs b/AgileMapper/ObjectPopulation/Enumerables/EnumerablePopulationBuilder.cs
@@ -286,9 +286,7 @@ public void AssignTargetVariable()
 
         private Expression GetTargetVariableValue()
         {
-            if (TargetTypeHelper.IsArray &&
-               !SourceTypeHelper.IsEnumerableInterface &&
-               !MapperData.SourceObject.Type.IsDictionary())
+            if (_sourceAdapter.UseReadOnlyTargetWrapper)
             {
                 return GetCopyIntoWrapperConstruction();
             }
diff --git a/AgileMapper/ObjectPopulation/Enumerables/ISourceEnumerableAdapter.cs b/AgileMapper/ObjectPopulation/Enumerables/ISourceEnumerableAdapter.cs
@@ -10,6 +10,8 @@ internal interface ISourceEnumerableAdapter
 
         Expression GetSourceCountAccess();
 
+        bool UseReadOnlyTargetWrapper { get; }
+
         IPopulationLoopData GetPopulationLoopData();
     }
 }
diff --git a/AgileMapper/ObjectPopulation/Enumerables/SourceElementsDictionaryAdapter.cs b/AgileMapper/ObjectPopulation/Enumerables/SourceElementsDictionaryAdapter.cs
@@ -3,28 +3,28 @@ namespace AgileObjects.AgileMapper.ObjectPopulation.Enumerables
     using System.Linq.Expressions;
     using Members;
 
-    internal class SourceElementsDictionaryAdapter : ISourceEnumerableAdapter
+    internal class SourceElementsDictionaryAdapter : SourceEnumerableAdapterBase, ISourceEnumerableAdapter
     {
         private readonly DictionarySourceMember _sourceMember;
-        private readonly EnumerablePopulationBuilder _builder;
 
         public SourceElementsDictionaryAdapter(
             DictionarySourceMember sourceMember,
             EnumerablePopulationBuilder builder)
+            : base(builder)
         {
             _sourceMember = sourceMember;
-            _builder = builder;
         }
 
-        public Expression GetSourceValue() => _builder.MapperData.SourceObject;
-
         public Expression GetSourceValues()
-            => Expression.Property(_builder.MapperData.SourceObject, "Values");
+            => Expression.Property(GetSourceValue(), "Values");
 
         public Expression GetSourceCountAccess()
-            => Expression.Property(_builder.SourceValue, "Count");
+            => Expression.Property(SourceValue, "Count");
+
+        public override bool UseReadOnlyTargetWrapper
+            => base.UseReadOnlyTargetWrapper && Builder.Context.ElementTypesAreSimple;
 
         public IPopulationLoopData GetPopulationLoopData()
-            => new SourceElementsDictionaryPopulationLoopData(_sourceMember, _builder);
+            => new SourceElementsDictionaryPopulationLoopData(_sourceMember, Builder);
     }
 }
diff --git a/AgileMapper/ObjectPopulation/Enumerables/SourceEnumerableAdapterBase.cs b/AgileMapper/ObjectPopulation/Enumerables/SourceEnumerableAdapterBase.cs
@@ -0,0 +1,25 @@
+namespace AgileObjects.AgileMapper.ObjectPopulation.Enumerables
+{
+    using System.Linq.Expressions;
+
+    internal abstract class SourceEnumerableAdapterBase
+    {
+        protected SourceEnumerableAdapterBase(EnumerablePopulationBuilder builder)
+        {
+            Builder = builder;
+        }
+
+        protected EnumerablePopulationBuilder Builder { get; }
+
+        protected EnumerableTypeHelper SourceTypeHelper => Builder.SourceTypeHelper;
+
+        protected Expression SourceValue => Builder.SourceValue;
+
+        protected EnumerableTypeHelper TargetTypeHelper => Builder.TargetTypeHelper;
+
+        public virtual Expression GetSourceValue() => Builder.MapperData.SourceObject;
+
+        public virtual bool UseReadOnlyTargetWrapper =>
+            Builder.TargetTypeHelper.IsArray && !Builder.SourceTypeHelper.IsEnumerableInterface;
+    }
+}
diff --git a/AgileMapper/ObjectPopulation/Enumerables/SourceInstanceDictionaryAdapter.cs b/AgileMapper/ObjectPopulation/Enumerables/SourceInstanceDictionaryAdapter.cs
@@ -8,14 +8,15 @@ namespace AgileObjects.AgileMapper.ObjectPopulation.Enumerables
     using Extensions;
     using Members;
 
-    internal class SourceInstanceDictionaryAdapter : ISourceEnumerableAdapter
+    internal class SourceInstanceDictionaryAdapter : SourceEnumerableAdapterBase, ISourceEnumerableAdapter
     {
         private readonly DictionarySourceMember _sourceMember;
         private readonly DefaultSourceEnumerableAdapter _defaultAdapter;
 
         public SourceInstanceDictionaryAdapter(
             DictionarySourceMember sourceMember,
             EnumerablePopulationBuilder builder)
+            : base(builder)
         {
             _sourceMember = sourceMember;
             _defaultAdapter = new DefaultSourceEnumerableAdapter(builder);
@@ -24,7 +25,7 @@ public SourceInstanceDictionaryAdapter(
 
         public DictionaryEntryVariablePair DictionaryVariables { get; }
 
-        public Expression GetSourceValue()
+        public override Expression GetSourceValue()
         {
             var emptyTarget = _sourceMember.EntryType.GetEmptyInstanceCreation();
             var returnLabel = Expression.Label(emptyTarget.Type, "Return");
diff --git a/AgileMapper/ObjectPopulation/Enumerables/SourceObjectDictionaryAdapter.cs b/AgileMapper/ObjectPopulation/Enumerables/SourceObjectDictionaryAdapter.cs
@@ -10,24 +10,23 @@ namespace AgileObjects.AgileMapper.ObjectPopulation.Enumerables
     using Members;
     using NetStandardPolyfills;
 
-    internal class SourceObjectDictionaryAdapter : ISourceEnumerableAdapter
+    internal class SourceObjectDictionaryAdapter : SourceEnumerableAdapterBase, ISourceEnumerableAdapter
     {
-        private readonly EnumerablePopulationBuilder _builder;
         private readonly SourceInstanceDictionaryAdapter _instanceDictionaryAdapter;
         private readonly Expression _emptyTarget;
 
         public SourceObjectDictionaryAdapter(
             DictionarySourceMember sourceMember,
             EnumerablePopulationBuilder builder)
+            : base(builder)
         {
-            _builder = builder;
             _instanceDictionaryAdapter = new SourceInstanceDictionaryAdapter(sourceMember, builder);
 
             var targetEnumerableType = builder.TargetTypeHelper.EnumerableInterfaceType;
             _emptyTarget = targetEnumerableType.GetEmptyInstanceCreation();
         }
 
-        public Expression GetSourceValue()
+        public override Expression GetSourceValue()
         {
             var returnLabel = Expression.Label(_emptyTarget.Type, "Return");
             var returnEmpty = Expression.Return(returnLabel, _emptyTarget);
@@ -98,20 +97,20 @@ private Expression GetEntryValueProjection(
             var typedCastMethod = linqCastMethod.MakeGenericMethod(typeof(object));
             var linqCastCall = Expression.Call(null, typedCastMethod, untypedEnumerableVariable);
 
-            var sourceItemsProjection = _builder.Context.ElementTypesAreSimple
-                ? _builder.GetSourceItemsProjection(linqCastCall, GetSourceElementConversion)
-                : _builder.GetSourceItemsProjection(linqCastCall, GetSourceElementMapping);
+            var sourceItemsProjection = Builder.Context.ElementTypesAreSimple
+                ? Builder.GetSourceItemsProjection(linqCastCall, GetSourceElementConversion)
+                : Builder.GetSourceItemsProjection(linqCastCall, GetSourceElementMapping);
 
             var returnProjectionResult = Expression.Label(returnLabel, sourceItemsProjection);
 
             return returnProjectionResult;
         }
 
         private Expression GetSourceElementConversion(Expression sourceParameter)
-            => _builder.GetSimpleElementConversion(sourceParameter);
+            => Builder.GetSimpleElementConversion(sourceParameter);
 
         private Expression GetSourceElementMapping(Expression sourceParameter, Expression counter)
-            => _builder.MapperData.GetMapCall(sourceParameter);
+            => Builder.MapperData.GetMapCall(sourceParameter);
 
         #region ExcludeFromCodeCoverage
 #if !NET_STANDARD
@@ -129,12 +128,15 @@ public Expression GetSourceValues()
 
         public Expression GetSourceCountAccess() => _instanceDictionaryAdapter.GetSourceCountAccess();
 
+        public override bool UseReadOnlyTargetWrapper
+            => base.UseReadOnlyTargetWrapper && Builder.Context.ElementTypesAreSimple;
+
         public IPopulationLoopData GetPopulationLoopData()
         {
             return new SourceObjectDictionaryPopulationLoopData(
                 _emptyTarget,
                 _instanceDictionaryAdapter.DictionaryVariables,
-                _builder);
+                Builder);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,42 +3,37 @@ namespace AgileObjects.AgileMapper.ObjectPopulation.Enumerables`
`3`	`3`	`using System.Linq.Expressions;`
`4`	`4`	`using NetStandardPolyfills;`
`5`	`5`
`6`		`- internal class DefaultSourceEnumerableAdapter : ISourceEnumerableAdapter`
	`6`	`+ internal class DefaultSourceEnumerableAdapter : SourceEnumerableAdapterBase, ISourceEnumerableAdapter`
`7`	`7`	`{`
`8`		`- private readonly EnumerablePopulationBuilder _builder;`
`9`		`-`
`10`	`8`	`public DefaultSourceEnumerableAdapter(EnumerablePopulationBuilder builder)`
	`9`	`+ : base(builder)`
`11`	`10`	`{`
`12`		`- _builder = builder;`
`13`	`11`	`}`
`14`	`12`
`15`		`- public Expression GetSourceValue() => _builder.MapperData.SourceObject;`
`16`		`-`
`17`		`- public Expression GetSourceValues() => _builder.SourceValue;`
	`13`	`+ public Expression GetSourceValues() => SourceValue;`
`18`	`14`
`19`	`15`	`public Expression GetSourceCountAccess()`
`20`	`16`	`{`
`21`		`- if (_builder.SourceTypeHelper.IsArray)`
	`17`	`+ if (SourceTypeHelper.IsArray)`
`22`	`18`	`{`
`23`		`- return Expression.Property(_builder.SourceValue, "Length");`
	`19`	`+ return Expression.Property(SourceValue, "Length");`
`24`	`20`	`}`
`25`	`21`
`26`		`- var countPropertyInfo = _builder`
`27`		`- .SourceTypeHelper`
	`22`	`+ var countPropertyInfo = SourceTypeHelper`
`28`	`23`	`.CollectionInterfaceType`
`29`	`24`	`.GetPublicInstanceProperty("Count");`
`30`	`25`
`31`		`- return Expression.Property(_builder.SourceValue, countPropertyInfo);`
	`26`	`+ return Expression.Property(SourceValue, countPropertyInfo);`
`32`	`27`	`}`
`33`	`28`
`34`	`29`	`public IPopulationLoopData GetPopulationLoopData()`
`35`	`30`	`{`
`36`		`- if (_builder.SourceTypeHelper.HasListInterface)`
	`31`	`+ if (SourceTypeHelper.HasListInterface)`
`37`	`32`	`{`
`38`		`- return new IndexedSourcePopulationLoopData(_builder);`
	`33`	`+ return new IndexedSourcePopulationLoopData(Builder);`
`39`	`34`	`}`
`40`	`35`
`41`		`- return new EnumerableSourcePopulationLoopData(_builder);`
	`36`	`+ return new EnumerableSourcePopulationLoopData(Builder);`
`42`	`37`	`}`
`43`	`38`	`}`
`44`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,9 +286,7 @@ public void AssignTargetVariable()`
`286`	`286`
`287`	`287`	`private Expression GetTargetVariableValue()`
`288`	`288`	`{`
`289`		`- if (TargetTypeHelper.IsArray &&`
`290`		`- !SourceTypeHelper.IsEnumerableInterface &&`
`291`		`- !MapperData.SourceObject.Type.IsDictionary())`
	`289`	`+ if (_sourceAdapter.UseReadOnlyTargetWrapper)`
`292`	`290`	`{`
`293`	`291`	`return GetCopyIntoWrapperConstruction();`
`294`	`292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ internal interface ISourceEnumerableAdapter`
`10`	`10`
`11`	`11`	`Expression GetSourceCountAccess();`
`12`	`12`
	`13`	`+ bool UseReadOnlyTargetWrapper { get; }`
	`14`	`+`
`13`	`15`	`IPopulationLoopData GetPopulationLoopData();`
`14`	`16`	`}`
`15`	`17`	`}`