Backport fixes for new analyzers in .NET 9 (#1618)

bkoelman · web-flow · commit d568a714154b · 2024-10-10T11:59:06.000+02:00
diff --git a/benchmarks/QueryString/QueryStringParserBenchmarks.cs b/benchmarks/QueryString/QueryStringParserBenchmarks.cs
@@ -31,7 +31,7 @@ public QueryStringParserBenchmarks()
 
         var request = new JsonApiRequest
         {
-            PrimaryResourceType = resourceGraph.GetResourceType(typeof(QueryableResource)),
+            PrimaryResourceType = resourceGraph.GetResourceType<QueryableResource>(),
             IsCollection = true
         };
 
diff --git a/src/Examples/DapperExample/Repositories/DapperRepository.cs b/src/Examples/DapperExample/Repositories/DapperRepository.cs
@@ -365,7 +365,7 @@ public async Task DeleteAsync(TResource? resourceFromDatabase, [DisallowNull] TI
         await _resourceDefinitionAccessor.OnWritingAsync(placeholderResource, WriteOperationKind.DeleteResource, cancellationToken);
 
         var deleteBuilder = new DeleteResourceStatementBuilder(_dataModelService);
-        DeleteNode deleteNode = deleteBuilder.Build(ResourceType, placeholderResource.Id!);
+        DeleteNode deleteNode = deleteBuilder.Build(ResourceType, placeholderResource.Id);
         CommandDefinition sqlCommand = _dapperFacade.GetSqlCommand(deleteNode, cancellationToken);
 
         await ExecuteInTransactionAsync(async transaction =>
diff --git a/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs b/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs
@@ -120,7 +120,7 @@ public override void Write(Utf8JsonWriter writer, TWrapper value, JsonSerializer
 
 internal sealed partial class TraceLogWriter<T>(ILoggerFactory loggerFactory) : TraceLogWriter
 {
-    private readonly ILogger _logger = loggerFactory.CreateLogger(typeof(T));
+    private readonly ILogger _logger = loggerFactory.CreateLogger<T>();
 
     public void LogMethodStart(object? parameters = null, [CallerMemberName] string memberName = "")
     {
diff --git a/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs b/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs
@@ -390,7 +390,7 @@ public QueryLayer ComposeForUpdate<TId>([DisallowNull] TId id, ResourceType prim
     {
         ArgumentGuard.NotNull(primaryResourceType);
 
-        IImmutableSet<IncludeElementExpression> includeElements = _targetedFields.Relationships
+        ImmutableHashSet<IncludeElementExpression> includeElements = _targetedFields.Relationships
             .Select(relationship => new IncludeElementExpression(relationship)).ToImmutableHashSet();
 
         AttrAttribute primaryIdAttribute = GetIdAttribute(primaryResourceType);
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs
@@ -114,7 +114,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(WorkItem).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(int));
+        property.PropertyType.Should().Be<int>();
     }
 
     [Fact]
@@ -162,7 +162,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(UserAccount).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(long));
+        property.PropertyType.Should().Be<long>();
     }
 
     [Fact]
@@ -207,7 +207,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(Guid));
+        property.PropertyType.Should().Be<Guid>();
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
@@ -80,7 +80,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(Guid));
+        property.PropertyType.Should().Be<Guid>();
     }
 
     [Theory]
@@ -134,7 +134,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(Guid));
+        property.PropertyType.Should().Be<Guid>();
     }
 
     [Theory]
@@ -185,7 +185,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(string));
+        property.PropertyType.Should().Be<string>();
     }
 
     [Theory]
@@ -236,7 +236,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(string));
+        property.PropertyType.Should().Be<string>();
     }
 
     [Theory]
@@ -292,7 +292,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(string));
+        property.PropertyType.Should().Be<string>();
     }
 
     [Theory]
@@ -475,7 +475,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(string));
+        property.PropertyType.Should().Be<string>();
     }
 
     [Theory]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
@@ -327,7 +327,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(Guid));
+        property.PropertyType.Should().Be<Guid>();
     }
 
     [Fact]
@@ -375,7 +375,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
         PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
         property.ShouldNotBeNull();
-        property.PropertyType.Should().Be(typeof(string));
+        property.PropertyType.Should().Be<string>();
     }
 
     [Fact]
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceTypeCaptureStore.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceTypeCaptureStore.cs
@@ -23,13 +23,13 @@ internal void Reset()
 
     internal void AssertLeftType<TLeft>()
     {
-        LeftDeclaredType.Should().Be(typeof(TLeft));
+        LeftDeclaredType.Should().Be<TLeft>();
         LeftReflectedTypeName.Should().Be(typeof(TLeft).Name);
 
         Request.ShouldNotBeNull();
         Request.PrimaryResourceType.ShouldNotBeNull();
-        Request.PrimaryResourceType.ClrType.Should().Be(typeof(TLeft));
-        Request.Relationship?.LeftType.ClrType.Should().Be(typeof(TLeft));
+        Request.PrimaryResourceType.ClrType.Should().Be<TLeft>();
+        Request.Relationship?.LeftType.ClrType.Should().Be<TLeft>();
     }
 
     internal void AssertRightTypes(params Type[] types)
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/ResourceDefinitions/CreateSortExpressionFromLambdaTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/ResourceDefinitions/CreateSortExpressionFromLambdaTests.cs
@@ -365,17 +365,17 @@ private abstract class FileSystemEntry : Identifiable<long>
         public FileSystemEntry Parent { get; set; } = null!;
 
         [HasMany]
