UmbracoMapper shouldn't throw an exception when trying to map a source property being null.

Claus · Claus · commit 975816ddd7c8 · 2019-06-26T23:10:46.000+02:00
diff --git a/src/Umbraco.Core/Mapping/UmbracoMapper.cs b/src/Umbraco.Core/Mapping/UmbracoMapper.cs
@@ -191,7 +191,7 @@ public TTarget Map<TSource, TTarget>(TSource source, MapperContext context)
         private TTarget Map<TTarget>(object source, Type sourceType, MapperContext context)
         {
             if (source == null)
-                throw new ArgumentNullException(nameof(source));
+                return default;
 
             var targetType = typeof(TTarget);
 
diff --git a/src/Umbraco.Tests/Mapping/MappingTests.cs b/src/Umbraco.Tests/Mapping/MappingTests.cs
@@ -195,7 +195,24 @@ public void EnumMap()
             Assert.AreEqual(Thing6Enum.Banana, thing6.Fruit2);
             Assert.AreEqual(Thing6Enum.Cherry, thing6.Fruit3);
         }
-        
+
+        [Test]
+        public void NullPropertyMap()
+        {
+            var definitions = new MapDefinitionCollection(new IMapDefinition[]
+            {
+                new MapperDefinition5(),
+            });
+            var mapper = new UmbracoMapper(definitions);
+
+            var thing7 = new Thing7();
+
+            var thing8 = mapper.Map<Thing7, Thing8>(thing7);
+
+            Assert.IsNotNull(thing8);
+            Assert.IsNull(thing8.Things);
+        }
+
 
         private class Thing1
         {
@@ -241,6 +258,16 @@ private enum Thing6Enum
             Cherry = 2
         }
 
+        private class Thing7
+        {
+            public IEnumerable<Thing1> Things { get; set; }
+        }
+
+        private class Thing8
+        {
+            public IEnumerable<Thing2> Things { get; set; }
+        }
+
         private class MapperDefinition1 : IMapDefinition
         {
             public void DefineMaps(UmbracoMapper mapper)
@@ -294,5 +321,24 @@ private void Map(Thing5 source, Thing6 target, MapperContext context)
                 target.Fruit3 = context.Map<Thing6Enum>(source.Fruit3);
             }
         }
+
+        private class MapperDefinition5 : IMapDefinition
+        {
+            public void DefineMaps(UmbracoMapper mapper)
+            {
+                mapper.Define<Thing1, Thing2>((source, context) => new Thing2(), Map1);
+                mapper.Define<Thing7, Thing8>((source, context) => new Thing8(), Map2);
+            }
+
+            private void Map1(Thing1 source, Thing2 target, MapperContext context)
+            {
+                target.Value = source.Value;
+            }
+
+            private void Map2(Thing7 source, Thing8 target, MapperContext context)
+            {
+                target.Things = context.Map<IEnumerable<Thing2>>(source.Things);
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public TTarget Map<TSource, TTarget>(TSource source, MapperContext context)`
`191`	`191`	`private TTarget Map<TTarget>(object source, Type sourceType, MapperContext context)`
`192`	`192`	`{`
`193`	`193`	`if (source == null)`
`194`		`- throw new ArgumentNullException(nameof(source));`
	`194`	`+ return default;`
`195`	`195`
`196`	`196`	`var targetType = typeof(TTarget);`
`197`	`197`