Clean up analysis warnings

Directory.Build.props

@@ -1,6 +1,7 @@
 <Project>
 
   <PropertyGroup>
+    <AnalysisLevel>7</AnalysisLevel>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\Chr.Avro.snk</AssemblyOriginatorKeyFile>
     <AssemblyVersion>8.0.0.0</AssemblyVersion>
     <Authors>C.H. Robinson</Authors>
@@ -21,7 +22,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <IncludeAssets>Analyzers</IncludeAssets>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>

src/Chr.Avro.Binary/Serialization/BinaryReader.cs

@@ -30,7 +30,7 @@ public BinaryReader(ReadOnlySpan<byte> data)
         /// <summary>
         /// Gets the current position of the reader.
         /// </summary>
-        public long Index => index;
+        public readonly long Index => index;
 
         /// <summary>
         /// Reads a Boolean value from the current position and advances the reader.
@@ -142,7 +142,8 @@ public long ReadInteger()
                 {
                     throw new InvalidEncodingException(index, "Unable to read a valid variable-length integer. This may indicate invalid encoding earlier in the stream.");
                 }
-            } while (current > 0x7F);
+            }
+            while (current > 0x7F);
 
             return (-(result & 0x01)) ^ ((result >> 0x01) & 0x7FFFFFFFFFFFFFFF);
         }

src/Chr.Avro.Codegen/Codegen/CSharpCodeGenerator.cs

@@ -125,7 +125,7 @@ public virtual CompilationUnitSyntax GenerateCompilationUnit(Schema schema)
                 .GroupBy(s => s.Namespace)
                 .OrderBy(g => g.Key);
 
-            if (candidates.Count() < 1)
+            if (!candidates.Any())
             {
                 throw new UnsupportedSchemaException(schema, $"Code can only be generated for enums and records.");
             }
