Merge pull request #1513 from json-api-dotnet/revert-async-await

bkoelman · web-flow · commit f3c8ebd7fd77 · 2024-03-22T04:23:54.000+01:00
Revert "Resharper: Replace async method with Task return"
diff --git a/WarningSeverities.DotSettings b/WarningSeverities.DotSettings
@@ -166,7 +166,6 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveRedundantOrStatement_002ETrue/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E1/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveToList_002E2/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceAsyncWithTaskReturn/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceObjectPatternWithVarPattern/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceSequenceEqualWithConstantPattern/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFirstOrDefault_002E1/@EntryIndexedValue">WARNING</s:String>
diff --git a/src/Examples/DapperExample/Repositories/DapperRepository.cs b/src/Examples/DapperExample/Repositories/DapperRepository.cs
@@ -161,7 +161,7 @@ public async Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer queryLayer
     }
 
     /// <inheritdoc />
-    public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
+    public async Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
     {
         var queryLayer = new QueryLayer(ResourceType)
         {
@@ -173,7 +173,7 @@ public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancella
         CommandDefinition sqlCommand = _dapperFacade.GetSqlCommand(selectNode, cancellationToken);
         LogSqlCommand(sqlCommand);
 
-        return ExecuteQueryAsync(connection => connection.ExecuteScalarAsync<int>(sqlCommand), cancellationToken);
+        return await ExecuteQueryAsync(async connection => await connection.ExecuteScalarAsync<int>(sqlCommand), cancellationToken);
     }
 
     /// <inheritdoc />
diff --git a/src/JsonApiDotNetCore/AtomicOperations/OperationsProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/OperationsProcessor.cs
@@ -99,7 +99,7 @@ public OperationsProcessor(IOperationProcessorAccessor operationProcessorAccesso
         return results;
     }
 
-    protected virtual Task<OperationContainer?> ProcessOperationAsync(OperationContainer operation, CancellationToken cancellationToken)
+    protected virtual async Task<OperationContainer?> ProcessOperationAsync(OperationContainer operation, CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -108,7 +108,7 @@ public OperationsProcessor(IOperationProcessorAccessor operationProcessorAccesso
         _targetedFields.CopyFrom(operation.TargetedFields);
         _request.CopyFrom(operation.Request);
 
-        return _operationProcessorAccessor.ProcessAsync(operation, cancellationToken);
+        return await _operationProcessorAccessor.ProcessAsync(operation, cancellationToken);
     }
 
     protected void TrackLocalIdsForOperation(OperationContainer operation)
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiController.cs
@@ -42,78 +42,78 @@ protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGrap
     /// <inheritdoc />
     [HttpGet]
     [HttpHead]
-    public override Task<IActionResult> GetAsync(CancellationToken cancellationToken)
+    public override async Task<IActionResult> GetAsync(CancellationToken cancellationToken)
     {
-        return base.GetAsync(cancellationToken);
+        return await base.GetAsync(cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpGet("{id}")]
     [HttpHead("{id}")]
-    public override Task<IActionResult> GetAsync([Required] TId id, CancellationToken cancellationToken)
+    public override async Task<IActionResult> GetAsync([Required] TId id, CancellationToken cancellationToken)
     {
-        return base.GetAsync(id, cancellationToken);
+        return await base.GetAsync(id, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpGet("{id}/{relationshipName}")]
     [HttpHead("{id}/{relationshipName}")]
-    public override Task<IActionResult> GetSecondaryAsync([Required] TId id, [Required] string relationshipName, CancellationToken cancellationToken)
+    public override async Task<IActionResult> GetSecondaryAsync([Required] TId id, [Required] string relationshipName, CancellationToken cancellationToken)
     {
-        return base.GetSecondaryAsync(id, relationshipName, cancellationToken);
+        return await base.GetSecondaryAsync(id, relationshipName, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpGet("{id}/relationships/{relationshipName}")]
     [HttpHead("{id}/relationships/{relationshipName}")]
-    public override Task<IActionResult> GetRelationshipAsync([Required] TId id, [Required] string relationshipName, CancellationToken cancellationToken)
+    public override async Task<IActionResult> GetRelationshipAsync([Required] TId id, [Required] string relationshipName, CancellationToken cancellationToken)
     {
-        return base.GetRelationshipAsync(id, relationshipName, cancellationToken);
+        return await base.GetRelationshipAsync(id, relationshipName, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpPost]
-    public override Task<IActionResult> PostAsync([Required] TResource resource, CancellationToken cancellationToken)
+    public override async Task<IActionResult> PostAsync([Required] TResource resource, CancellationToken cancellationToken)
     {
-        return base.PostAsync(resource, cancellationToken);
+        return await base.PostAsync(resource, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpPost("{id}/relationships/{relationshipName}")]
-    public override Task<IActionResult> PostRelationshipAsync([Required] TId id, [Required] string relationshipName,
+    public override async Task<IActionResult> PostRelationshipAsync([Required] TId id, [Required] string relationshipName,
         [Required] ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
     {
-        return base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
+        return await base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpPatch("{id}")]
-    public override Task<IActionResult> PatchAsync([Required] TId id, [Required] TResource resource, CancellationToken cancellationToken)
+    public override async Task<IActionResult> PatchAsync([Required] TId id, [Required] TResource resource, CancellationToken cancellationToken)
     {
-        return base.PatchAsync(id, resource, cancellationToken);
+        return await base.PatchAsync(id, resource, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpPatch("{id}/relationships/{relationshipName}")]
     // Parameter `[Required] object? rightValue` makes Swashbuckle generate the OpenAPI request body as required. We don't actually validate ModelState, so it doesn't hurt.
-    public override Task<IActionResult> PatchRelationshipAsync([Required] TId id, [Required] string relationshipName, [Required] object? rightValue,
+    public override async Task<IActionResult> PatchRelationshipAsync([Required] TId id, [Required] string relationshipName, [Required] object? rightValue,
         CancellationToken cancellationToken)
     {
-        return base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);
+        return await base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpDelete("{id}")]
-    public override Task<IActionResult> DeleteAsync([Required] TId id, CancellationToken cancellationToken)
+    public override async Task<IActionResult> DeleteAsync([Required] TId id, CancellationToken cancellationToken)
     {
-        return base.DeleteAsync(id, cancellationToken);
+        return await base.DeleteAsync(id, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpDelete("{id}/relationships/{relationshipName}")]
-    public override Task<IActionResult> DeleteRelationshipAsync([Required] TId id, [Required] string relationshipName,
+    public override async Task<IActionResult> DeleteRelationshipAsync([Required] TId id, [Required] string relationshipName,
         [Required] ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
     {
-        return base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
+        return await base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs
@@ -18,8 +18,8 @@ public abstract class JsonApiOperationsController(
 {
     /// <inheritdoc />
     [HttpPost]
-    public override Task<IActionResult> PostOperationsAsync([Required] IList<OperationContainer> operations, CancellationToken cancellationToken)
+    public override async Task<IActionResult> PostOperationsAsync([Required] IList<OperationContainer> operations, CancellationToken cancellationToken)
     {
-        return base.PostOperationsAsync(operations, cancellationToken);
+        return await base.PostOperationsAsync(operations, cancellationToken);
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/JsonApiOutputFormatter.cs b/src/JsonApiDotNetCore/Middleware/JsonApiOutputFormatter.cs
@@ -16,11 +16,11 @@ public bool CanWriteResult(OutputFormatterCanWriteContext context)
     }
 
     /// <inheritdoc />
-    public Task WriteAsync(OutputFormatterWriteContext context)
+    public async Task WriteAsync(OutputFormatterWriteContext context)
     {
         ArgumentGuard.NotNull(context);
 
         var writer = context.HttpContext.RequestServices.GetRequiredService<IJsonApiWriter>();
-        return writer.WriteAsync(context.Object, context.HttpContext);
+        await writer.WriteAsync(context.Object, context.HttpContext);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/JsonApiWriter.cs b/src/JsonApiDotNetCore/Serialization/Response/JsonApiWriter.cs
@@ -44,22 +44,22 @@ public JsonApiWriter(IJsonApiRequest request, IJsonApiOptions options, IResponse
     }
 
     /// <inheritdoc />
-    public Task WriteAsync(object? model, HttpContext httpContext)
+    public async Task WriteAsync(object? model, HttpContext httpContext)
     {
         ArgumentGuard.NotNull(httpContext);
 
         if (model == null && !CanWriteBody((HttpStatusCode)httpContext.Response.StatusCode))
         {
             // Prevent exception from Kestrel server, caused by writing data:null json response.
-            return Task.CompletedTask;
+            return;
         }
 
         string? responseBody = GetResponseBody(model, httpContext);
 
         if (httpContext.Request.Method == HttpMethod.Head.Method)
         {
             httpContext.Response.GetTypedHeaders().ContentLength = responseBody == null ? 0 : Encoding.UTF8.GetByteCount(responseBody);
-            return Task.CompletedTask;
+            return;
         }
 
         _traceWriter.LogMessage(() =>
@@ -70,7 +70,7 @@ public Task WriteAsync(object? model, HttpContext httpContext)
             return $"Sending {httpContext.Response.StatusCode} response for {method} request at '{url}' with body: <<{responseBody}>>";
         });
 
-        return SendResponseBodyAsync(httpContext.Response, responseBody);
+        await SendResponseBodyAsync(httpContext.Response, responseBody);
     }
 
     private static bool CanWriteBody(HttpStatusCode statusCode)
diff --git a/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs b/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs
@@ -244,19 +244,19 @@ protected async Task AssertPrimaryResourceDoesNotExistAsync(TResource resource,
         }
     }
 
-    protected virtual Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)
+    protected virtual async Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)
     {
-        return _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
+        await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
     }
 
-    private Task AccurizeResourceTypesInHierarchyToAssignInRelationshipsAsync(TResource primaryResource, CancellationToken cancellationToken)
+    private async Task AccurizeResourceTypesInHierarchyToAssignInRelationshipsAsync(TResource primaryResource, CancellationToken cancellationToken)
     {
-        return ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, true, cancellationToken);
+        await ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, true, cancellationToken);
     }
 
-    protected Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)
+    protected async Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)
     {
-        return ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, false, cancellationToken);
+        await ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, false, cancellationToken);
     }
 
     private async Task ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(TResource primaryResource, bool onlyIfTypeHierarchy,
diff --git a/test/DapperTests/IntegrationTests/AtomicOperations/AtomicOperationsTests.cs b/test/DapperTests/IntegrationTests/AtomicOperations/AtomicOperationsTests.cs
@@ -421,7 +421,10 @@ public async Task Can_rollback_on_error()
 
         const string personLocalId = "new-person";
 
-        await _testContext.RunOnDatabaseAsync(dbContext => _testContext.ClearAllTablesAsync(dbContext));
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await _testContext.ClearAllTablesAsync(dbContext);
+        });
 
         var requestBody = new
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs
@@ -18,11 +18,11 @@ public sealed class CreateMusicTrackOperationsController(
     IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor, IJsonApiRequest request,
     ITargetedFields targetedFields) : JsonApiOperationsController(options, resourceGraph, loggerFactory, processor, request, targetedFields)
 {
-    public override Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)
+    public override async Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)
     {
         AssertOnlyCreatingMusicTracks(operations);
 
-        return base.PostOperationsAsync(operations, cancellationToken);
+        return await base.PostOperationsAsync(operations, cancellationToken);
     }
 
     private static void AssertOnlyCreatingMusicTracks(IEnumerable<OperationContainer> operations)
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs
@@ -42,7 +42,10 @@ public async Task Transforms_on_create_resource_with_side_effects()
 
         List<RecordCompany> newCompanies = _fakers.RecordCompany.Generate(2);
 
-        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<RecordCompany>());
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<RecordCompany>();
+        });
 
         var requestBody = new
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
@@ -27,7 +27,10 @@ public async Task Can_rollback_on_error()
         DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
         string newTitle = _fakers.MusicTrack.Generate().Title;
 
-        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTablesAsync<Performer, MusicTrack>());
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTablesAsync<Performer, MusicTrack>();
+        });
 
         string unknownPerformerId = Unknown.StringId.For<Performer, int>();
 
