remove IObjectMapperInfo

src/AutoMapper/ApiCompatBaseline.txt

@@ -14,7 +14,15 @@ CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMappe
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMapper.Configuration.Annotations.UseExistingValueAttribute' changed from '[AttributeUsageAttribute(384)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]' in the implementation.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMapper.Configuration.Annotations.ValueConverterAttribute' changed from '[AttributeUsageAttribute(384)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]' in the implementation.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMapper.Configuration.Annotations.ValueResolverAttribute' changed from '[AttributeUsageAttribute(384)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]' in the implementation.
+CannotRemoveBaseTypeOrInterface : Type 'AutoMapper.Internal.Mappers.CollectionMapper' does not implement interface 'AutoMapper.Internal.Mappers.IObjectMapperInfo' in the implementation but it does in the contract.
+MembersMustExist : Member 'public AutoMapper.Internal.TypePair AutoMapper.Internal.Mappers.CollectionMapper.GetAssociatedTypes(AutoMapper.Internal.TypePair)' does not exist in the implementation but it does exist in the contract.
+InterfacesShouldHaveSameMembers : Default interface member 'public System.Nullable<AutoMapper.Internal.TypePair> AutoMapper.Internal.Mappers.IObjectMapper.GetAssociatedTypes(AutoMapper.Internal.TypePair)' is present in the implementation but not in the contract.
+TypesMustExist : Type 'AutoMapper.Internal.Mappers.IObjectMapperInfo' does not exist in the implementation but it does exist in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'AutoMapper.Internal.Mappers.NullableDestinationMapper' does not implement interface 'AutoMapper.Internal.Mappers.IObjectMapperInfo' in the implementation but it does in the contract.
+MembersMustExist : Member 'public AutoMapper.Internal.TypePair AutoMapper.Internal.Mappers.NullableDestinationMapper.GetAssociatedTypes(AutoMapper.Internal.TypePair)' does not exist in the implementation but it does exist in the contract.
+CannotRemoveBaseTypeOrInterface : Type 'AutoMapper.Internal.Mappers.NullableSourceMapper' does not implement interface 'AutoMapper.Internal.Mappers.IObjectMapperInfo' in the implementation but it does in the contract.
+MembersMustExist : Member 'public AutoMapper.Internal.TypePair AutoMapper.Internal.Mappers.NullableSourceMapper.GetAssociatedTypes(AutoMapper.Internal.TypePair)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public System.Linq.IQueryable<TDestination> AutoMapper.QueryableExtensions.Extensions.Map<TSource, TDestination>(System.Linq.IQueryable<TSource>, System.Linq.IQueryable<TDestination>, AutoMapper.IConfigurationProvider)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public System.Collections.Generic.IReadOnlyCollection<System.Reflection.MemberInfo> AutoMapper.QueryableExtensions.MemberVisitor.MemberPath.get()' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'AutoMapper.QueryableExtensions.Impl.MemberAccessQueryMapperVisitor' does not exist in the implementation but it does exist in the contract.
-Total Issues: 18
+Total Issues: 26

src/AutoMapper/Configuration/ConfigurationValidator.cs

@@ -127,13 +127,9 @@ private void DryRunTypeMap(ICollection<TypeMap> typeMapsChecked, TypePair types,
                 }
                 var context = new ValidationContext(types, memberMap, mapperToUse);
                 Validate(context);
-                if(mapperToUse is IObjectMapperInfo mapperInfo)
+                if (mapperToUse.GetAssociatedTypes(types) is TypePair newTypes && newTypes != types)
                 {
-                    var newTypePair = mapperInfo.GetAssociatedTypes(types);
-                    if (newTypePair != types)
-                    {
-                        DryRunTypeMap(typeMapsChecked, newTypePair, null, memberMap);
-                    }
+                    DryRunTypeMap(typeMapsChecked, newTypes, null, memberMap);
                 }
             }
         }

src/AutoMapper/Configuration/MapperConfiguration.cs

@@ -267,9 +267,9 @@ TypeMap IGlobalConfiguration.ResolveAssociatedTypeMap(TypePair types)
             {
                 return typeMap;
             }