-        public IList<FileSystemEntry> Children { get; set; } = new List<FileSystemEntry>();
+        public List<FileSystemEntry> Children { get; set; } = [];
     }
 
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
     private sealed class DirectoryEntry : FileSystemEntry
     {
         [HasMany]
-        public IList<DirectoryEntry> Subdirectories { get; set; } = new List<DirectoryEntry>();
+        public List<DirectoryEntry> Subdirectories { get; set; } = [];
 
         [HasMany]
-        public IList<FileEntry> Files { get; set; } = new List<FileEntry>();
+        public List<FileEntry> Files { get; set; } = [];
     }
 
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/ResourceGraph/ResourceGraphBuilderTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/ResourceGraph/ResourceGraphBuilderTests.cs
@@ -343,7 +343,7 @@ public void Resolves_correct_type_for_lazy_loading_proxy()
         ResourceType resourceType = resourceGraph.GetResourceType(proxy.GetType());
 
         // Assert
-        resourceType.ClrType.Should().Be(typeof(ResourceOfInt32));
+        resourceType.ClrType.Should().Be<ResourceOfInt32>();
     }
 
     [Fact]
diff --git a/test/UnitTests/Graph/Implementation.cs b/test/UnitTests/Graph/Implementation.cs
@@ -1,3 +1,6 @@
+using JetBrains.Annotations;
+
 namespace UnitTests.Graph;
 
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 internal sealed class Implementation : IGenericInterface<int>;
diff --git a/test/UnitTests/Graph/TypeLocatorTests.cs b/test/UnitTests/Graph/TypeLocatorTests.cs
@@ -23,8 +23,8 @@ public void GetContainerRegistrationFromAssembly_Gets_Implementation()
 
         // Assert
         result.ShouldNotBeNull();
-        result.Value.implementationType.Should().Be(typeof(Implementation));
-        result.Value.serviceInterface.Should().Be(typeof(IGenericInterface<int>));
+        result.Value.implementationType.Should().Be<Implementation>();
+        result.Value.serviceInterface.Should().Be<IGenericInterface<int>>();
     }
 
     [Fact]
@@ -39,7 +39,7 @@ public void GetIdType_Correctly_Identifies_JsonApiResource()
         Type? idType = typeLocator.LookupIdType(type);
 
         // Assert
-        idType.Should().Be(typeof(int));
+        idType.Should().Be<int>();
     }
 
     [Fact]
@@ -71,7 +71,7 @@ public void ResolveResourceDescriptor_Returns_Type_If_Type_Is_IIdentifiable()
         // Assert
         descriptor.ShouldNotBeNull();
         descriptor.ResourceClrType.Should().Be(resourceClrType);
-        descriptor.IdClrType.Should().Be(typeof(int));
+        descriptor.IdClrType.Should().Be<int>();
     }
 
     [Fact]

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public QueryStringParserBenchmarks()`
`31`	`31`
`32`	`32`	`var request = new JsonApiRequest`
`33`	`33`	`{`
`34`		`- PrimaryResourceType = resourceGraph.GetResourceType(typeof(QueryableResource)),`
	`34`	`+ PrimaryResourceType = resourceGraph.GetResourceType<QueryableResource>(),`
`35`	`35`	`IsCollection = true`
`36`	`36`	`};`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public override void Write(Utf8JsonWriter writer, TWrapper value, JsonSerializer`
`120`	`120`
`121`	`121`	`internal sealed partial class TraceLogWriter<T>(ILoggerFactory loggerFactory) : TraceLogWriter`
`122`	`122`	`{`
`123`		`- private readonly ILogger _logger = loggerFactory.CreateLogger(typeof(T));`
	`123`	`+ private readonly ILogger _logger = loggerFactory.CreateLogger<T>();`
