make MemberMaps a method, GetMemberMaps

AutoMapper · May 17, 2024 · 75d2fa1 · 75d2fa1
1 parent 546d007
commit 75d2fa1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/src/AutoMapper/Configuration/ConfigurationValidator.cs b/src/AutoMapper/Configuration/ConfigurationValidator.cs
@@ -101,7 +101,7 @@ private void DryRunTypeMap(IGlobalConfiguration config, HashSet<TypeMap> typeMap
     }
     private void CheckPropertyMaps(IGlobalConfiguration config, HashSet<TypeMap> typeMapsChecked, TypeMap typeMap)
     {
-        foreach (var memberMap in typeMap.MemberMaps)
+        foreach (var memberMap in typeMap.GetMemberMaps())
         {
             if(memberMap.Ignored || (memberMap is PropertyMap && typeMap.ConstructorParameterMatches(memberMap.DestinationName)))
             {

diff --git a/src/AutoMapper/Execution/TypeMapPlanBuilder.cs b/src/AutoMapper/Execution/TypeMapPlanBuilder.cs
@@ -136,9 +136,9 @@ private static void CheckForCycles(IGlobalConfiguration configuration, TypeMap t
         return;
         IEnumerable<MemberMap> MemberMaps()
         {
-            var memberMaps = typeMap.MemberMaps;
+            var memberMaps = typeMap.GetMemberMaps();
             return typeMap.HasDerivedTypesToInclude ?
-                memberMaps.Concat(configuration.GetIncludedTypeMaps(typeMap).SelectMany(tm => tm.MemberMaps)) :
+                memberMaps.Concat(configuration.GetIncludedTypeMaps(typeMap).SelectMany(tm => tm.GetMemberMaps())) :
                 memberMaps;
         }
         TypeMap ResolveMemberTypeMap(MemberMap memberMap)

diff --git a/src/AutoMapper/TypeMap.cs b/src/AutoMapper/TypeMap.cs
@@ -96,18 +96,7 @@ public MemberList ConfiguredMemberList
     public bool DisableConstructorValidation { get => (_details?.DisableConstructorValidation).GetValueOrDefault(); set => Details.DisableConstructorValidation = value; }
     public IReadOnlyCollection<PropertyMap> PropertyMaps => _propertyMaps.NullCheck();
     public IReadOnlyCollection<PathMap> PathMaps => (_details?.PathMaps).NullCheck();
-    public IEnumerable<MemberMap> MemberMaps
-    {
-        get
-        {
-            var maps = PropertyMaps.Concat((IReadOnlyCollection<MemberMap>)PathMaps);
-            if (ConstructorMapping)
-            {
-                maps = maps.Concat(ConstructorMap.CtorParams);
-            }
-            return maps;
-        }
-    }
+    public MemberMap[] GetMemberMaps() => [..PropertyMaps,..PathMaps,..ConstructorMapping ? ConstructorMap.CtorParams : []];
     public bool PassesCtorValidation =>
         DisableConstructorValidation
         || CustomConstruction
@@ -167,7 +156,7 @@ public string[] GetUnmappedPropertyNames()
                 .Except(ignoredSourceMembers ?? []);
         }
         return properties.Where(memberName => !Profile.GlobalIgnores.Any(memberName.StartsWith)).ToArray();
-        IEnumerable<MemberMap> MappedMembers() => MemberMaps.Where(pm => pm.IsMapped);
+        IEnumerable<MemberMap> MappedMembers() => GetMemberMaps().Where(pm => pm.IsMapped);
     }
     public PropertyMap FindOrCreatePropertyMapFor(MemberInfo destinationProperty, Type destinationPropertyType)
     {

diff --git a/src/UnitTests/ValueTypes.cs b/src/UnitTests/ValueTypes.cs
@@ -77,7 +77,7 @@ public void Should_work()
         innerSource.Inner = innerSource;
         var destinationValue = Mapper.Map<Destination>(source).Value;
         destinationValue.Inner.ShouldBe(destinationValue);
-        FindTypeMapFor<InnerSource, InnerDestination>().MemberMaps.Single(m => m.DestinationName == nameof(InnerDestination.Inner)).Inline.ShouldBeFalse();
+        FindTypeMapFor<InnerSource, InnerDestination>().GetMemberMaps().Single(m => m.DestinationName == nameof(InnerDestination.Inner)).Inline.ShouldBeFalse();
     }
 }