@@ -110,7 +113,10 @@ public async Task Can_restore_to_previous_savepoint_on_error()
         // Arrange
         string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTablesAsync<Performer, MusicTrack>());
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTablesAsync<Performer, MusicTrack>();
+        });
 
         const string trackLid = "track-1";
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs
@@ -29,7 +29,10 @@ public ResponseMetaTests(IntegrationTestContext<TestableStartup<MetaDbContext>,
     public async Task Returns_top_level_meta()
     {
         // Arrange
-        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<SupportTicket>());
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<SupportTicket>();
+        });
 
         const string route = "/supportTickets";
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -83,7 +83,10 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     public async Task Renders_resource_count_for_empty_collection()
     {
         // Arrange
-        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<SupportTicket>());
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<SupportTicket>();
+        });
 
         const string route = "/supportTickets";
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs
@@ -166,8 +166,8 @@ protected async Task FinishWriteAsync(DomainGroup group, WriteOperationKind writ
 
     protected abstract Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken);
 
-    protected virtual Task<DomainGroup?> GetGroupToDeleteAsync(Guid groupId, CancellationToken cancellationToken)
+    protected virtual async Task<DomainGroup?> GetGroupToDeleteAsync(Guid groupId, CancellationToken cancellationToken)
     {
-        return _groupSet.Include(group => group.Users).FirstOrDefaultAsync(group => group.Id == groupId, cancellationToken);
+        return await _groupSet.Include(group => group.Users).FirstOrDefaultAsync(group => group.Id == groupId, cancellationToken);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs
@@ -113,8 +113,8 @@ protected async Task FinishWriteAsync(DomainUser user, WriteOperationKind writeO
 
     protected abstract Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken);
 
-    protected virtual Task<DomainUser?> GetUserToDeleteAsync(Guid userId, CancellationToken cancellationToken)
+    protected virtual async Task<DomainUser?> GetUserToDeleteAsync(Guid userId, CancellationToken cancellationToken)
     {
-        return _userSet.Include(domainUser => domainUser.Group).FirstOrDefaultAsync(domainUser => domainUser.Id == userId, cancellationToken);
+        return await _userSet.Include(domainUser => domainUser.Group).FirstOrDefaultAsync(domainUser => domainUser.Id == userId, cancellationToken);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs
@@ -19,7 +19,10 @@ public async Task Create_group_writes_to_outbox()
 
         string newGroupName = _fakers.DomainGroup.Generate().Name;
 
-        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<OutgoingMessage>());
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+        });
 
         var requestBody = new
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs
@@ -20,7 +20,10 @@ public async Task Create_user_writes_to_outbox()
         string newLoginName = _fakers.DomainUser.Generate().LoginName;
         string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-        await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<OutgoingMessage>());
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+        });
 
         var requestBody = new
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs
@@ -73,14 +73,16 @@ public override async Task AddToToManyRelationshipAsync(TId leftId, string relat
         await base.AddToToManyRelationshipAsync(leftId, relationshipName, rightResourceIds, cancellationToken);
     }
 
