Resharper: Replace async method with Task return

bkoelman · bkoelman · commit 3e1b27b6c472 · 2023-11-22T00:48:52.000+01:00
diff --git a/WarningSeverities.DotSettings b/WarningSeverities.DotSettings
@@ -163,6 +163,7 @@
 	<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 async Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
+    public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
     {
         var queryLayer = new QueryLayer(ResourceType)
         {
@@ -173,7 +173,7 @@ public async Task<int> CountAsync(FilterExpression? filter, CancellationToken ca
         CommandDefinition sqlCommand = _dapperFacade.GetSqlCommand(selectNode, cancellationToken);
         LogSqlCommand(sqlCommand);
 
-        return await ExecuteQueryAsync(async connection => await connection.ExecuteScalarAsync<int>(sqlCommand), cancellationToken);
+        return ExecuteQueryAsync(connection => 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 async Task<OperationContainer?> ProcessOperationAsync(OperationContainer operation, CancellationToken cancellationToken)
+    protected virtual 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 await _operationProcessorAccessor.ProcessAsync(operation, cancellationToken);
+        return _operationProcessorAccessor.ProcessAsync(operation, cancellationToken);
     }
 
     protected void TrackLocalIdsForOperation(OperationContainer operation)
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiController.cs
@@ -41,77 +41,77 @@ protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGrap
     /// <inheritdoc />
     [HttpGet]
     [HttpHead]
-    public override async Task<IActionResult> GetAsync(CancellationToken cancellationToken)
+    public override Task<IActionResult> GetAsync(CancellationToken cancellationToken)
     {
-        return await base.GetAsync(cancellationToken);
+        return base.GetAsync(cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpGet("{id}")]
     [HttpHead("{id}")]
-    public override async Task<IActionResult> GetAsync(TId id, CancellationToken cancellationToken)
+    public override Task<IActionResult> GetAsync(TId id, CancellationToken cancellationToken)
     {
-        return await base.GetAsync(id, cancellationToken);
+        return base.GetAsync(id, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpGet("{id}/{relationshipName}")]
     [HttpHead("{id}/{relationshipName}")]
-    public override async Task<IActionResult> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)
+    public override Task<IActionResult> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)
     {
-        return await base.GetSecondaryAsync(id, relationshipName, cancellationToken);
+        return base.GetSecondaryAsync(id, relationshipName, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpGet("{id}/relationships/{relationshipName}")]
     [HttpHead("{id}/relationships/{relationshipName}")]
-    public override async Task<IActionResult> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)
+    public override Task<IActionResult> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)
     {
-        return await base.GetRelationshipAsync(id, relationshipName, cancellationToken);
+        return base.GetRelationshipAsync(id, relationshipName, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpPost]
-    public override async Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)
+    public override Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)
     {
-        return await base.PostAsync(resource, cancellationToken);
+        return base.PostAsync(resource, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpPost("{id}/relationships/{relationshipName}")]
-    public override async Task<IActionResult> PostRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
+    public override Task<IActionResult> PostRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
         CancellationToken cancellationToken)
     {
-        return await base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
+        return base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpPatch("{id}")]
-    public override async Task<IActionResult> PatchAsync(TId id, [FromBody] TResource resource, CancellationToken cancellationToken)
+    public override Task<IActionResult> PatchAsync(TId id, [FromBody] TResource resource, CancellationToken cancellationToken)
     {
-        return await base.PatchAsync(id, resource, cancellationToken);
+        return base.PatchAsync(id, resource, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpPatch("{id}/relationships/{relationshipName}")]
-    public override async Task<IActionResult> PatchRelationshipAsync(TId id, string relationshipName, [FromBody] object? rightValue,
+    public override Task<IActionResult> PatchRelationshipAsync(TId id, string relationshipName, [FromBody] object? rightValue,
         CancellationToken cancellationToken)
     {
-        return await base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);
+        return base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpDelete("{id}")]
-    public override async Task<IActionResult> DeleteAsync(TId id, CancellationToken cancellationToken)
+    public override Task<IActionResult> DeleteAsync(TId id, CancellationToken cancellationToken)
     {
-        return await base.DeleteAsync(id, cancellationToken);
+        return base.DeleteAsync(id, cancellationToken);
     }
 
     /// <inheritdoc />
     [HttpDelete("{id}/relationships/{relationshipName}")]
-    public override async Task<IActionResult> DeleteRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
+    public override Task<IActionResult> DeleteRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
         CancellationToken cancellationToken)
     {
-        return await base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
+        return base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs
@@ -21,8 +21,8 @@ protected JsonApiOperationsController(IJsonApiOptions options, IResourceGraph re
 
     /// <inheritdoc />
     [HttpPost]
-    public override async Task<IActionResult> PostOperationsAsync([FromBody] IList<OperationContainer> operations, CancellationToken cancellationToken)
+    public override Task<IActionResult> PostOperationsAsync([FromBody] IList<OperationContainer> operations, CancellationToken cancellationToken)
     {
-        return await base.PostOperationsAsync(operations, cancellationToken);
+        return 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 async Task WriteAsync(OutputFormatterWriteContext context)
+    public Task WriteAsync(OutputFormatterWriteContext context)
     {
         ArgumentGuard.NotNull(context);
 
         var writer = context.HttpContext.RequestServices.GetRequiredService<IJsonApiWriter>();
-        await writer.WriteAsync(context.Object, context.HttpContext);
+        return 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 async Task WriteAsync(object? model, HttpContext httpContext)
+    public 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;
+            return Task.CompletedTask;
         }
 
         string? responseBody = GetResponseBody(model, httpContext);
 
         if (httpContext.Request.Method == HttpMethod.Head.Method)
         {
             httpContext.Response.GetTypedHeaders().ContentLength = responseBody == null ? 0 : Encoding.UTF8.GetByteCount(responseBody);
-            return;
+            return Task.CompletedTask;
         }
 
         _traceWriter.LogMessage(() =>
@@ -70,7 +70,7 @@ public async Task WriteAsync(object? model, HttpContext httpContext)
             return $"Sending {httpContext.Response.StatusCode} response for {method} request at '{url}' with body: <<{responseBody}>>";
         });
 
-        await SendResponseBodyAsync(httpContext.Response, responseBody);
+        return 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 async Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)
+    protected virtual Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)
     {
-        await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
+        return _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
     }
 
-    private async Task AccurizeResourceTypesInHierarchyToAssignInRelationshipsAsync(TResource primaryResource, CancellationToken cancellationToken)
+    private Task AccurizeResourceTypesInHierarchyToAssignInRelationshipsAsync(TResource primaryResource, CancellationToken cancellationToken)
     {
-        await ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, true, cancellationToken);
+        return ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, true, cancellationToken);
     }
 
