Resharper: Replace async method with Task return

Author: bkoelman

src/JsonApiDotNetCore.MongoDb/AtomicOperations/MongoTransaction.cs

@@ -35,20 +35,24 @@ public Task AfterProcessOperationAsync(CancellationToken cancellationToken)
     }
 
     /// <inheritdoc />
-    public async Task CommitAsync(CancellationToken cancellationToken)
+    public Task CommitAsync(CancellationToken cancellationToken)
     {
         if (_ownsTransaction && _mongoDataAccess.ActiveSession != null)
         {
-            await _mongoDataAccess.ActiveSession.CommitTransactionAsync(cancellationToken);
+            return _mongoDataAccess.ActiveSession.CommitTransactionAsync(cancellationToken);
         }
+
+        return Task.CompletedTask;
     }
 
     /// <inheritdoc />
-    public async ValueTask DisposeAsync()
+    public ValueTask DisposeAsync()
     {
         if (_ownsTransaction)
         {
-            await _mongoDataAccess.DisposeAsync();
+            return _mongoDataAccess.DisposeAsync();
         }
+
+        return ValueTask.CompletedTask;
     }
 }

src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs

@@ -173,11 +173,11 @@ public virtual async Task CreateAsync(TResource resourceFromRequest, TResource r
 
         await _resourceDefinitionAccessor.OnWritingAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
 
-        await SaveChangesAsync(async () =>
+        await SaveChangesAsync(() =>
         {
-            await (_mongoDataAccess.ActiveSession != null
+            return _mongoDataAccess.ActiveSession != null
                 ? Collection.InsertOneAsync(_mongoDataAccess.ActiveSession, resourceForDatabase, cancellationToken: cancellationToken)
-                : Collection.InsertOneAsync(resourceForDatabase, cancellationToken: cancellationToken));
+                : Collection.InsertOneAsync(resourceForDatabase, cancellationToken: cancellationToken);
         }, cancellationToken);
 
         await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/AtomicOperationsFixture.cs

@@ -32,8 +32,8 @@ public Task InitializeAsync()
         return Task.CompletedTask;
     }
 
-    public async Task DisposeAsync()
+    public Task DisposeAsync()
     {
-        await TestContext.DisposeAsync();
+        return TestContext.DisposeAsync();
     }
 }

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs

@@ -132,10 +132,10 @@ public async Task Cannot_create_resource_for_existing_client_generated_ID()
 
         string newIsoCode = _fakers.TextLanguage.Generate().IsoCode!;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.TextLanguages.Add(existingLanguage);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs

@@ -25,10 +25,10 @@ public async Task Cannot_create_ToMany_relationship()
 
         string newTitle = _fakers.MusicTrack.Generate().Title;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingPerformer);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs

@@ -25,10 +25,10 @@ public async Task Cannot_create_ToOne_relationship()
 
         string newLyricText = _fakers.Lyric.Generate().Text;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.MusicTracks.Add(existingTrack);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs

@@ -23,10 +23,10 @@ public async Task Can_delete_existing_resource()
         // Arrange
         Performer existingPerformer = _fakers.Performer.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingPerformer);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs

@@ -112,10 +112,10 @@ public async Task Returns_resource_meta_in_update_resource_with_side_effects()
 
         TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.TextLanguages.Add(existingLanguage);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         var requestBody = new

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs

@@ -26,9 +26,9 @@ public async Task Can_rollback_created_resource_on_error()
         string newArtistName = _fakers.Performer.Generate().ArtistName!;
         DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
-            await dbContext.ClearTableAsync<Performer>();
+            return dbContext.ClearTableAsync<Performer>();
         });
 
         string unknownPerformerId = Unknown.StringId.For<Performer, string?>();
@@ -94,10 +94,10 @@ public async Task Can_rollback_updated_resource_on_error()
 
         string newArtistName = _fakers.Performer.Generate().ArtistName!;
 
-        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        await _testContext.RunOnDatabaseAsync(dbContext =>
         {
             dbContext.Performers.Add(existingPerformer);
-            await dbContext.SaveChangesAsync();
+            return dbContext.SaveChangesAsync();
         });
 
         string unknownPerformerId = Unknown.StringId.For<Performer, string?>();

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs

@@ -26,8 +26,8 @@ public LyricRepository(IMongoDataAccess mongoDataAccess, ITargetedFields targete
         _transaction = factory.BeginTransactionAsync(CancellationToken.None).Result;
     }
 
-    public async ValueTask DisposeAsync()
+    public ValueTask DisposeAsync()
     {
-        await _transaction.DisposeAsync();
+        return _transaction.DisposeAsync();
     }
 }