Handle generic sub types

JsonSubTypes.Tests/GenericTests.cs

@@ -0,0 +1,52 @@
+using System;
+using Newtonsoft.Json;
+using NUnit.Framework;
+
+namespace JsonSubTypes.Tests
+{[JsonConverter(typeof(JsonSubtypes), "Type")]	
+    [JsonSubtypes.KnownSubType(typeof(Some<>), "Some")]												
+    public interface IResult
+    {
+        string Type { get;}
+    }
+
+    public class SomeInteger: Some<int> {
+        public override string ResultType { get { return "SomeInteger"; }} 
+
+    }
+
+    public class SomeText: Some<string> {
+        public override string ResultType { get { return "SomeText"; }} 
+
+    }
+
+    [JsonConverter(typeof(JsonSubtypes), "ResultType")]
+    //[JsonSubtypes.KnownSubType(typeof(SomeInteger), "SomeInteger")]
+    //[JsonSubtypes.KnownSubType(typeof(SomeText), "SomeText")]
+    public abstract class Some<T> : IResult
+    {
+
+        public string Type { get { return "Some"; }} 
+        public abstract string ResultType { get; }
+        public T Value { get; set; }
+    }
+
+    [TestFixture]
+    public class GenericTests
+    {
+
+
+        [Test]
+        public void DeserializingSubTypeWithDateParsesCorrectly()
+        {
+            var input = new SomeInteger {Value = 42};
+            var json = JsonConvert.SerializeObject(input);
+
+            Console.WriteLine(json);
+
+            var result = JsonConvert.DeserializeObject<IResult>(json);
+
+            Console.WriteLine(result);
+        }
+    }
+}

JsonSubTypes/JsonSubtypes.cs

@@ -392,14 +392,29 @@ private static Type GetTypeByName(string typeName, TypeInfo parentType)
                 typeByName = insideAssembly.GetType(searchLocation + typeName, false, true);
             }
 
-            var typeByNameInfo = ToTypeInfo(typeByName);
-            if (typeByNameInfo != null && parentType.IsAssignableFrom(typeByNameInfo))
+            TypeInfo typeByNameInfo = ToTypeInfo(typeByName);
+            if (typeByNameInfo == null)
+            {
+                return null;
+            }
+
+            if (parentType.IsAssignableFrom(typeByNameInfo) || (parentType.IsGenericType && IsSubclassOfRawGeneric(parentType, typeByNameInfo)))
             {
                 return typeByName;
             }
 
             return null;
         }
+
+        static bool IsSubclassOfRawGeneric(TypeInfo generic, TypeInfo toCheck) {
+            TypeInfo cur = toCheck;
+            TypeInfo objectTypeInfo = ToTypeInfo(typeof(object));
+            while (generic != cur && toCheck != objectTypeInfo) {
+                cur = toCheck.IsGenericType ? ToTypeInfo(toCheck.GetGenericTypeDefinition()) : toCheck;
+                toCheck = ToTypeInfo(toCheck.BaseType);
+            }
+            return generic == cur;
+        }
 
         private static Type GetTypeFromMapping(NullableDictionary<object, Type> typeMapping, JToken discriminatorToken, JsonSerializer serializer)
         {