-    public override Task DeleteAsync(TId id, CancellationToken cancellationToken)
+    public override async Task DeleteAsync(TId id, CancellationToken cancellationToken)
     {
         if (IsSoftDeletable(typeof(TResource)))
         {
-            return SoftDeleteAsync(id, cancellationToken);
+            await SoftDeleteAsync(id, cancellationToken);
+        }
+        else
+        {
+            await base.DeleteAsync(id, cancellationToken);
         }
-
-        return base.DeleteAsync(id, cancellationToken);
     }
 
     private async Task SoftDeleteAsync(TId id, CancellationToken cancellationToken)
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs
diff --git a/test/TestBuildingBlocks/DbContextExtensions.cs b/test/TestBuildingBlocks/DbContextExtensions.cs
diff --git a/test/TestBuildingBlocks/IntegrationTest.cs b/test/TestBuildingBlocks/IntegrationTest.cs
diff --git a/test/TestBuildingBlocks/QueryableExtensions.cs b/test/TestBuildingBlocks/QueryableExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public async Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer queryLayer`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`/// <inheritdoc />`
`164`		`- public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)`
	`164`	`+ public async Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)`
`165`	`165`	`{`
`166`	`166`	`var queryLayer = new QueryLayer(ResourceType)`
`167`	`167`	`{`
`@@ -173,7 +173,7 @@ public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancella`
`173`	`173`	`CommandDefinition sqlCommand = _dapperFacade.GetSqlCommand(selectNode, cancellationToken);`
`174`	`174`	`LogSqlCommand(sqlCommand);`
`175`	`175`
`176`		`- return ExecuteQueryAsync(connection => connection.ExecuteScalarAsync<int>(sqlCommand), cancellationToken);`
	`176`	`+ return await ExecuteQueryAsync(async connection => await connection.ExecuteScalarAsync<int>(sqlCommand), cancellationToken);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`/// <inheritdoc />`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public OperationsProcessor(IOperationProcessorAccessor operationProcessorAccesso`