`124`	`124`
`125`	`125`	`public void LogMethodStart(object? parameters = null, [CallerMemberName] string memberName = "")`
`126`	`126`	`{`
Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ public QueryLayer ComposeForUpdate<TId>([DisallowNull] TId id, ResourceType prim`
`390`	`390`	`{`
`391`	`391`	`ArgumentGuard.NotNull(primaryResourceType);`
`392`	`392`
`393`		`- IImmutableSet<IncludeElementExpression> includeElements = _targetedFields.Relationships`
	`393`	`+ ImmutableHashSet<IncludeElementExpression> includeElements = _targetedFields.Relationships`
`394`	`394`	`.Select(relationship => new IncludeElementExpression(relationship)).ToImmutableHashSet();`
`395`	`395`
`396`	`396`	`AttrAttribute primaryIdAttribute = GetIdAttribute(primaryResourceType);`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`114`	`114`
`115`	`115`	`PropertyInfo? property = typeof(WorkItem).GetProperty(nameof(Identifiable<object>.Id));`
`116`	`116`	`property.ShouldNotBeNull();`
`117`		`- property.PropertyType.Should().Be(typeof(int));`
	`117`	`+ property.PropertyType.Should().Be<int>();`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`[Fact]`
`@@ -162,7 +162,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`162`	`162`
`163`	`163`	`PropertyInfo? property = typeof(UserAccount).GetProperty(nameof(Identifiable<object>.Id));`
`164`	`164`	`property.ShouldNotBeNull();`
`165`		`- property.PropertyType.Should().Be(typeof(long));`
	`165`	`+ property.PropertyType.Should().Be<long>();`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`[Fact]`
`@@ -207,7 +207,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`207`	`207`
`208`	`208`	`PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));`
`209`	`209`	`property.ShouldNotBeNull();`
`210`		`- property.PropertyType.Should().Be(typeof(Guid));`
	`210`	`+ property.PropertyType.Should().Be<Guid>();`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`327`	`327`
`328`	`328`	`PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));`
`329`	`329`	`property.ShouldNotBeNull();`
`330`		`- property.PropertyType.Should().Be(typeof(Guid));`
	`330`	`+ property.PropertyType.Should().Be<Guid>();`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`[Fact]`
`@@ -375,7 +375,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`375`	`375`
`376`	`376`	`PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));`
`377`	`377`	`property.ShouldNotBeNull();`
`378`		`- property.PropertyType.Should().Be(typeof(string));`
	`378`	`+ property.PropertyType.Should().Be<string>();`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ internal void Reset()`
`23`	`23`
`24`	`24`	`internal void AssertLeftType<TLeft>()`
`25`	`25`	`{`
`26`		`- LeftDeclaredType.Should().Be(typeof(TLeft));`
	`26`	`+ LeftDeclaredType.Should().Be<TLeft>();`
`27`	`27`	`LeftReflectedTypeName.Should().Be(typeof(TLeft).Name);`
`28`	`28`
`29`	`29`	`Request.ShouldNotBeNull();`
`30`	`30`	`Request.PrimaryResourceType.ShouldNotBeNull();`
`31`		`- Request.PrimaryResourceType.ClrType.Should().Be(typeof(TLeft));`
`32`		`- Request.Relationship?.LeftType.ClrType.Should().Be(typeof(TLeft));`
	`31`	`+ Request.PrimaryResourceType.ClrType.Should().Be<TLeft>();`
	`32`	`+ Request.Relationship?.LeftType.ClrType.Should().Be<TLeft>();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`internal void AssertRightTypes(params Type[] types)`
Original file line number	Diff line number	Diff line change
`@@ -365,17 +365,17 @@ private abstract class FileSystemEntry : Identifiable<long>`
`365`	`365`	`public FileSystemEntry Parent { get; set; } = null!;`
`366`	`366`
`367`	`367`	`[HasMany]`
`368`		`- public IList<FileSystemEntry> Children { get; set; } = new List<FileSystemEntry>();`
	`368`	`+ public List<FileSystemEntry> Children { get; set; } = [];`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`[UsedImplicitly(ImplicitUseTargetFlags.Members)]`
`372`	`372`	`private sealed class DirectoryEntry : FileSystemEntry`
`373`	`373`	`{`
`374`	`374`	`[HasMany]`
`375`		`- public IList<DirectoryEntry> Subdirectories { get; set; } = new List<DirectoryEntry>();`
	`375`	`+ public List<DirectoryEntry> Subdirectories { get; set; } = [];`
`376`	`376`
`377`	`377`	`[HasMany]`
`378`		`- public IList<FileEntry> Files { get; set; } = new List<FileEntry>();`
	`378`	`+ public List<FileEntry> Files { get; set; } = [];`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`[UsedImplicitly(ImplicitUseTargetFlags.Members)]`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ public void Resolves_correct_type_for_lazy_loading_proxy()`
`343`	`343`	`ResourceType resourceType = resourceGraph.GetResourceType(proxy.GetType());`
`344`	`344`
`345`	`345`	`// Assert`
`346`		`- resourceType.ClrType.Should().Be(typeof(ResourceOfInt32));`
	`346`	`+ resourceType.ClrType.Should().Be<ResourceOfInt32>();`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`[Fact]`