Update 5.0 changes to IObjectMapper

Author: TylerCarlson1

global.json

@@ -1,5 +1,6 @@
 {
     "sdk": {
       "version": "1.0.0-preview1-002702"
-    }
+    },
+    "projects": []
 }

src/AutoMapper.Collection-Signed/project.json

@@ -18,7 +18,7 @@
   },
 
   "dependencies": {
-    "AutoMapper": "5.0.0-beta-1"
+    "AutoMapper": "5.0.0-beta-01111"
   },
 
   "frameworks": {

src/AutoMapper.Collection/Mappers/EquivlentExpressionAddRemoveCollectionMapper.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -7,14 +8,15 @@
 
 namespace AutoMapper.Mappers
 {
-    public class EquivlentExpressionAddRemoveCollectionMapper : IObjectMapExpression
+    public class EquivlentExpressionAddRemoveCollectionMapper : IObjectMapper
     {
-        public static TDestination Map<TSource, TSourceItem, TDestination, TDestinationItem>(TSource source, TDestination destination, ResolutionContext context)
+        private readonly CollectionMapper CollectionMapper = new CollectionMapper();
+        public static TDestination Map<TSource, TSourceItem, TDestination, TDestinationItem>(TSource source, TDestination destination, ResolutionContext context, Func<TDestination> ifNullFunc)
             where TSource : IEnumerable<TSourceItem>
             where TDestination : class, ICollection<TDestinationItem>
         {
             if (source == null || destination == null)
-                return CollectionMapper.Map<TSource, TSourceItem, TDestination, TDestinationItem>(source, destination, context);
+                return ifNullFunc();
 
             var equivilencyExpression = GetEquivilentExpression(new TypePair(typeof(TSource), typeof(TDestination))) as IEquivilentExpression<TSourceItem,TDestinationItem>;
             var compareSourceToDestination = source.ToDictionary(s => s, s => destination.FirstOrDefault(d => equivilencyExpression.IsEquivlent(s, d)));
@@ -34,13 +36,7 @@ public static TDestination Map<TSource, TSourceItem, TDestination, TDestinationI
         }
 
         private static readonly MethodInfo MapMethodInfo = typeof(EquivlentExpressionAddRemoveCollectionMapper).GetRuntimeMethods().First(_ => _.IsStatic);
-
-        public object Map(ResolutionContext context)
-        {
-            return
-                MapMethodInfo.MakeGenericMethod(context.SourceType, TypeHelper.GetElementType(context.SourceType), context.DestinationType, TypeHelper.GetElementType(context.DestinationType))
-                    .Invoke(null, new[] { context.SourceValue, context.DestinationValue, context });
-        }
+        
 
         public bool IsMatch(TypePair typePair)
         {
@@ -49,11 +45,14 @@ public bool IsMatch(TypePair typePair)
                    && GetEquivilentExpression(typePair) != null;
         }
 
-        public Expression MapExpression(Expression sourceExpression, Expression destExpression, Expression contextExpression)
+        public Expression MapExpression(TypeMapRegistry typeMapRegistry, IConfigurationProvider configurationProvider,
+            PropertyMap propertyMap, Expression sourceExpression, Expression destExpression, Expression contextExpression)
         {
+            var collectionExpression = CollectionMapper.MapExpression(typeMapRegistry, configurationProvider, propertyMap, sourceExpression, destExpression, contextExpression);
+            var collectionFunc = Expression.Lambda(collectionExpression).Compile();
             return Expression.Call(null,
                 MapMethodInfo.MakeGenericMethod(sourceExpression.Type, TypeHelper.GetElementType(sourceExpression.Type), destExpression.Type, TypeHelper.GetElementType(destExpression.Type)),
-                    sourceExpression, destExpression, contextExpression);
+                    sourceExpression, destExpression, contextExpression, Expression.Constant(collectionFunc));
         }
 
         private static IEquivilentExpression GetEquivilentExpression(TypePair typePair)

src/AutoMapper.Collection/Mappers/ObjectToEquivalencyExpressionByEquivalencyExistingMapper.cs

@@ -6,7 +6,7 @@
 
 namespace AutoMapper.Mappers
 {
-    public class ObjectToEquivalencyExpressionByEquivalencyExistingMapper : IObjectMapExpression
+    public class ObjectToEquivalencyExpressionByEquivalencyExistingMapper : IObjectMapper
     {
         public static Expression<Func<TDestination, bool>> Map<TSource, TDestination>(TSource source)
         {
@@ -15,13 +15,7 @@ public static Expression<Func<TDestination, bool>> Map<TSource, TDestination>(TS
         }
 
         private static readonly MethodInfo MapMethodInfo = typeof(ObjectToEquivalencyExpressionByEquivalencyExistingMapper).GetRuntimeMethods().First(_ => _.IsStatic);
-
-        public object Map(ResolutionContext context)
-        {
-            var destExpressArgType = context.DestinationType.GetSinglePredicateExpressionArgumentType();
-            return MapMethodInfo.MakeGenericMethod(context.SourceType, destExpressArgType).Invoke(null, new[] { context.SourceValue});
-        }
-
+        
         public bool IsMatch(TypePair typePair)
         {
             var destExpressArgType = typePair.DestinationType.GetSinglePredicateExpressionArgumentType();
@@ -31,7 +25,8 @@ public bool IsMatch(TypePair typePair)
             return expression != null;
         }
 
-        public Expression MapExpression(Expression sourceExpression, Expression destExpression, Expression contextExpression)
+        public Expression MapExpression(TypeMapRegistry typeMapRegistry, IConfigurationProvider configurationProvider,
+            PropertyMap propertyMap, Expression sourceExpression, Expression destExpression, Expression contextExpression)
         {
             var destExpressArgType = destExpression.Type.GetSinglePredicateExpressionArgumentType();
             return Expression.Call(null, MapMethodInfo.MakeGenericMethod(sourceExpression.Type, destExpressArgType), sourceExpression);

src/AutoMapper.Collection/project.json

@@ -10,7 +10,7 @@
   },
 
   "dependencies": {
-    "AutoMapper" :  "5.0.0-beta-1" 
+    "AutoMapper": "5.0.0-beta-01111"
   },
 
   "frameworks": {