`99`	`99`	`return results;`
`100`	`100`	`}`
`101`	`101`
`102`		`- protected virtual Task<OperationContainer?> ProcessOperationAsync(OperationContainer operation, CancellationToken cancellationToken)`
	`102`	`+ protected virtual async Task<OperationContainer?> ProcessOperationAsync(OperationContainer operation, CancellationToken cancellationToken)`
`103`	`103`	`{`
`104`	`104`	`cancellationToken.ThrowIfCancellationRequested();`
`105`	`105`
`@@ -108,7 +108,7 @@ public OperationsProcessor(IOperationProcessorAccessor operationProcessorAccesso`
`108`	`108`	`_targetedFields.CopyFrom(operation.TargetedFields);`
`109`	`109`	`_request.CopyFrom(operation.Request);`
`110`	`110`
`111`		`- return _operationProcessorAccessor.ProcessAsync(operation, cancellationToken);`
	`111`	`+ return await _operationProcessorAccessor.ProcessAsync(operation, cancellationToken);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`protected void TrackLocalIdsForOperation(OperationContainer operation)`
Original file line number	Diff line number	Diff line change
`@@ -42,78 +42,78 @@ protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGrap`
`42`	`42`	`/// <inheritdoc />`
`43`	`43`	`[HttpGet]`
`44`	`44`	`[HttpHead]`
`45`		`- public override Task<IActionResult> GetAsync(CancellationToken cancellationToken)`
	`45`	`+ public override async Task<IActionResult> GetAsync(CancellationToken cancellationToken)`
