Use ChangeValueType in AutoMapping Utils + add Exception for long>TimeSpan

Author: mythz

src/ServiceStack.Text/AutoMappingUtils.cs

@@ -28,34 +28,10 @@ public static T ConvertTo<T>(this object from)
             if (fromType == typeof(T))
                 return (T)from;
 
-            if (fromType.IsValueType || typeof(T).IsValueType)
+            var toType = typeof(T);
+            if (fromType.IsValueType || toType.IsValueType)
             {
-                if (!fromType.IsEnum && !typeof(T).IsEnum)
-                {
-                    if (typeof(T) == typeof(char) && from is string s)
-                        return (T)(s.Length > 0 ? (object) s[0] : null);
-                    if (typeof(T) == typeof(string) && from is char c)
-                        return (T)(object)c.ToString();
-
-                    var destNumberType = DynamicNumber.GetNumber(typeof(T));
-                    var value = destNumberType?.ConvertFrom(from);
-                    if (value != null)
-                    {
-                        if (typeof(T) == typeof(char))
-                            return (T)(object)value.ToString()[0];
-
-                        return (T)value;
-                    }
-
-                    if (typeof(T) == typeof(string))
-                    {
-                        var srcNumberType = DynamicNumber.GetNumber(from.GetType());
-                        if (srcNumberType != null)
-                            return (T)(object)srcNumberType.ToString(from);
-                    }
-                }
-
-                return (T)ChangeValueType(from, typeof(T));
+                return (T)ChangeValueType(from, toType);
             }
 
             if (typeof(IEnumerable).IsAssignableFrom(typeof(T)))
@@ -113,18 +89,51 @@ public static object ConvertTo(this object from, Type type)
             }
 
             var to = type.CreateInstance();
-            return to.PopulateInstance(from);
+            return to.PopulateWithNonDefaultValues(from);
         }
 
-        private static object ChangeValueType(object from, Type type)
+        public static object ChangeValueType(object from, Type toType)
         {
+            var fromType = from.GetType();
+            if (!fromType.IsEnum && !toType.IsEnum)
+            {
+                if (toType == typeof(char) && from is string s)
+                    return s.Length > 0 ? (object) s[0] : null;
+                if (toType == typeof(string) && from is char c)
+                    return c.ToString();
+                if (toType == typeof(TimeSpan) && from is long ticks)
+                    return new TimeSpan(ticks);
+
+                var destNumberType = DynamicNumber.GetNumber(toType);
+                var value = destNumberType?.ConvertFrom(from);
+                if (value != null)
+                {
+                    if (toType == typeof(char))
+                        return value.ToString()[0];
+
+                    return value;
+                }
+
+                if (toType == typeof(string))
+                {
+                    var srcNumberType = DynamicNumber.GetNumber(from.GetType());
+                    if (srcNumberType != null)
+                        return srcNumberType.ToString(@from);
+                }
+            }
+            
             if (from is string strValue)
-                return TypeSerializer.DeserializeFromString(strValue, type);
+                return TypeSerializer.DeserializeFromString(strValue, toType);
 
-            if (type == typeof(string))
+            if (toType == typeof(string))
                 return from.ToJsv();
 
-            return Convert.ChangeType(from, type, provider: null);
+            if (toType.HasInterface(typeof(IConvertible)))
+            {
+                return Convert.ChangeType(from, toType, provider: null);
+            }
+
+            return TypeSerializer.DeserializeFromString(from.ToJsv(), toType);
         }
 
         public static object ChangeTo(this string strValue, Type type)
@@ -149,8 +158,7 @@ public static List<string> GetPropertyNames(this Type type)
         {
             lock (TypePropertyNamesMap)
             {
-                List<string> propertyNames;
-                if (!TypePropertyNamesMap.TryGetValue(type, out propertyNames))
+                if (!TypePropertyNamesMap.TryGetValue(type, out var propertyNames))
                 {
                     propertyNames = type.Properties().ToList().ConvertAll(x => x.Name);
                     TypePropertyNamesMap[type] = propertyNames;
@@ -823,7 +831,7 @@ public static GetMemberDelegate CreateTypeConverter(Type fromType, Type toType)
             }
             else if (underlyingToType.IsValueType)
             {
-                return fromValue => Convert.ChangeType(fromValue, underlyingToType, provider: null);
+                return fromValue => AutoMappingUtils.ChangeValueType(fromValue, underlyingToType);
             }
             else 
             {

tests/ServiceStack.Text.Tests/AutoMappingObjectDictionaryTests.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using Northwind.Common.DataModel;
@@ -320,6 +321,24 @@ public class ModelWithCollectionsOfNullableTypes
             public Car[] Cars { get; set; }
             public IList<Color> Colors { get; set; }
         }
+
+        public class ModelWithTimeSpan
+        {
+            public TimeSpan Time { get; set; }
+        }
+
+        [Test]
+        public void FromObjectDictionary_does_try_to_Convert_different_types()
+        {
+            var time = new TimeSpan(1,1,1,1);
+            var map = new Dictionary<string, object> {
+                [nameof(ModelWithTimeSpan.Time)] = time.Ticks
+            };
+
+            var dto = map.FromObjectDictionary<ModelWithTimeSpan>();
+            
+            Assert.That(dto.Time, Is.EqualTo(time));
+        }
     }