-    protected async Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)
+    protected Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)
     {
-        await ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, false, cancellationToken);
+        return 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
@@ -396,9 +396,9 @@ public async Task Can_rollback_on_error()
 
         const string personLocalId = "new-person";
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await _testContext.ClearAllTablesAsync(dbContext);
+            return _testContext.ClearAllTablesAsync(dbContext);
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs
@@ -22,11 +22,11 @@ public CreateMusicTrackOperationsController(IJsonApiOptions options, IResourceGr
     {
     }
 
-    public override async Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)
+    public override Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)
     {
         AssertOnlyCreatingMusicTracks(operations);
 
-        return await base.PostOperationsAsync(operations, cancellationToken);
+        return 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,9 +42,9 @@ public async Task Transforms_on_create_resource_with_side_effects()
 
         List<RecordCompany> newCompanies = _fakers.RecordCompany.Generate(2);
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTableAsync<RecordCompany>();
+            return 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,9 +27,9 @@ public async Task Can_rollback_on_error()
         DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
         string newTitle = _fakers.MusicTrack.Generate().Title;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTablesAsync<Performer, MusicTrack>();
+            return dbContext.ClearTablesAsync<Performer, MusicTrack>();
         });
 
         string unknownPerformerId = Unknown.StringId.For<Performer, int>();
@@ -113,9 +113,9 @@ public async Task Can_restore_to_previous_savepoint_on_error()
         // Arrange
         string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTablesAsync<Performer, MusicTrack>();
+            return 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
@@ -32,9 +32,9 @@ public ResponseMetaTests(IntegrationTestContext<TestableStartup<MetaDbContext>,
     public async Task Returns_top_level_meta()
     {
         // Arrange
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTableAsync<SupportTicket>();
+            return dbContext.ClearTableAsync<SupportTicket>();
         });
 
         const string route = "/supportTickets";
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -86,9 +86,9 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     public async Task Renders_resource_count_for_empty_collection()
     {
         // Arrange
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTableAsync<SupportTicket>();
+            return dbContext.ClearTableAsync<SupportTicket>();
         });
 
         const string route = "/supportTickets";
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs
@@ -172,8 +172,8 @@ protected async Task FinishWriteAsync(DomainGroup group, WriteOperationKind writ
 
     protected abstract Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken);
 
