Merge branch 'master' into merge-master-into-openapi

json-api-dotnet · Oct 16, 2024 · a03b349 · a03b349
2 parents 0a3fa63 + eb2ef95
commit a03b349
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 29 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2024.2.5",
+      "version": "2024.2.6",
       "commands": [
         "jb"
       ],
@@ -17,7 +17,7 @@
       "rollForward": false
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.3.10",
+      "version": "5.3.11",
       "commands": [
         "reportgenerator"
       ],

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/...CoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/...CoreTests/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/...onApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs b/...onApiDotNetCoreTests/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/...onApiDotNetCoreTests/UnitTests/ResourceDefinitions/CreateSortExpressionFromLambdaTests.cs b/...onApiDotNetCoreTests/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]

diff --git a/tests.runsettings b/tests.runsettings
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
   <xUnit>
-    <ParallelAlgorithm>aggressive</ParallelAlgorithm>
     <ShowLiveOutput>true</ShowLiveOutput>
   </xUnit>
   <RunConfiguration>