Fixed HowToStep in ItemList use case; updated Recipe test. Now JSON array deserialization always returns list of interfaces not class instances.

Author: kirk-marple

Source/Schema.NET/ValuesJsonConverter.cs

@@ -410,7 +410,7 @@ private static Type ToClass(Type type)
         private static IList ReadJsonArray(JToken token, Type type, int? count = null)
         {
             var classType = ToClass(type);
-            var listType = typeof(List<>).MakeGenericType(classType);
+            var listType = typeof(List<>).MakeGenericType(type); // always read into list of interfaces
             var list = Activator.CreateInstance(listType);
             var i = 0;
 
@@ -425,25 +425,33 @@ private static IList ReadJsonArray(JToken token, Type type, int? count = null)
                 var typeName = GetTypeNameFromToken(childToken);
                 if (string.IsNullOrEmpty(typeName))
                 {
-                    var item = childToken.ToObject(classType);
-                    listType
-                        .GetRuntimeMethod(nameof(List<object>.Add), new[] { classType })
-                        .Invoke(list, new object[] { item });
+                    var child = childToken.ToObject(classType);
+                    var method = listType.GetRuntimeMethod(nameof(List<object>.Add), new[] { classType });
+
+                    if (method != null)
+                    {
+                        method.Invoke(list, new object[] { child });
+
+                        i++;
+                    }
                 }
                 else
                 {
                     var builtType = Type.GetType($"{NamespacePrefix}{typeName}");
-                    if (builtType != null && GetTypeHierarchy(builtType).Any(x => x == classType))
+                    if (builtType != null && type.GetTypeInfo().IsAssignableFrom(builtType.GetTypeInfo()))
                     {
                         var child = (Thing)childToken.ToObject(builtType);
-                        listType
-                            .GetRuntimeMethod(nameof(List<object>.Add), new[] { classType })
-                            .Invoke(list, new object[] { child });
+                        var method = listType.GetRuntimeMethod(nameof(List<object>.Add), new[] { classType });
+
+                        if (method != null)
+                        {
+                            method.Invoke(list, new object[] { child });
+
+                            i++;
+                        }
                     }
                 }
 
-                i++;
-
                 if (i == count)
                 {
                     break;
@@ -460,13 +468,18 @@ private static IEnumerable<Type> GetTypeHierarchy(Type type)
                 yield break;
             }
 
-            yield return type;
+            var tt = type.GetTypeInfo().GetNestedTypes(BindingFlags.Public);
+
+            foreach (var t in tt)
+            {
+                yield return t;
+            }
+
+            var ii = type.GetInterfaces();
 
-            var baseType = type.GetTypeInfo().BaseType;
-            while (baseType != null)
+            foreach (var i in ii)
             {
-                yield return baseType;
-                baseType = baseType.GetTypeInfo().BaseType;
+                yield return i;
             }
         }
 

Tests/Schema.NET.Test/core/RecipeTest.cs

@@ -38,7 +38,11 @@ public class RecipeTest
                 "Thinly-sliced apples:6 cups",
                 "White sugar:3/4 cup"
             },
-            RecipeInstructions = "1. Cut and peel apples..."
+            RecipeInstructions = new List<ICreativeWork>()
+            {
+                new HowToStep { Text = "1. Cut and peel apples..." },
+                new HowToStep { Text = "2. Put in pie shell..." }
+            }
         };
 
         private readonly string json =
@@ -71,7 +75,14 @@ public class RecipeTest
                 "\"Thinly-sliced apples:6 cups\"," +
                 "\"White sugar:3/4 cup\"" +
             "]," +
-            "\"recipeInstructions\":\"1. Cut and peel apples...\"," +
+            "\"recipeInstructions\":[{" +
+                    "\"@type\":\"HowToStep\"," +
+                    "\"text\":\"1. Cut and peel apples...\"" +
+                "},{" +
+                    "\"@type\":\"HowToStep\"," +
+                    "\"text\":\"2. Put in pie shell...\"" +
+                "}" +
+            "]," +
             "\"recipeYield\":\"1 9 inch pie (8 servings)\"" +
             "}";