`46`	`46`	`{`
`47`		`- return base.GetAsync(cancellationToken);`
	`47`	`+ return await base.GetAsync(cancellationToken);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/// <inheritdoc />`
`51`	`51`	`[HttpGet("{id}")]`
`52`	`52`	`[HttpHead("{id}")]`
`53`		`- public override Task<IActionResult> GetAsync([Required] TId id, CancellationToken cancellationToken)`
	`53`	`+ public override async Task<IActionResult> GetAsync([Required] TId id, CancellationToken cancellationToken)`
`54`	`54`	`{`
`55`		`- return base.GetAsync(id, cancellationToken);`
	`55`	`+ return await base.GetAsync(id, cancellationToken);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/// <inheritdoc />`
`59`	`59`	`[HttpGet("{id}/{relationshipName}")]`
`60`	`60`	`[HttpHead("{id}/{relationshipName}")]`
`61`		`- public override Task<IActionResult> GetSecondaryAsync([Required] TId id, [Required] string relationshipName, CancellationToken cancellationToken)`
	`61`	`+ public override async Task<IActionResult> GetSecondaryAsync([Required] TId id, [Required] string relationshipName, CancellationToken cancellationToken)`
`62`	`62`	`{`
`63`		`- return base.GetSecondaryAsync(id, relationshipName, cancellationToken);`
	`63`	`+ return await base.GetSecondaryAsync(id, relationshipName, cancellationToken);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/// <inheritdoc />`
