Improve IgnoreMappings support w/ tests

mythz · mythz · commit 78bd6f152666 · 2019-02-12T23:53:46.000-05:00
diff --git a/src/ServiceStack.Text/AutoMappingUtils.cs b/src/ServiceStack.Text/AutoMappingUtils.cs
@@ -38,11 +38,7 @@ public static void RegisterConverter<From, To>(Func<From, To> converter)
             converters[Tuple.Create(typeof(From), typeof(To))] = x => converter((From)x);
         }
 
-        public static void IgnoreMapping<From, To>()
-        {
-            JsConfig.InitStatics();
-            ignoreMappings[Tuple.Create(typeof(From),typeof(To))] = true;
-        }
+        public static void IgnoreMapping<From, To>() => IgnoreMapping(typeof(From), typeof(To));
 
         public static void IgnoreMapping(Type fromType, Type toType)
         {
@@ -108,6 +104,9 @@ public static object ConvertTo(this object from, Type toType, bool skipConverter
             if (fromType == toType)
                 return from;
 
+            if (ShouldIgnoreMapping(fromType, toType))
+                return null;
+
             if (!skipConverters)
             {
                 var converter = GetConverter(fromType, toType);
@@ -781,6 +780,29 @@ public void AddMatch(string name, AssignmentMember readMember, AssignmentMember
             if (AutoMappingUtils.ShouldIgnoreMapping(readMember.Type,writeMember.Type))
                 return;
 
+            // Ignore mapping collections if Element Types are ignored
+            if (typeof(IEnumerable).IsAssignableFrom(readMember.Type) && typeof(IEnumerable).IsAssignableFrom(writeMember.Type))
+            {
+                var fromGenericDef = readMember.Type.GetTypeWithGenericTypeDefinitionOf(typeof(IDictionary<,>));
+                var toGenericDef = readMember.Type.GetTypeWithGenericTypeDefinitionOf(typeof(IDictionary<,>));
+                if (fromGenericDef != null && toGenericDef != null)
+                {
+                    // Check if to/from Key or Value Types are ignored   
+                    if (AutoMappingUtils.ShouldIgnoreMapping(fromGenericDef.GetGenericArguments()[0],toGenericDef.GetGenericArguments()[0]))
+                        return;
+                    if (AutoMappingUtils.ShouldIgnoreMapping(fromGenericDef.GetGenericArguments()[1],toGenericDef.GetGenericArguments()[1]))
+                        return;
+                }
+                else if (readMember.Type != typeof(string) && writeMember.Type != typeof(string))
+                {
+                    var elFromType = readMember.Type.GetCollectionType();
+                    var elToType = writeMember.Type.GetCollectionType();
+
+                    if (AutoMappingUtils.ShouldIgnoreMapping(elFromType,elToType))
+                        return;
+                }
+            }
+
             this.AssignmentMemberMap[name] = new AssignmentEntry(name, readMember, writeMember);
         }
 
diff --git a/tests/ServiceStack.Text.Tests/AutoMappingCustomConverterTests.cs b/tests/ServiceStack.Text.Tests/AutoMappingCustomConverterTests.cs
@@ -157,13 +157,10 @@ public void Can_Convert_POCO_collections_with_custom_Converter()
             var users = new UsersData {
                 Id = 1,
                 User = user,
-                Users = new List<User> { user }
+                Users = { user }
             };
 
             var dtoUsers = users.ConvertTo<UsersDto>();
-            
-            dtoUsers.PrintDump();
-            
             Assert.That(dtoUsers.Id, Is.EqualTo(users.Id));
 
             void AssertUser(UserDto userDto)
@@ -180,7 +177,33 @@ void AssertUser(UserDto userDto)
         }
 
         [Test]
-        public void Can_ignore_converting_collections()
+        public void Does_ignore_POCO_mappings()
+        {
+            AutoMappingUtils.IgnoreMapping<User, UserDto>();
+
+            var user = new User {
+                FirstName = "John",
+                LastName = "Doe",
+                Car = new Car { Name = "BMW X6", Age = 3 }
+            };
+            var users = new UsersData {
+                Id = 1,
+                User = user,
+                Users = { user }
+            };
+
+            var dtoUsers = users.ConvertTo<UsersDto>();
+            Assert.That(dtoUsers.Id, Is.EqualTo(users.Id));
+
+            Assert.That(user.ConvertTo<UserDto>(), Is.Null);
+            Assert.That(dtoUsers.User, Is.Null);
+            Assert.That(dtoUsers.Users, Is.Empty);
+            
+            AutoMappingUtils.Reset();
+        }
+
+        [Test]
+        public void Does_ignore_collection_mappings()
         {
             AutoMappingUtils.IgnoreMapping<List<User>, List<UserDto>>();
             
@@ -199,7 +222,7 @@ public void Can_ignore_converting_collections()
             dtoUsers.PrintDump();
 
             Assert.That(dtoUsers.Id, Is.EqualTo(users.Id));
-            Assert.That(dtoUsers.Users, Is.Null);
+            Assert.That(dtoUsers.Users, Is.Empty);
            
             AutoMappingUtils.Reset();
         }
diff --git a/tests/ServiceStack.Text.Tests/AutoMappingTests.cs b/tests/ServiceStack.Text.Tests/AutoMappingTests.cs
@@ -67,14 +67,14 @@ public class UsersData
         public int Id { get; set; }
         
         public User User { get; set; }
-        public List<User> Users { get; set; }
+        public List<User> Users { get; set; } = new List<User>();
     }
     public class UsersDto
     {
         public int Id { get; set; }
 
         public UserDto User { get; set; }
-        public List<UserDto> Users { get; set; }
+        public List<UserDto> Users { get; set; } = new List<UserDto>();
     }
 
     public enum Color

Original file line number	Diff line number	Diff line change
`@@ -67,14 +67,14 @@ public class UsersData`
`67`	`67`	`public int Id { get; set; }`
`68`	`68`
`69`	`69`	`public User User { get; set; }`
`70`		`- public List<User> Users { get; set; }`
	`70`	`+ public List<User> Users { get; set; } = new List<User>();`
`71`	`71`	`}`
`72`	`72`	`public class UsersDto`
`73`	`73`	`{`
`74`	`74`	`public int Id { get; set; }`
`75`	`75`
`76`	`76`	`public UserDto User { get; set; }`
`77`		`- public List<UserDto> Users { get; set; }`
	`77`	`+ public List<UserDto> Users { get; set; } = new List<UserDto>();`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public enum Color`