-            if (FindMapper(types) is IObjectMapperInfo objectMapperInfo)
+            if (FindMapper(types)?.GetAssociatedTypes(types) is TypePair newTypes)
             {
-                return ResolveTypeMap(objectMapperInfo.GetAssociatedTypes(types));
+                return ResolveTypeMap(newTypes);
             }
             return null;
         }

src/AutoMapper/Mappers/CollectionMapper.cs

@@ -12,9 +12,9 @@ namespace AutoMapper.Internal.Mappers
     using static Execution.ExpressionBuilder;
     using static Expression;
     using static ReflectionHelper;
-    public class CollectionMapper : IObjectMapperInfo
+    public class CollectionMapper : IObjectMapper
     {
-        public TypePair GetAssociatedTypes(TypePair context) => new(GetElementType(context.SourceType), GetElementType(context.DestinationType));
+        public TypePair? GetAssociatedTypes(TypePair context) => new(GetElementType(context.SourceType), GetElementType(context.DestinationType));
         public bool IsMatch(TypePair context) => context.IsCollection();
         public Expression MapExpression(IGlobalConfiguration configurationProvider, ProfileMap profileMap, MemberMap memberMap, Expression sourceExpression, Expression destExpression)
         {

src/AutoMapper/Mappers/IObjectMapper.cs

@@ -29,12 +29,8 @@ public interface IObjectMapper
         /// <returns>Map expression</returns>
         Expression MapExpression(IGlobalConfiguration configurationProvider, ProfileMap profileMap,
             MemberMap memberMap, Expression sourceExpression, Expression destExpression);
+        TypePair? GetAssociatedTypes(TypePair initialTypes) => null;
     }
-    public interface IObjectMapperInfo : IObjectMapper
-    {
-        TypePair GetAssociatedTypes(TypePair initialTypes);
-    }
-
     /// <summary>
     /// Base class for simple object mappers that don't want to use expressions.
     /// </summary>

src/AutoMapper/Mappers/NullableDestinationMapper.cs

@@ -3,12 +3,12 @@
 using AutoMapper.Execution;
 namespace AutoMapper.Internal.Mappers
 {
-    public class NullableDestinationMapper : IObjectMapperInfo
+    public class NullableDestinationMapper : IObjectMapper
     {
         public bool IsMatch(TypePair context) => context.DestinationType.IsNullableType();
         public Expression MapExpression(IGlobalConfiguration configurationProvider, ProfileMap profileMap, MemberMap memberMap, Expression sourceExpression, Expression destExpression) =>
             configurationProvider.MapExpression(profileMap, GetAssociatedTypes(sourceExpression.Type, destExpression.Type), sourceExpression, memberMap);
-        public TypePair GetAssociatedTypes(TypePair initialTypes) => GetAssociatedTypes(initialTypes.SourceType, initialTypes.DestinationType);
+        public TypePair? GetAssociatedTypes(TypePair initialTypes) => GetAssociatedTypes(initialTypes.SourceType, initialTypes.DestinationType);
         TypePair GetAssociatedTypes(Type sourceType, Type destinationType) => new(sourceType, Nullable.GetUnderlyingType(destinationType));
     }
 }

src/AutoMapper/Mappers/NullableSourceMapper.cs

@@ -3,13 +3,13 @@
 using AutoMapper.Execution;
 namespace AutoMapper.Internal.Mappers
 {
-    public class NullableSourceMapper : IObjectMapperInfo
+    public class NullableSourceMapper : IObjectMapper
     {
         public bool IsMatch(TypePair context) => context.SourceType.IsNullableType();
         public Expression MapExpression(IGlobalConfiguration configurationProvider, ProfileMap profileMap, MemberMap memberMap, Expression sourceExpression, Expression destExpression) =>
             configurationProvider.MapExpression(profileMap, GetAssociatedTypes(sourceExpression.Type, destExpression.Type),
                     ExpressionBuilder.Property(sourceExpression, "Value"), memberMap, destExpression);
-        public TypePair GetAssociatedTypes(TypePair initialTypes) => GetAssociatedTypes(initialTypes.SourceType, initialTypes.DestinationType);
+        public TypePair? GetAssociatedTypes(TypePair initialTypes) => GetAssociatedTypes(initialTypes.SourceType, initialTypes.DestinationType);
         TypePair GetAssociatedTypes(Type sourceType, Type destinationType) => new(Nullable.GetUnderlyingType(sourceType), destinationType);
     }
 }