fix #256 exclude backing fields from mapping

MapsterMapper · Aug 5, 2020 · d6e70e8 · d6e70e8
1 parent 2637d8c
commit d6e70e8
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 5 deletions.
diff --git a/src/Mapster.Tests/WhenMappingPrivateFieldsAndProperties.cs b/src/Mapster.Tests/WhenMappingPrivateFieldsAndProperties.cs
@@ -1,4 +1,5 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Shouldly;
 
 namespace Mapster.Tests
@@ -130,15 +131,32 @@ public void Should_Map_To_Private_Properties_Using_Include()
             dto.Name.ShouldBe(customerName);
         }
 
-        private void SetUpMappingNonPublicFields<TSource, TDestination>()
+        [TestMethod]
+        public void Test_Dictionary()
+        {
+            var config = new TypeAdapterConfig();
+            config.ForType<IDictionary<string, object>, Pet>()
+                .EnableNonPublicMembers(true);
+
+            var pet = new Dictionary<string, object>
+            {
+                { "Name", "Fluffy" }, 
+                { "Color", "White" }
+            }.Adapt<Pet>(config);
+
+            pet.Name.ShouldBe("Fluffy");
+            pet.GetPrivateColor().ShouldBe("White");
+        }
+
+        private static void SetUpMappingNonPublicFields<TSource, TDestination>()
         {
             TypeAdapterConfig<TSource, TDestination>
                 .NewConfig()
                 .EnableNonPublicMembers(true)
                 .NameMatchingStrategy(NameMatchingStrategy.Flexible);
         }
 
-        private void SetUpMappingNonPublicProperties<TSource, TDestination>()
+        private static void SetUpMappingNonPublicProperties<TSource, TDestination>()
         {
             TypeAdapterConfig<TSource, TDestination>
                   .NewConfig()
@@ -149,7 +167,7 @@ private void SetUpMappingNonPublicProperties<TSource, TDestination>()
 
         public class CustomerWithPrivateField
         {
-            private int _id;
+            private readonly int _id;
             public string Name { get; private set; }
 
             private CustomerWithPrivateField() { }
@@ -210,6 +228,17 @@ public class CustomerDTO
             public string Name { get; set; }
         }
 
+        public class Pet
+        {
+            public string Name { get; set; }
+
+            private string Color { get; set; }
+
+            public string GetPrivateColor()
+            {
+                return this.Color;
+            }
+        }
         #endregion
     }
 }
diff --git a/src/Mapster/Settings/ShouldMapMember.cs b/src/Mapster/Settings/ShouldMapMember.cs
@@ -1,11 +1,16 @@
 using Mapster.Models;
 using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
 
 namespace Mapster
 {
     public static class ShouldMapMember
     {
-        public static readonly Func<IMemberModel, MemberSide, bool?> AllowNonPublic = (model, _) => (model.AccessModifier & AccessModifier.NonPublic) != 0 ? (bool?)true : null;
+        public static readonly Func<IMemberModel, MemberSide, bool?> AllowNonPublic = (model, _) =>
+            (model.AccessModifier & AccessModifier.NonPublic) == 0
+                ? (bool?) null
+                : !(model.Info is FieldInfo) || model.GetCustomAttribute<CompilerGeneratedAttribute>() == null;
         public static readonly Func<IMemberModel, MemberSide, bool?> AllowPublic = (model, _) => model.AccessModifier == AccessModifier.Public ? (bool?)true : null;
         public static readonly Func<IMemberModel, MemberSide, bool?> IgnoreAdaptIgnore = (model, side) =>
         {