Update schema from Schema.org and use https URL's

Author: RehanSaeed

Benchmarks/Schema.NET.Benchmarks/Core/BookBenchmark.cs

@@ -9,13 +9,13 @@ public class BookBenchmark : SchemaBenchmarkBase
         [GlobalSetup]
         public void Setup() => this.ConfigureBenchmark(new Book()
         {
-            Id = new Uri("http://example.com/book/1"),
+            Id = new Uri("https://example.com/book/1"),
             Name = "The Catcher in the Rye",
             Author = new Person()
             {
                 Name = "J.D. Salinger",
             },
-            Url = new Uri("http://www.barnesandnoble.com/store/info/offer/JDSalinger"),
+            Url = new Uri("https://www.barnesandnoble.com/store/info/offer/JDSalinger"),
             WorkExample = new List<ICreativeWork>()
             {
                 new Book()
@@ -27,7 +27,7 @@ public void Setup() => this.ConfigureBenchmark(new Book()
                     {
                         Target = new EntryPoint()
                         {
-                            UrlTemplate = "http://www.barnesandnoble.com/store/info/offer/0316769487?purchase=true",
+                            UrlTemplate = "https://www.barnesandnoble.com/store/info/offer/0316769487?purchase=true",
                             ActionPlatform = new List<Uri>()
                             {
                                 new Uri("https://schema.org/DesktopWebPlatform"),
@@ -56,7 +56,7 @@ public void Setup() => this.ConfigureBenchmark(new Book()
                     {
                         Target = new EntryPoint()
                         {
-                            UrlTemplate = "http://www.barnesandnoble.com/store/info/offer/031676947?purchase=true",
+                            UrlTemplate = "https://www.barnesandnoble.com/store/info/offer/031676947?purchase=true",
                             ActionPlatform = new List<Uri>()
                             {
                                 new Uri("https://schema.org/DesktopWebPlatform"),

Benchmarks/Schema.NET.Benchmarks/Core/WebsiteBenchmark.cs

@@ -10,7 +10,7 @@ public void Setup() => this.ConfigureBenchmark(new WebSite()
         {
             PotentialAction = new SearchAction()
             {
-                Target = new Uri("http://example.com/search?&q={query}"),
+                Target = new Uri("https://example.com/search?&q={query}"),
                 QueryInput = "required",
             },
             Url = new Uri("https://example.com"),

README.md

@@ -20,7 +20,7 @@ The code above outputs the following JSON-LD:
 
 ```JSON
 {
-    "@context":"http://schema.org",
+    "@context":"https://schema.org",
     "@type":"WebSite",
     "alternateName":"An Alternative Name",
     "name":"Your Site Name",
@@ -47,9 +47,9 @@ Using structured data in `html` requires the use of a `script` tag with a MIME t
 ```HTML
 <script type="application/ld+json">
 {
-  "@context": "http://schema.org",
+  "@context": "https://schema.org",
   "@type": "Organization",
-  "url": "http://www.example.com",
+  "url": "https://www.example.com",
   "name": "Unlimited Ball Bearings Corp.",
   "contactPoint": {
     "@type": "ContactPoint",

Source/Schema.NET/ContextJsonConverter.cs

@@ -42,7 +42,7 @@ public override JsonLdContext ReadJson(JsonReader reader, Type objectType, JsonL
                 var o = JObject.Load(reader);
 
                 var nameProperty = o.Property("name", StringComparison.OrdinalIgnoreCase);
-                name = nameProperty?.Value?.ToString() ?? "http://schema.org";
+                name = nameProperty?.Value?.ToString() ?? "https://schema.org";
 
                 var languageProperty = o.Property("@language", StringComparison.OrdinalIgnoreCase);
                 language = languageProperty?.Value?.ToString();

Source/Schema.NET/ValuesJsonConverter.cs

@@ -1,11 +1,9 @@
 namespace Schema.NET
 {
     using System;
-    using System.Collections.Concurrent;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Globalization;
-    using System.Linq.Expressions;
     using System.Reflection;
     using System.Xml;
     using Newtonsoft.Json;

Source/Schema.NET/auto/BusOrCoach.cs

@@ -18,9 +18,9 @@ public partial interface IBusOrCoach : IVehicle
         /// The permitted total weight of cargo and installations (e.g. a roof rack) on top of the vehicle.<br/><br/>
         /// Typical unit code(s): KGM for kilogram, LBR for pound<br/><br/>
         /// <ul>
-        /// <li>Note 1: You can indicate additional information in the <a class="localLink" href="http://schema.org/name">name</a> of the <a class="localLink" href="http://schema.org/QuantitativeValue">QuantitativeValue</a> node.</li>
-        /// <li>Note 2: You may also link to a <a class="localLink" href="http://schema.org/QualitativeValue">QualitativeValue</a> node that provides additional information using <a class="localLink" href="http://schema.org/valueReference">valueReference</a></li>
-        /// <li>Note 3: Note that you can use <a class="localLink" href="http://schema.org/minValue">minValue</a> and <a class="localLink" href="http://schema.org/maxValue">maxValue</a> to indicate ranges.</li>
+        /// <li>Note 1: You can indicate additional information in the <a class="localLink" href="https://schema.org/name">name</a> of the <a class="localLink" href="https://schema.org/QuantitativeValue">QuantitativeValue</a> node.</li>
+        /// <li>Note 2: You may also link to a <a class="localLink" href="https://schema.org/QualitativeValue">QualitativeValue</a> node that provides additional information using <a class="localLink" href="https://schema.org/valueReference">valueReference</a></li>
+        /// <li>Note 3: Note that you can use <a class="localLink" href="https://schema.org/minValue">minValue</a> and <a class="localLink" href="https://schema.org/maxValue">maxValue</a> to indicate ranges.</li>
         /// </ul>
         /// </summary>
         OneOrMany<IQuantitativeValue> RoofLoad { get; set; }
@@ -49,9 +49,9 @@ public partial class BusOrCoach : Vehicle, IBusOrCoach, IEquatable<BusOrCoach>
         /// The permitted total weight of cargo and installations (e.g. a roof rack) on top of the vehicle.&lt;br/&gt;&lt;br/&gt;
         /// Typical unit code(s): KGM for kilogram, LBR for pound&lt;br/&gt;&lt;br/&gt;
         /// &lt;ul&gt;
-        /// &lt;li&gt;Note 1: You can indicate additional information in the &lt;a class="localLink" href="http://schema.org/name"&gt;name&lt;/a&gt; of the &lt;a class="localLink" href="http://schema.org/QuantitativeValue"&gt;QuantitativeValue&lt;/a&gt; node.&lt;/li&gt;
-        /// &lt;li&gt;Note 2: You may also link to a &lt;a class="localLink" href="http://schema.org/QualitativeValue"&gt;QualitativeValue&lt;/a&gt; node that provides additional information using &lt;a class="localLink" href="http://schema.org/valueReference"&gt;valueReference&lt;/a&gt;&lt;/li&gt;
-        /// &lt;li&gt;Note 3: Note that you can use &lt;a class="localLink" href="http://schema.org/minValue"&gt;minValue&lt;/a&gt; and &lt;a class="localLink" href="http://schema.org/maxValue"&gt;maxValue&lt;/a&gt; to indicate ranges.&lt;/li&gt;
+        /// &lt;li&gt;Note 1: You can indicate additional information in the &lt;a class="localLink" href="https://schema.org/name"&gt;name&lt;/a&gt; of the &lt;a class="localLink" href="https://schema.org/QuantitativeValue"&gt;QuantitativeValue&lt;/a&gt; node.&lt;/li&gt;
+        /// &lt;li&gt;Note 2: You may also link to a &lt;a class="localLink" href="https://schema.org/QualitativeValue"&gt;QualitativeValue&lt;/a&gt; node that provides additional information using &lt;a class="localLink" href="https://schema.org/valueReference"&gt;valueReference&lt;/a&gt;&lt;/li&gt;
+        /// &lt;li&gt;Note 3: Note that you can use &lt;a class="localLink" href="https://schema.org/minValue"&gt;minValue&lt;/a&gt; and &lt;a class="localLink" href="https://schema.org/maxValue"&gt;maxValue&lt;/a&gt; to indicate ranges.&lt;/li&gt;
         /// &lt;/ul&gt;
         /// </summary>
         [DataMember(Name = "roofLoad", Order = 307)]

Source/Schema.NET/bib/Collection.cs

@@ -5,18 +5,18 @@
     using Newtonsoft.Json;
 
     /// <summary>
-    /// A created collection of Creative Works or other artefacts.
+    /// A collection of items e.g. creative works or products.
     /// </summary>
     public partial interface ICollection : ICreativeWork
     {
         /// <summary>
-        /// The number of items in the &lt;a class="localLink" href="http://schema.org/Collection"&gt;Collection&lt;/a&gt;.
+        /// The number of items in the &lt;a class="localLink" href="https://schema.org/Collection"&gt;Collection&lt;/a&gt;.
         /// </summary>
         OneOrMany<int?> CollectionSize { get; set; }
     }
 
     /// <summary>
-    /// A created collection of Creative Works or other artefacts.
+    /// A collection of items e.g. creative works or products.
     /// </summary>
     [DataContract]
     public partial class Collection : CreativeWork, ICollection, IEquatable<Collection>
@@ -28,7 +28,7 @@ public partial class Collection : CreativeWork, ICollection, IEquatable<Collecti
         public override string Type => "Collection";
 
         /// <summary>
-        /// The number of items in the &lt;a class="localLink" href="http://schema.org/Collection"&gt;Collection&lt;/a&gt;.
+        /// The number of items in the &lt;a class="localLink" href="https://schema.org/Collection"&gt;Collection&lt;/a&gt;.
         /// </summary>
         [DataMember(Name = "collectionSize", Order = 206)]
         [JsonConverter(typeof(ValuesJsonConverter))]

Source/Schema.NET/bib/ComicIssue.cs

@@ -6,18 +6,18 @@
 
     /// <summary>
     /// Individual comic issues are serially published as
-    ///     part of a larger series. For the sake of consistency, even one-shot issues
-    ///     belong to a series comprised of a single issue. All comic issues can be
-    ///     uniquely identified by: the combination of the name and volume number of the
-    ///     series to which the issue belongs; the issue number; and the variant
-    ///     description of the issue (if any).
+    ///         part of a larger series. For the sake of consistency, even one-shot issues
+    ///         belong to a series comprised of a single issue. All comic issues can be
+    ///         uniquely identified by: the combination of the name and volume number of the
+    ///         series to which the issue belongs; the issue number; and the variant
+    ///         description of the issue (if any).
     /// </summary>
     public partial interface IComicIssue : IPublicationIssue
     {
         /// <summary>
         /// The primary artist for a work
-        ///     in a medium other than pencils or digital line art--for example, if the
-        ///     primary artwork is done in watercolors or digital paints.
+        ///         in a medium other than pencils or digital line art--for example, if the
+        ///         primary artwork is done in watercolors or digital paints.
         /// </summary>
         OneOrMany<IPerson> Artist { get; set; }
 
@@ -43,19 +43,19 @@ public partial interface IComicIssue : IPublicationIssue
 
         /// <summary>
         /// A description of the variant cover
-        ///     for the issue, if the issue is a variant printing. For example, "Bryan Hitch
-        ///     Variant Cover" or "2nd Printing Variant".
+        ///         for the issue, if the issue is a variant printing. For example, "Bryan Hitch
+        ///         Variant Cover" or "2nd Printing Variant".
         /// </summary>
         OneOrMany<string> VariantCover { get; set; }
     }
 
     /// <summary>
     /// Individual comic issues are serially published as
-    ///     part of a larger series. For the sake of consistency, even one-shot issues
-    ///     belong to a series comprised of a single issue. All comic issues can be
-    ///     uniquely identified by: the combination of the name and volume number of the
-    ///     series to which the issue belongs; the issue number; and the variant
-    ///     description of the issue (if any).
+    ///         part of a larger series. For the sake of consistency, even one-shot issues
+    ///         belong to a series comprised of a single issue. All comic issues can be
+    ///         uniquely identified by: the combination of the name and volume number of the
+    ///         series to which the issue belongs; the issue number; and the variant
+    ///         description of the issue (if any).
     /// </summary>
     [DataContract]
     public partial class ComicIssue : PublicationIssue, IComicIssue, IEquatable<ComicIssue>
@@ -68,8 +68,8 @@ public partial class ComicIssue : PublicationIssue, IComicIssue, IEquatable<Comi
 
         /// <summary>
         /// The primary artist for a work
-        ///     in a medium other than pencils or digital line art--for example, if the
-        ///     primary artwork is done in watercolors or digital paints.
+        ///         in a medium other than pencils or digital line art--for example, if the
+        ///         primary artwork is done in watercolors or digital paints.
         /// </summary>
         [DataMember(Name = "artist", Order = 306)]
         [JsonConverter(typeof(ValuesJsonConverter))]
@@ -105,8 +105,8 @@ public partial class ComicIssue : PublicationIssue, IComicIssue, IEquatable<Comi
 
         /// <summary>
         /// A description of the variant cover
-        ///     for the issue, if the issue is a variant printing. For example, "Bryan Hitch
-        ///     Variant Cover" or "2nd Printing Variant".
+        ///         for the issue, if the issue is a variant printing. For example, "Bryan Hitch
+        ///         Variant Cover" or "2nd Printing Variant".
         /// </summary>
         [DataMember(Name = "variantCover", Order = 311)]
         [JsonConverter(typeof(ValuesJsonConverter))]

Source/Schema.NET/bib/ComicSeries.cs

@@ -6,17 +6,17 @@
 
     /// <summary>
     /// A sequential publication of comic stories under a
-    ///     unifying title, for example "The Amazing Spider-Man" or "Groo the
-    ///     Wanderer".
+    ///         unifying title, for example "The Amazing Spider-Man" or "Groo the
+    ///         Wanderer".
     /// </summary>
     public partial interface IComicSeries : IPeriodical
     {
     }
 
     /// <summary>
     /// A sequential publication of comic stories under a
-    ///     unifying title, for example "The Amazing Spider-Man" or "Groo the
-    ///     Wanderer".
+    ///         unifying title, for example "The Amazing Spider-Man" or "Groo the
+    ///         Wanderer".
     /// </summary>
     [DataContract]
     public partial class ComicSeries : Periodical, IComicSeries, IEquatable<ComicSeries>

Source/Schema.NET/bib/ComicStory.cs

@@ -6,15 +6,15 @@
 
     /// <summary>
     /// The term "story" is any indivisible, re-printable
-    ///     unit of a comic, including the interior stories, covers, and backmatter. Most
-    ///     comics have at least two stories: a cover (ComicCoverArt) and an interior story.
+    ///         unit of a comic, including the interior stories, covers, and backmatter. Most
+    ///         comics have at least two stories: a cover (ComicCoverArt) and an interior story.
     /// </summary>
     public partial interface IComicStory : ICreativeWork
     {
         /// <summary>
         /// The primary artist for a work
-        ///     in a medium other than pencils or digital line art--for example, if the
-        ///     primary artwork is done in watercolors or digital paints.
+        ///         in a medium other than pencils or digital line art--for example, if the
+        ///         primary artwork is done in watercolors or digital paints.
         /// </summary>
         OneOrMany<IPerson> Artist { get; set; }
 
@@ -41,8 +41,8 @@ public partial interface IComicStory : ICreativeWork
 
     /// <summary>
     /// The term "story" is any indivisible, re-printable
-    ///     unit of a comic, including the interior stories, covers, and backmatter. Most
-    ///     comics have at least two stories: a cover (ComicCoverArt) and an interior story.
+    ///         unit of a comic, including the interior stories, covers, and backmatter. Most
+    ///         comics have at least two stories: a cover (ComicCoverArt) and an interior story.
     /// </summary>
     [DataContract]
     public partial class ComicStory : CreativeWork, IComicStory, IEquatable<ComicStory>
@@ -55,8 +55,8 @@ public partial class ComicStory : CreativeWork, IComicStory, IEquatable<ComicSto
 
         /// <summary>
         /// The primary artist for a work
-        ///     in a medium other than pencils or digital line art--for example, if the
-        ///     primary artwork is done in watercolors or digital paints.
+        ///         in a medium other than pencils or digital line art--for example, if the
+        ///         primary artwork is done in watercolors or digital paints.
         /// </summary>
         [DataMember(Name = "artist", Order = 206)]
         [JsonConverter(typeof(ValuesJsonConverter))]