`67`	`67`	`[HttpGet("{id}/relationships/{relationshipName}")]`
`68`	`68`	`[HttpHead("{id}/relationships/{relationshipName}")]`
`69`		`- public override Task<IActionResult> GetRelationshipAsync([Required] TId id, [Required] string relationshipName, CancellationToken cancellationToken)`
	`69`	`+ public override async Task<IActionResult> GetRelationshipAsync([Required] TId id, [Required] string relationshipName, CancellationToken cancellationToken)`
`70`	`70`	`{`
`71`		`- return base.GetRelationshipAsync(id, relationshipName, cancellationToken);`
	`71`	`+ return await base.GetRelationshipAsync(id, relationshipName, cancellationToken);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/// <inheritdoc />`
`75`	`75`	`[HttpPost]`
`76`		`- public override Task<IActionResult> PostAsync([Required] TResource resource, CancellationToken cancellationToken)`
	`76`	`+ public override async Task<IActionResult> PostAsync([Required] TResource resource, CancellationToken cancellationToken)`
`77`	`77`	`{`
`78`		`- return base.PostAsync(resource, cancellationToken);`
	`78`	`+ return await base.PostAsync(resource, cancellationToken);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/// <inheritdoc />`
`82`	`82`	`[HttpPost("{id}/relationships/{relationshipName}")]`
`83`		`- public override Task<IActionResult> PostRelationshipAsync([Required] TId id, [Required] string relationshipName,`
	`83`	`+ public override async Task<IActionResult> PostRelationshipAsync([Required] TId id, [Required] string relationshipName,`
`84`	`84`	`[Required] ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)`
`85`	`85`	`{`
`86`		`- return base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);`
	`86`	`+ return await base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`/// <inheritdoc />`
`90`	`90`	`[HttpPatch("{id}")]`
`91`		`- public override Task<IActionResult> PatchAsync([Required] TId id, [Required] TResource resource, CancellationToken cancellationToken)`
	`91`	`+ public override async Task<IActionResult> PatchAsync([Required] TId id, [Required] TResource resource, CancellationToken cancellationToken)`
`92`	`92`	`{`
`93`		`- return base.PatchAsync(id, resource, cancellationToken);`
	`93`	`+ return await base.PatchAsync(id, resource, cancellationToken);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`/// <inheritdoc />`
`97`	`97`	`[HttpPatch("{id}/relationships/{relationshipName}")]`
`98`	`98`	// Parameter `[Required] object? rightValue` makes Swashbuckle generate the OpenAPI request body as required. We don't actually validate ModelState, so it doesn't hurt.
`99`		`- public override Task<IActionResult> PatchRelationshipAsync([Required] TId id, [Required] string relationshipName, [Required] object? rightValue,`
	`99`	`+ public override async Task<IActionResult> PatchRelationshipAsync([Required] TId id, [Required] string relationshipName, [Required] object? rightValue,`