-    protected virtual async Task<DomainGroup?> GetGroupToDeleteAsync(Guid groupId, CancellationToken cancellationToken)
+    protected virtual Task<DomainGroup?> GetGroupToDeleteAsync(Guid groupId, CancellationToken cancellationToken)
     {
-        return await _groupSet.Include(group => group.Users).FirstOrDefaultAsync(group => group.Id == groupId, cancellationToken);
+        return _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
@@ -118,8 +118,8 @@ protected async Task FinishWriteAsync(DomainUser user, WriteOperationKind writeO
 
     protected abstract Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken);
 
-    protected virtual async Task<DomainUser?> GetUserToDeleteAsync(Guid userId, CancellationToken cancellationToken)
+    protected virtual Task<DomainUser?> GetUserToDeleteAsync(Guid userId, CancellationToken cancellationToken)
     {
-        return await _userSet.Include(domainUser => domainUser.Group).FirstOrDefaultAsync(domainUser => domainUser.Id == userId, cancellationToken);
+        return _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,9 +19,9 @@ public async Task Create_group_writes_to_outbox()
 
         string newGroupName = _fakers.DomainGroup.Generate().Name;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTableAsync<OutgoingMessage>();
+            return 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,9 +20,9 @@ public async Task Create_user_writes_to_outbox()
         string newLoginName = _fakers.DomainUser.Generate().LoginName;
         string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTableAsync<OutgoingMessage>();
+            return dbContext.ClearTableAsync<OutgoingMessage>();
         });
 
         var requestBody = new
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs
@@ -79,16 +79,14 @@ public override async Task AddToToManyRelationshipAsync(TId leftId, string relat
         await base.AddToToManyRelationshipAsync(leftId, relationshipName, rightResourceIds, cancellationToken);
     }
 
