no message

Author: kirk-marple

Source/Schema.NET/ValuesJsonConverter.cs

@@ -1,6 +1,7 @@
 namespace Schema.NET
 {
     using System;
+    using System.Collections;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Globalization;
@@ -66,13 +67,18 @@ public override object ReadJson(
                 if (tokenType == JsonToken.StartArray)
                 {
                     var items = new List<object>();
-                    foreach (var type in mainType.GenericTypeArguments)
+                    for (var i = mainType.GenericTypeArguments.Length - 1; i >= 0; i--)
                     {
+                        var type = mainType.GenericTypeArguments[i];
                         var unwrappedType = type.GetUnderlyingTypeFromNullable();
                         var args = ReadJsonArray(token, unwrappedType);
-                        var genericType = typeof(OneOrMany<>).MakeGenericType(type);
-                        var item = (IValues)Activator.CreateInstance(genericType, args);
-                        items.Add(item);
+
+                        if (args != null && args.Count > 0)
+                        {
+                            var genericType = typeof(OneOrMany<>).MakeGenericType(type);
+                            var item = (IValues)Activator.CreateInstance(genericType, args);
+                            items.Add(item);
+                        }
                     }
 
                     argument = items;
@@ -390,7 +396,7 @@ private static Type ToClass(Type type)
             return type;
         }
 
-        private static object ReadJsonArray(JToken token, Type type)
+        private static IList ReadJsonArray(JToken token, Type type)
         {
             var classType = ToClass(type);
             var listType = typeof(List<>).MakeGenericType(classType);
@@ -419,7 +425,7 @@ private static object ReadJsonArray(JToken token, Type type)
                 }
             }
 
-            return list;
+            return (IList)list;
         }
 
         private static IEnumerable<Type> GetTypeHierarchy(Type type)

Source/Schema.NET/core/ItemList.cs

@@ -1,4 +1,4 @@
-namespace Schema.NET
+namespace Schema.NET
 {
     using System;
     using System.Runtime.Serialization;
@@ -14,7 +14,7 @@ public partial interface IItemList : IIntangible
         /// Text values are best if the elements in the list are plain strings. Existing entities are best for a simple, unordered list of existing things in your data. ListItem is used with ordered lists when you want to provide additional context about the element in that list or when the same item might be in different places in different lists.<br/><br/>
         /// Note: The order of elements in your mark-up is not sufficient for indicating the order or elements.  Use ListItem with a 'position' property in such cases.
         /// </summary>
-        Values<IListItem, string, IThing>? ItemListElement { get; set; }
+        Values<IThing, string, IListItem>? ItemListElement { get; set; }
 
         /// <summary>
         /// Type of ordering (e.g. Ascending, Descending, Unordered).
@@ -46,7 +46,7 @@ public partial class ItemList : Intangible, IItemList
         /// </summary>
         [DataMember(Name = "itemListElement", Order = 206)]
         [JsonConverter(typeof(ValuesJsonConverter))]
-        public Values<IListItem, string, IThing>? ItemListElement { get; set; }
+        public Values<IThing, string, IListItem>? ItemListElement { get; set; }
 
         /// <summary>
         /// Type of ordering (e.g. Ascending, Descending, Unordered).

Source/Schema.NET/core/combined/CreativeWorkAndItemListAndListItem.cs

@@ -1,4 +1,4 @@
-namespace Schema.NET
+namespace Schema.NET
 {
     using System;
     using System.Runtime.Serialization;
@@ -389,7 +389,7 @@ public abstract partial class CreativeWorkAndItemListAndListItem : Intangible, I
         /// </summary>
         [DataMember(Name = "itemListElement", Order = 257)]
         [JsonConverter(typeof(ValuesJsonConverter))]
-        public Values<IListItem, string, IThing>? ItemListElement { get; set; }
+        public Values<IThing, string, IListItem>? ItemListElement { get; set; }
 
         /// <summary>
         /// Type of ordering (e.g. Ascending, Descending, Unordered).

Source/Schema.NET/core/enumerations/ActionStatusType.cs

@@ -1,10 +1,13 @@
-namespace Schema.NET
+namespace Schema.NET
 {
     using System.Runtime.Serialization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
 
     /// <summary>
     /// The status of an Action.
     /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum ActionStatusType
     {
         /// <summary>

Source/Schema.NET/core/enumerations/BedType.cs

@@ -1,10 +1,13 @@
-namespace Schema.NET
+namespace Schema.NET
 {
     using System.Runtime.Serialization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
 
     /// <summary>
     /// A type of bed. This is used for indicating the bed or beds available in an accommodation.
     /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum BedType
     {
     }

Source/Schema.NET/core/enumerations/BoardingPolicyType.cs

@@ -1,10 +1,13 @@
-namespace Schema.NET
+namespace Schema.NET
 {
     using System.Runtime.Serialization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
 
     /// <summary>
     /// A type of boarding policy used by an airline.
     /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum BoardingPolicyType
     {
         /// <summary>

Source/Schema.NET/core/enumerations/BookFormatType.cs

@@ -1,10 +1,13 @@
-namespace Schema.NET
+namespace Schema.NET
 {
     using System.Runtime.Serialization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
 
     /// <summary>
     /// The publication format of the book.
     /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum BookFormatType
     {
         /// <summary>

Source/Schema.NET/core/enumerations/BusinessEntityType.cs

@@ -1,6 +1,8 @@
-namespace Schema.NET
+namespace Schema.NET
 {
     using System.Runtime.Serialization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
 
     /// <summary>
     /// A business entity type is a conceptual entity representing the legal form, the size, the main line of business, the position in the value chain, or any combination thereof, of an organization or business person.&lt;br/&gt;&lt;br/&gt;
@@ -12,6 +14,7 @@
     /// &lt;li&gt;http://purl.org/goodrelations/v1#Reseller&lt;/li&gt;
     /// &lt;/ul&gt;
     /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum BusinessEntityType
     {
     }

Source/Schema.NET/core/enumerations/BusinessFunction.cs

@@ -1,6 +1,8 @@
-namespace Schema.NET
+namespace Schema.NET
 {
     using System.Runtime.Serialization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
 
     /// <summary>
     /// The business function specifies the type of activity or access (i.e., the bundle of rights) offered by the organization or business person through the offer. Typical are sell, rental or lease, maintenance or repair, manufacture / produce, recycle / dispose, engineering / construction, or installation. Proprietary specifications of access rights are also instances of this class.&lt;br/&gt;&lt;br/&gt;
@@ -16,6 +18,7 @@
     /// &lt;li&gt;http://purl.org/goodrelations/v1#Buy&lt;/li&gt;
     /// &lt;/ul&gt;
     /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum BusinessFunction
     {
     }

Source/Schema.NET/core/enumerations/ContactPointOption.cs

@@ -1,10 +1,13 @@
-namespace Schema.NET
+namespace Schema.NET
 {
     using System.Runtime.Serialization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
 
     /// <summary>
     /// Enumerated options related to a ContactPoint.
     /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum ContactPointOption
     {
         /// <summary>