`100`	`100`	`CancellationToken cancellationToken)`
`101`	`101`	`{`
`102`		`- return base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);`
	`102`	`+ return await base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/// <inheritdoc />`
`106`	`106`	`[HttpDelete("{id}")]`
`107`		`- public override Task<IActionResult> DeleteAsync([Required] TId id, CancellationToken cancellationToken)`
	`107`	`+ public override async Task<IActionResult> DeleteAsync([Required] TId id, CancellationToken cancellationToken)`
`108`	`108`	`{`
`109`		`- return base.DeleteAsync(id, cancellationToken);`
	`109`	`+ return await base.DeleteAsync(id, cancellationToken);`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/// <inheritdoc />`
`113`	`113`	`[HttpDelete("{id}/relationships/{relationshipName}")]`
`114`		`- public override Task<IActionResult> DeleteRelationshipAsync([Required] TId id, [Required] string relationshipName,`
	`114`	`+ public override async Task<IActionResult> DeleteRelationshipAsync([Required] TId id, [Required] string relationshipName,`
`115`	`115`	`[Required] ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)`
`116`	`116`	`{`
`117`		`- return base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);`
	`117`	`+ return await base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);`
`118`	`118`	`}`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ public abstract class JsonApiOperationsController(`
`18`	`18`	`{`
`19`	`19`	`/// <inheritdoc />`
`20`	`20`	`[HttpPost]`
`21`		`- public override Task<IActionResult> PostOperationsAsync([Required] IList<OperationContainer> operations, CancellationToken cancellationToken)`
	`21`	`+ public override async Task<IActionResult> PostOperationsAsync([Required] IList<OperationContainer> operations, CancellationToken cancellationToken)`
`22`	`22`	`{`
`23`		`- return base.PostOperationsAsync(operations, cancellationToken);`
	`23`	`+ return await base.PostOperationsAsync(operations, cancellationToken);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ public bool CanWriteResult(OutputFormatterCanWriteContext context)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/// <inheritdoc />`
`19`		`- public Task WriteAsync(OutputFormatterWriteContext context)`
	`19`	`+ public async Task WriteAsync(OutputFormatterWriteContext context)`
`20`	`20`	`{`
`21`	`21`	`ArgumentGuard.NotNull(context);`
`22`	`22`
`23`	`23`	`var writer = context.HttpContext.RequestServices.GetRequiredService<IJsonApiWriter>();`
`24`		`- return writer.WriteAsync(context.Object, context.HttpContext);`
	`24`	`+ await writer.WriteAsync(context.Object, context.HttpContext);`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,22 +44,22 @@ public JsonApiWriter(IJsonApiRequest request, IJsonApiOptions options, IResponse`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/// <inheritdoc />`
`47`		`- public Task WriteAsync(object? model, HttpContext httpContext)`
	`47`	`+ public async Task WriteAsync(object? model, HttpContext httpContext)`
`48`	`48`	`{`
`49`	`49`	`ArgumentGuard.NotNull(httpContext);`
`50`	`50`
`51`	`51`	`if (model == null && !CanWriteBody((HttpStatusCode)httpContext.Response.StatusCode))`
`52`	`52`	`{`
`53`	`53`	`// Prevent exception from Kestrel server, caused by writing data:null json response.`
`54`		`- return Task.CompletedTask;`
	`54`	`+ return;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`string? responseBody = GetResponseBody(model, httpContext);`
`58`	`58`
`59`	`59`	`if (httpContext.Request.Method == HttpMethod.Head.Method)`
`60`	`60`	`{`
`61`	`61`	`httpContext.Response.GetTypedHeaders().ContentLength = responseBody == null ? 0 : Encoding.UTF8.GetByteCount(responseBody);`
`62`		`- return Task.CompletedTask;`
	`62`	`+ return;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`_traceWriter.LogMessage(() =>`
`@@ -70,7 +70,7 @@ public Task WriteAsync(object? model, HttpContext httpContext)`
`70`	`70`	`return $"Sending {httpContext.Response.StatusCode} response for {method} request at '{url}' with body: <<{responseBody}>>";`
`71`	`71`	`});`
`72`	`72`
`73`		`- return SendResponseBodyAsync(httpContext.Response, responseBody);`
	`73`	`+ await SendResponseBodyAsync(httpContext.Response, responseBody);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`private static bool CanWriteBody(HttpStatusCode statusCode)`
Original file line number	Diff line number	Diff line change
`@@ -244,19 +244,19 @@ protected async Task AssertPrimaryResourceDoesNotExistAsync(TResource resource,`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`
`247`		`- protected virtual Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)`
	`247`	`+ protected virtual async Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)`
`248`	`248`	`{`
`249`		`- return _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);`
	`249`	`+ await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);`
`250`	`250`	`}`
`251`	`251`
`252`		`- private Task AccurizeResourceTypesInHierarchyToAssignInRelationshipsAsync(TResource primaryResource, CancellationToken cancellationToken)`
	`252`	`+ private async Task AccurizeResourceTypesInHierarchyToAssignInRelationshipsAsync(TResource primaryResource, CancellationToken cancellationToken)`
`253`	`253`	`{`
`254`		`- return ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, true, cancellationToken);`
	`254`	`+ await ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, true, cancellationToken);`
`255`	`255`	`}`
`256`	`256`
`257`		`- protected Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)`
	`257`	`+ protected async Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)`
`258`	`258`	`{`
`259`		`- return ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, false, cancellationToken);`
	`259`	`+ await ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, false, cancellationToken);`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`private async Task ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(TResource primaryResource, bool onlyIfTypeHierarchy,`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,10 @@ public async Task Can_rollback_on_error()`
`421`	`421`
`422`	`422`	`const string personLocalId = "new-person";`
`423`	`423`
`424`		`- await _testContext.RunOnDatabaseAsync(dbContext => _testContext.ClearAllTablesAsync(dbContext));`
	`424`	`+ await _testContext.RunOnDatabaseAsync(async dbContext =>`
	`425`	`+ {`
	`426`	`+ await _testContext.ClearAllTablesAsync(dbContext);`
	`427`	`+ });`
`425`	`428`
`426`	`429`	`var requestBody = new`
`427`	`430`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ public sealed class CreateMusicTrackOperationsController(`
`18`	`18`	`IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor, IJsonApiRequest request,`
`19`	`19`	`ITargetedFields targetedFields) : JsonApiOperationsController(options, resourceGraph, loggerFactory, processor, request, targetedFields)`
`20`	`20`	`{`
`21`		`- public override Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)`
	`21`	`+ public override async Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)`
`22`	`22`	`{`
`23`	`23`	`AssertOnlyCreatingMusicTracks(operations);`
`24`	`24`
`25`		`- return base.PostOperationsAsync(operations, cancellationToken);`
	`25`	`+ return await base.PostOperationsAsync(operations, cancellationToken);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`private static void AssertOnlyCreatingMusicTracks(IEnumerable<OperationContainer> operations)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,10 @@ public async Task Transforms_on_create_resource_with_side_effects()`
`42`	`42`
`43`	`43`	`List<RecordCompany> newCompanies = _fakers.RecordCompany.Generate(2);`
`44`	`44`
`45`		`- await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<RecordCompany>());`
	`45`	`+ await _testContext.RunOnDatabaseAsync(async dbContext =>`
	`46`	`+ {`
	`47`	`+ await dbContext.ClearTableAsync<RecordCompany>();`
	`48`	`+ });`
`46`	`49`
`47`	`50`	`var requestBody = new`
`48`	`51`	`{`