-    public override async Task DeleteAsync(TId id, CancellationToken cancellationToken)
+    public override Task DeleteAsync(TId id, CancellationToken cancellationToken)
     {
         if (IsSoftDeletable(typeof(TResource)))
         {
-            await SoftDeleteAsync(id, cancellationToken);
-        }
-        else
-        {
-            await base.DeleteAsync(id, cancellationToken);
+            return SoftDeleteAsync(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
@@ -97,9 +97,9 @@ public async Task Can_create_resource_with_empty_ID()
         // Arrange
         string newName = _fakers.Map.Generate().Name;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTableAsync<Map>();
+            return dbContext.ClearTableAsync<Map>();
         });
 
         var requestBody = new
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 async Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)`
	`164`	`+ public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)`
`165`	`165`	`{`
`166`	`166`	`var queryLayer = new QueryLayer(ResourceType)`
`167`	`167`	`{`
`@@ -173,7 +173,7 @@ public async Task<int> CountAsync(FilterExpression? filter, CancellationToken ca`
`173`	`173`	`CommandDefinition sqlCommand = _dapperFacade.GetSqlCommand(selectNode, cancellationToken);`
`174`	`174`	`LogSqlCommand(sqlCommand);`
`175`	`175`
`176`		`- return await ExecuteQueryAsync(async connection => await connection.ExecuteScalarAsync<int>(sqlCommand), cancellationToken);`
	`176`	`+ return ExecuteQueryAsync(connection => 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 async Task<OperationContainer?> ProcessOperationAsync(OperationContainer operation, CancellationToken cancellationToken)`
	`102`	`+ protected virtual 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 await _operationProcessorAccessor.ProcessAsync(operation, cancellationToken);`
	`111`	`+ return _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
`@@ -41,77 +41,77 @@ protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGrap`
`41`	`41`	`/// <inheritdoc />`
`42`	`42`	`[HttpGet]`
`43`	`43`	`[HttpHead]`
`44`		`- public override async Task<IActionResult> GetAsync(CancellationToken cancellationToken)`
	`44`	`+ public override Task<IActionResult> GetAsync(CancellationToken cancellationToken)`
`45`	`45`	`{`
`46`		`- return await base.GetAsync(cancellationToken);`
	`46`	`+ return base.GetAsync(cancellationToken);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/// <inheritdoc />`
`50`	`50`	`[HttpGet("{id}")]`
`51`	`51`	`[HttpHead("{id}")]`
`52`		`- public override async Task<IActionResult> GetAsync(TId id, CancellationToken cancellationToken)`
	`52`	`+ public override Task<IActionResult> GetAsync(TId id, CancellationToken cancellationToken)`
`53`	`53`	`{`
`54`		`- return await base.GetAsync(id, cancellationToken);`
	`54`	`+ return base.GetAsync(id, cancellationToken);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/// <inheritdoc />`
`58`	`58`	`[HttpGet("{id}/{relationshipName}")]`
`59`	`59`	`[HttpHead("{id}/{relationshipName}")]`
`60`		`- public override async Task<IActionResult> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)`
	`60`	`+ public override Task<IActionResult> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)`
`61`	`61`	`{`
`62`		`- return await base.GetSecondaryAsync(id, relationshipName, cancellationToken);`
	`62`	`+ return base.GetSecondaryAsync(id, relationshipName, cancellationToken);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/// <inheritdoc />`
`66`	`66`	`[HttpGet("{id}/relationships/{relationshipName}")]`
`67`	`67`	`[HttpHead("{id}/relationships/{relationshipName}")]`
`68`		`- public override async Task<IActionResult> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)`
	`68`	`+ public override Task<IActionResult> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)`
`69`	`69`	`{`
`70`		`- return await base.GetRelationshipAsync(id, relationshipName, cancellationToken);`
	`70`	`+ return base.GetRelationshipAsync(id, relationshipName, cancellationToken);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/// <inheritdoc />`
`74`	`74`	`[HttpPost]`
`75`		`- public override async Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)`
	`75`	`+ public override Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)`
`76`	`76`	`{`
`77`		`- return await base.PostAsync(resource, cancellationToken);`
	`77`	`+ return base.PostAsync(resource, cancellationToken);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/// <inheritdoc />`
`81`	`81`	`[HttpPost("{id}/relationships/{relationshipName}")]`
`82`		`- public override async Task<IActionResult> PostRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,`
	`82`	`+ public override Task<IActionResult> PostRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,`
`83`	`83`	`CancellationToken cancellationToken)`
`84`	`84`	`{`
`85`		`- return await base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);`
	`85`	`+ return base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/// <inheritdoc />`
`89`	`89`	`[HttpPatch("{id}")]`
`90`		`- public override async Task<IActionResult> PatchAsync(TId id, [FromBody] TResource resource, CancellationToken cancellationToken)`
	`90`	`+ public override Task<IActionResult> PatchAsync(TId id, [FromBody] TResource resource, CancellationToken cancellationToken)`
`91`	`91`	`{`
`92`		`- return await base.PatchAsync(id, resource, cancellationToken);`
	`92`	`+ return base.PatchAsync(id, resource, cancellationToken);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/// <inheritdoc />`
`96`	`96`	`[HttpPatch("{id}/relationships/{relationshipName}")]`
`97`		`- public override async Task<IActionResult> PatchRelationshipAsync(TId id, string relationshipName, [FromBody] object? rightValue,`
	`97`	`+ public override Task<IActionResult> PatchRelationshipAsync(TId id, string relationshipName, [FromBody] object? rightValue,`
`98`	`98`	`CancellationToken cancellationToken)`
`99`	`99`	`{`
`100`		`- return await base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);`
	`100`	`+ return base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/// <inheritdoc />`
`104`	`104`	`[HttpDelete("{id}")]`
`105`		`- public override async Task<IActionResult> DeleteAsync(TId id, CancellationToken cancellationToken)`
	`105`	`+ public override Task<IActionResult> DeleteAsync(TId id, CancellationToken cancellationToken)`
`106`	`106`	`{`
`107`		`- return await base.DeleteAsync(id, cancellationToken);`
	`107`	`+ return base.DeleteAsync(id, cancellationToken);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/// <inheritdoc />`
`111`	`111`	`[HttpDelete("{id}/relationships/{relationshipName}")]`
`112`		`- public override async Task<IActionResult> DeleteRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,`
	`112`	`+ public override Task<IActionResult> DeleteRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,`
`113`	`113`	`CancellationToken cancellationToken)`
`114`	`114`	`{`
`115`		`- return await base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);`
	`115`	`+ return base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);`
`116`	`116`	`}`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ protected JsonApiOperationsController(IJsonApiOptions options, IResourceGraph re`
`21`	`21`
`22`	`22`	`/// <inheritdoc />`
`23`	`23`	`[HttpPost]`
`24`		`- public override async Task<IActionResult> PostOperationsAsync([FromBody] IList<OperationContainer> operations, CancellationToken cancellationToken)`
	`24`	`+ public override Task<IActionResult> PostOperationsAsync([FromBody] IList<OperationContainer> operations, CancellationToken cancellationToken)`
`25`	`25`	`{`
`26`		`- return await base.PostOperationsAsync(operations, cancellationToken);`
	`26`	`+ return base.PostOperationsAsync(operations, cancellationToken);`
`27`	`27`	`}`
`28`	`28`	`}`
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 async Task WriteAsync(OutputFormatterWriteContext context)`
	`19`	`+ public Task WriteAsync(OutputFormatterWriteContext context)`
`20`	`20`	`{`
`21`	`21`	`ArgumentGuard.NotNull(context);`
`22`	`22`
`23`	`23`	`var writer = context.HttpContext.RequestServices.GetRequiredService<IJsonApiWriter>();`
`24`		`- await writer.WriteAsync(context.Object, context.HttpContext);`
	`24`	`+ return 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 async Task WriteAsync(object? model, HttpContext httpContext)`
	`47`	`+ public 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;`
	`54`	`+ return Task.CompletedTask;`
`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;`
	`62`	`+ return Task.CompletedTask;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`_traceWriter.LogMessage(() =>`
`@@ -70,7 +70,7 @@ public async 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`		`- await SendResponseBodyAsync(httpContext.Response, responseBody);`
	`73`	`+ return 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 async Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)`
	`247`	`+ protected virtual Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)`
`248`	`248`	`{`
`249`		`- await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);`
	`249`	`+ return _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);`
`250`	`250`	`}`
`251`	`251`
`252`		`- private async Task AccurizeResourceTypesInHierarchyToAssignInRelationshipsAsync(TResource primaryResource, CancellationToken cancellationToken)`
	`252`	`+ private Task AccurizeResourceTypesInHierarchyToAssignInRelationshipsAsync(TResource primaryResource, CancellationToken cancellationToken)`
`253`	`253`	`{`
`254`		`- await ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, true, cancellationToken);`
	`254`	`+ return ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, true, cancellationToken);`
`255`	`255`	`}`
`256`	`256`
`257`		`- protected async Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)`
	`257`	`+ protected Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)`
`258`	`258`	`{`
`259`		`- await ValidateResourcesToAssignInRelationshipsExistWithRefreshAsync(primaryResource, false, cancellationToken);`
	`259`	`+ return 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
`@@ -396,9 +396,9 @@ public async Task Can_rollback_on_error()`
`396`	`396`
`397`	`397`	`const string personLocalId = "new-person";`
`398`	`398`
`399`		`- await _testContext.RunOnDatabaseAsync(async dbContext =>`
	`399`	`+ await _testContext.RunOnDatabaseAsync(dbContext =>`
`400`	`400`	`{`
`401`		`- await _testContext.ClearAllTablesAsync(dbContext);`
	`401`	`+ return _testContext.ClearAllTablesAsync(dbContext);`
`402`	`402`	`});`
`403`	`403`
`404`	`404`	`var requestBody = new`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ public CreateMusicTrackOperationsController(IJsonApiOptions options, IResourceGr`
`22`	`22`	`{`
`23`	`23`	`}`
`24`	`24`
`25`		`- public override async Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)`
	`25`	`+ public override Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)`
`26`	`26`	`{`
`27`	`27`	`AssertOnlyCreatingMusicTracks(operations);`
`28`	`28`
`29`		`- return await base.PostOperationsAsync(operations, cancellationToken);`
	`29`	`+ return base.PostOperationsAsync(operations, cancellationToken);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`private static void AssertOnlyCreatingMusicTracks(IEnumerable<OperationContainer> operations)`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ 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(async dbContext =>`
	`45`	`+ await _testContext.RunOnDatabaseAsync(dbContext =>`
`46`	`46`	`{`
`47`		`- await dbContext.ClearTableAsync<RecordCompany>();`
	`47`	`+ return dbContext.ClearTableAsync<RecordCompany>();`
`48`	`48`	`});`
`49`	`49`
`50`	`50`	`var requestBody = new`