Add Microsoft.CodeAnalysis.FxCopAnalyzers

Author: TheConstructor

System.Text.Json.Extensions/Converters/KeyValuePairCollectionConverter.cs

@@ -41,6 +41,11 @@ public override TCollection Read(ref Utf8JsonReader reader, Type typeToConvert,
 
         public override void Write(Utf8JsonWriter writer, TCollection collection, JsonSerializerOptions options)
         {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
             if (collection == null)
             {
                 writer.WriteNullValue();

System.Text.Json.Extensions/Converters/KeyValuePairCollectionConverterFactory.cs

@@ -5,9 +5,9 @@ namespace System.Text.Json.Extensions.Converters
 {
     public class KeyValuePairCollectionConverterFactory : JsonConverterFactory
     {
-        public Type GetValueType(Type typeToConvert)
+        public static Type GetValueType(Type typeToConvert)
         {
-            if (typeToConvert.GetConstructor(new Type[0]) == null)
+            if (typeToConvert?.GetConstructor(Array.Empty<Type>()) == null)
             {
                 return null;
             }

System.Text.Json.Extensions/JsonSerializerOptionsExtensions.cs

@@ -4,16 +4,27 @@ public static class JsonSerializerOptionsExtensions
     {
         public static JsonReaderOptions GetReaderOptions(this JsonSerializerOptions jsonSerializerOptions)
         {
+            if (jsonSerializerOptions == null)
+            {
+                throw new ArgumentNullException(nameof(jsonSerializerOptions));
+            }
+
             return new JsonReaderOptions
             {
                 CommentHandling = jsonSerializerOptions.ReadCommentHandling,
                 AllowTrailingCommas = jsonSerializerOptions.AllowTrailingCommas,
                 MaxDepth = jsonSerializerOptions.MaxDepth
             };
         }
-        
-        public static JsonWriterOptions GetWriterOptions(this JsonSerializerOptions jsonSerializerOptions, bool skipValidation = true)
+
+        public static JsonWriterOptions GetWriterOptions(this JsonSerializerOptions jsonSerializerOptions,
+            bool skipValidation = true)
         {
+            if (jsonSerializerOptions == null)
+            {
+                throw new ArgumentNullException(nameof(jsonSerializerOptions));
+            }
+
             return new JsonWriterOptions
             {
                 Encoder = jsonSerializerOptions.Encoder,

System.Text.Json.Extensions/System.Text.Json.Extensions.csproj

@@ -5,6 +5,10 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
       <PackageReference Include="System.Text.Json" Version="4.7.2" />
     </ItemGroup>
 

System.Text.Json.Extensions/Utf8JsonReaderExtensions.cs

@@ -16,7 +16,7 @@ public static T ReadObject<T>(this ref Utf8JsonReader reader, JsonSerializerOpti
             {
                 reader.Read();
             } while (reader.TokenType == JsonTokenType.Comment
-                     && options.ReadCommentHandling == JsonCommentHandling.Skip);
+                     && options?.ReadCommentHandling == JsonCommentHandling.Skip);
 
             return GetObject<T>(ref reader, options);
         }

System.Text.Json.Extensions/Utf8JsonWriterExtensions.cs

@@ -12,6 +12,11 @@ public static class Utf8JsonWriterExtensions
         /// </summary>
         public static void WriteObject<T>(this Utf8JsonWriter writer, string propertyName, T value, JsonSerializerOptions options)
         {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
             writer.WritePropertyName(propertyName);
             writer.WriteObject(value, options);
         }
@@ -23,6 +28,11 @@ public static void WriteObject<T>(this Utf8JsonWriter writer, string propertyNam
         /// </summary>
         public static void WriteObject<T>(this Utf8JsonWriter writer, T value, JsonSerializerOptions options)
         {
+            if (writer == null)
+            {
+                throw new ArgumentNullException(nameof(writer));
+            }
+
             var typeToConvert = typeof(T);
 
             // Attempt to use existing converter first before re-entering through JsonSerializer.Serialize().