@@ -307,7 +307,7 @@ protected virtual TypeSyntax GetPropertyType(Schema schema, bool nullable = fals
 
                     try
                     {
-                        return GetPropertyType(others.Single(), nulls.Count() > 0);
+                        return GetPropertyType(others.Single(), nulls.Any());
                     }
                     catch (InvalidOperationException exception)
                     {

src/Chr.Avro.Codegen/Codegen/NamespaceRewriter.cs

@@ -80,7 +80,7 @@ public override SyntaxNode VisitTypeArgumentList(TypeArgumentListSyntax node)
             // VisitQualifiedName doesn’t hit these
             var children = node.ChildNodes().OfType<NameSyntax>();
 
-            if (children.Count() > 0)
+            if (children.Any())
             {
                 result = result.ReplaceNodes(children, (child, rewritten) => Reduce(child));
             }

src/Chr.Avro.Json/Serialization/JsonEnumSerializerBuilderCase.cs

@@ -42,12 +42,8 @@ public virtual JsonSerializerBuilderCaseResult BuildExpression(Expression value,
                     ? fields
                         .Select(field =>
                         {
-                            var match = symbols.Find(symbol => IsMatch(symbol, field));
-
-                            if (match == null)
-                            {
-                                throw new UnsupportedTypeException(type, $"{type} has a field {field.Name} that cannot be serialized.");
-                            }
+                            var match = symbols.Find(symbol => IsMatch(symbol, field))
+                                ?? throw new UnsupportedTypeException(type, $"{type} has a field {field.Name} that cannot be serialized.");
 
                             if (symbols.FindLast(symbol => IsMatch(symbol, field)) != match)
                             {

src/Chr.Avro/Abstract/FixedSchema.cs

@@ -51,7 +51,7 @@ public int Size
             {
                 if (value < 0)
                 {
-                    throw new ArgumentOutOfRangeException("A fixed schema cannot have a negative size.");
+                    throw new ArgumentOutOfRangeException(nameof(value), "A fixed schema cannot have a negative size.");
                 }
 
                 size = value;

src/Chr.Avro/Abstract/ObjectDefaultValue.cs

@@ -17,7 +17,7 @@ public class ObjectDefaultValue<TValue> : DefaultValue
         /// <param name="schema">
         /// A <see cref="Schema" /> that can be used to read the value.
         /// </param>
-        public ObjectDefaultValue(TValue value, Schema schema)
+        public ObjectDefaultValue(TValue? value, Schema schema)
             : base(schema)
         {
             Value = value;
@@ -26,7 +26,7 @@ public ObjectDefaultValue(TValue value, Schema schema)
         /// <summary>
         /// Gets or sets the <see cref="object" /> representation of the value.
         /// </summary>
-        public TValue Value { get; set; }
+        public TValue? Value { get; set; }
 
         /// <inheritdoc />
         /// <exception cref="UnsupportedTypeException">

src/Chr.Avro/Abstract/RecordSchemaBuilderCase.cs

@@ -10,9 +10,9 @@ namespace Chr.Avro.Abstract
     using System.Text.RegularExpressions;
     using Chr.Avro.Infrastructure;
     #if !NET6_0_OR_GREATER
+    using NullabilityInfo = Chr.Avro.Infrastructure.NullabilityInfo;
     using NullabilityInfoContext = Chr.Avro.Infrastructure.NullabilityInfoContext;
     using NullabilityState = Chr.Avro.Infrastructure.NullabilityState;
-    using NullabilityInfo = Chr.Avro.Infrastructure.NullabilityInfo;
     #endif
 
     /// <summary>

src/Chr.Avro/Infrastructure/ConstrainedSet.cs

@@ -17,6 +17,7 @@ namespace Chr.Avro.Infrastructure
     /// The type of the elements in the <see cref="ConstrainedSet{T}" />.
     /// </typeparam>
     internal class ConstrainedSet<T> : ICollection<T>, IReadOnlyCollection<T>
+        where T : notnull
     {
         private readonly IDictionary<T, LinkedListNode<T>> dictionary;
 

src/Chr.Avro/Infrastructure/ConstrainedSetExtensions.cs

@@ -29,6 +29,7 @@ internal static class ConstrainedSetExtensions
         /// A new <see cref="ConstrainedSet{T}" /> instance.
         /// </returns>
         internal static ConstrainedSet<T> ToConstrainedSet<T>(this IEnumerable<T> enumerable, Func<T, ConstrainedSet<T>, bool>? predicate = null)
+            where T : notnull
         {
             if (enumerable == null)
             {

src/Chr.Avro/Serialization/ArrayDeserializerBuilderCase.cs

@@ -175,7 +175,7 @@ protected virtual Expression BuildIntermediateCollection(Type type, Type itemTyp
             var itemType = type.GetEnumerableType() ?? throw new ArgumentException($"{type} is not an enumerable type.");
 
             return type.GetConstructors()
-                .Where(constructor => constructor.GetParameters().Count() == 1)
+                .Where(constructor => constructor.GetParameters().Length == 1)
                 .FirstOrDefault(constructor => constructor.GetParameters().First().ParameterType
                     .IsAssignableFrom(typeof(IEnumerable<>).MakeGenericType(itemType)));
         }

src/Chr.Avro/Serialization/MapDeserializerBuilderCase.cs

@@ -101,7 +101,7 @@ protected virtual Expression BuildIntermediateDictionary(Type type, Type keyType
             var (keyType, valueType) = type.GetDictionaryTypes() ?? throw new ArgumentException($"{type} is not a dictionary type.");
 
             return type.GetConstructors()
-                .Where(constructor => constructor.GetParameters().Count() == 1)
+                .Where(constructor => constructor.GetParameters().Length == 1)
                 .FirstOrDefault(constructor => constructor.GetParameters().First().ParameterType
                     .IsAssignableFrom(typeof(IDictionary<,>).MakeGenericType(keyType, valueType)));
         }

tests/Chr.Avro.Binary.Tests/BinaryReaderTests.cs

@@ -60,7 +60,6 @@ public class BinaryReaderTests
             new object[] { "𝄟", new byte[] { 0x08, 0xF0, 0x9D, 0x84, 0x9F } },
         };
 
-
         [Theory]
         [MemberData(nameof(BooleanEncodings))]
         [InlineData(true, new byte[] { 0x02 })]

tests/Chr.Avro.Binary.Tests/UnionSerializationTests.cs

@@ -200,7 +200,6 @@ public void PartiallySelectedTypes()
                 },
             });
 
-
             var serializerCases = BinarySerializerBuilder.CreateDefaultCaseBuilders().ToList();
             serializerCases.Insert(0, builder => new OrderSerializerBuilderCase(builder));