Upgrade packages. Check for nulls.

Author: Muhammad Rehan Saeed

MinimumRecommendedRulesWithStyleCop.ruleset

@@ -10,7 +10,8 @@
     <Rule Id="CA1061" Action="Warning" />
     <Rule Id="CA1063" Action="Warning" />
     <Rule Id="CA1065" Action="Warning" />
-    <Rule Id="CA1301" Action="Warning" />
+    <Rule Id="CA1301" Action="Warning" />
+    <Rule Id="CA1303" Action="None" />
     <Rule Id="CA1400" Action="Warning" />
     <Rule Id="CA1401" Action="Warning" />
     <Rule Id="CA1403" Action="Warning" />

Source/Schema.NET.Tool/CustomOverrides/AddNumberTypeToMediaObjectHeightAndWidth.cs

@@ -7,11 +7,23 @@ namespace Schema.NET.Tool.CustomOverrides
     // https://github.com/schemaorg/schemaorg/issues/1668
     public class AddNumberTypeToMediaObjectHeightAndWidth : IClassOverride
     {
-        public bool CanOverride(Class @class) =>
-            string.Equals(@class.Name, "MediaObject", StringComparison.OrdinalIgnoreCase);
+        public bool CanOverride(Class @class)
+        {
+            if (@class == null)
+            {
+                throw new ArgumentNullException(nameof(@class));
+            }
+
+            return string.Equals(@class.Name, "MediaObject", StringComparison.OrdinalIgnoreCase);
+        }
 
         public void Override(Class @class)
         {
+            if (@class == null)
+            {
+                throw new ArgumentNullException(nameof(@class));
+            }
+
             @class
                 .Properties
                 .First(x => string.Equals(x.Name, "Height", StringComparison.OrdinalIgnoreCase))

Source/Schema.NET.Tool/CustomOverrides/AddQueryInputPropertyToSearchAction.cs

@@ -6,11 +6,23 @@ namespace Schema.NET.Tool.CustomOverrides
 
     public class AddQueryInputPropertyToSearchAction : IClassOverride
     {
-        public bool CanOverride(Class @class) =>
-            string.Equals(@class.Name, "SearchAction", StringComparison.Ordinal);
+        public bool CanOverride(Class @class)
+        {
+            if (@class == null)
+            {
+                throw new ArgumentNullException(nameof(@class));
+            }
+
+            return string.Equals(@class.Name, "SearchAction", StringComparison.Ordinal);
+        }
 
         public void Override(Class @class)
         {
+            if (@class == null)
+            {
+                throw new ArgumentNullException(nameof(@class));
+            }
+
             var property = new Property()
             {
                 Class = @class,

Source/Schema.NET.Tool/CustomOverrides/AddTextTypeToActionTarget.cs

@@ -7,11 +7,23 @@ namespace Schema.NET.Tool.CustomOverrides
     // See https://schema.org/docs/actions.html#part-3
     public class AddTextTypeToActionTarget : IClassOverride
     {
-        public bool CanOverride(Class @class) =>
-            string.Equals(@class.Name, "Action", StringComparison.OrdinalIgnoreCase);
+        public bool CanOverride(Class @class)
+        {
+            if (@class == null)
+            {
+                throw new ArgumentNullException(nameof(@class));
+            }
+
+            return string.Equals(@class.Name, "Action", StringComparison.OrdinalIgnoreCase);
+        }
 
         public void Override(Class @class)
         {
+            if (@class == null)
+            {
+                throw new ArgumentNullException(nameof(@class));
+            }
+
             var property = @class.Properties.First(x => string.Equals(x.Name, "target", StringComparison.OrdinalIgnoreCase));
             property.Types.Add(new PropertyType("URL", "Uri"));
         }

Source/Schema.NET.Tool/CustomOverrides/WarnEmptyEnumerations.cs

@@ -5,10 +5,23 @@ namespace Schema.NET.Tool.CustomOverrides
 
     public class WarnEmptyEnumerations : IEnumerationOverride
     {
-        public bool CanOverride(Enumeration enumeration) => enumeration.Values.Count == 0;
+        public bool CanOverride(Enumeration enumeration)
+        {
+            if (enumeration == null)
+            {
+                throw new ArgumentNullException(nameof(enumeration));
+            }
+
+            return enumeration.Values.Count == 0;
+        }
 
         public void Override(Enumeration enumeration)
         {
+            if (enumeration == null)
+            {
+                throw new ArgumentNullException(nameof(enumeration));
+            }
+
             Console.ForegroundColor = ConsoleColor.Cyan;
             Console.WriteLine($"Enumeration {enumeration.Layer}.{enumeration.Name} has no values");
             Console.ResetColor();

Source/Schema.NET.Tool/EnumerableExtensions.cs

@@ -1,4 +1,4 @@
-namespace Schema.NET.Tool
+namespace Schema.NET.Tool
 {
     using System;
     using System.Collections.Generic;
@@ -7,15 +7,25 @@
     public static class EnumerableExtensions
     {
         public static IEnumerable<T> Traverse<T>(T node, Func<T, T> parent)
-        {
+        {
+            if (parent == null)
+            {
+                throw new ArgumentNullException(nameof(parent));
+            }
+
             for (var x = node; x != null; x = parent(x))
             {
                 yield return x;
             }
         }
 
         public static IEnumerable<T> Traverse<T>(T node, Func<T, IEnumerable<T>> children)
-        {
+        {
+            if (children == null)
+            {
+                throw new ArgumentNullException(nameof(children));
+            }
+
             yield return node;
 
             var childNodes = children(node);

Source/Schema.NET.Tool/Program.cs

@@ -12,11 +12,16 @@ namespace Schema.NET.Tool
     using Schema.NET.Tool.Services;
     using Schema.NET.Tool.ViewModels;
 
-    public class Program
+    public class Program : Disposable
     {
+#pragma warning disable CA2213 // Object is being disposed
+        private readonly SchemaRepository schemaRepository;
+#pragma warning restore CA2213 // Object is being disposed
         private readonly SchemaService schemaService;
 
-        public Program() =>
+        public Program()
+        {
+            this.schemaRepository = new SchemaRepository();
             this.schemaService = new SchemaService(
                 new List<IClassOverride>()
                 {
@@ -28,9 +33,29 @@ public Program() =>
                 {
                     new WarnEmptyEnumerations()
                 },
-                new SchemaRepository());
+                this.schemaRepository);
+        }
+
+        public static async Task<int> Main()
+        {
+            var program = new Program();
 
-        public static void Main() => new Program().Execute().Wait();
+            try
+            {
+                await program.Execute().ConfigureAwait(false);
+                return 0;
+            }
+#pragma warning disable CA1031 // Do not catch general exception types
+            catch
+#pragma warning restore CA1031 // Do not catch general exception types
+            {
+                return -1;
+            }
+            finally
+            {
+                program.Dispose();
+            }
+        }
 
         public async Task Execute()
         {
@@ -69,6 +94,8 @@ public async Task Execute()
             Console.WriteLine("Finished Write Classes");
         }
 
+        protected override void DisposeManaged() => this.schemaRepository.Dispose();
+
         private static async Task ClearOutputDirectory(string directoryPath)
         {
             foreach (var filePath in Directory.GetFiles(directoryPath, "*.cs", SearchOption.AllDirectories))

Source/Schema.NET.Tool/Repositories/SchemaPropertyJsonConverter.cs

@@ -14,6 +14,21 @@ public class SchemaPropertyJsonConverter : JsonConverter
 
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
+            if (reader == null)
+            {
+                throw new ArgumentNullException(nameof(reader));
+            }
+
+            if (objectType == null)
+            {
+                throw new ArgumentNullException(nameof(objectType));
+            }
+
+            if (serializer == null)
+            {
+                throw new ArgumentNullException(nameof(serializer));
+            }
+
             if (reader.TokenType == JsonToken.StartObject)
             {
                 var token = JToken.Load(reader);

Source/Schema.NET.Tool/Repositories/SchemaRepository.cs

@@ -55,25 +55,29 @@ public SchemaRepository() =>
 
         public async Task<List<SchemaObject>> GetSchemaObjects()
         {
-            var response = await this.httpClient
+            using (var response = await this.httpClient
                 .GetAsync(new Uri("/version/latest/all-layers.jsonld", UriKind.Relative))
-                .ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
-            var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-            return Deserialize<List<SchemaObject>>(json, new SchemaPropertyJsonConverter());
+                .ConfigureAwait(false))
+            {
+                response.EnsureSuccessStatusCode();
+                var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                return Deserialize<List<SchemaObject>>(json, new SchemaPropertyJsonConverter());
+            }
         }
 
         public async Task<List<SchemaTreeClass>> GetSchemaTreeClasses()
         {
-            var response = await this.httpClient
+            using (var response = await this.httpClient
                 .GetAsync(new Uri("/docs/tree.jsonld", UriKind.Relative))
-                .ConfigureAwait(false);
-            response.EnsureSuccessStatusCode();
-            var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-            var schemaClass = Deserialize<SchemaTreeClass>(json);
-            return EnumerableExtensions
-                .Traverse(schemaClass, x => x.Children)
-                .ToList();
+                .ConfigureAwait(false))
+            {
+                response.EnsureSuccessStatusCode();
+                var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                var schemaClass = Deserialize<SchemaTreeClass>(json);
+                return EnumerableExtensions
+                    .Traverse(schemaClass, x => x.Children)
+                    .ToList();
+            }
         }
 
         protected override void DisposeManaged() => this.httpClient.Dispose();

Source/Schema.NET.Tool/Schema.NET.Tool.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" PrivateAssets="all" Version="2.9.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" PrivateAssets="all" Version="2.9.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
   </ItemGroup>