Skip to content

Commit 38bfc4e

Browse files
committed
Resharper: Use lambda expression
1 parent ed33dfa commit 38bfc4e

File tree

5 files changed

+14
-34
lines changed

5 files changed

+14
-34
lines changed

src/Examples/GettingStarted/Program.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
return client.GetDatabase(builder.Configuration.GetSection("DatabaseSettings:Database").Value);
1616
});
1717

18-
builder.Services.AddJsonApi(ConfigureJsonApiOptions, resources: resourceGraphBuilder =>
19-
{
20-
resourceGraphBuilder.Add<Book, string?>();
21-
});
22-
18+
builder.Services.AddJsonApi(ConfigureJsonApiOptions, resources: resourceGraphBuilder => resourceGraphBuilder.Add<Book, string?>());
2319
builder.Services.AddJsonApiMongoDb();
2420

2521
builder.Services.AddResourceRepository<MongoRepository<Book, string?>>();

src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs

+9-13
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,10 @@ public virtual async Task CreateAsync(TResource resourceFromRequest, TResource r
173173

174174
await _resourceDefinitionAccessor.OnWritingAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
175175

176-
await SaveChangesAsync(() =>
177-
{
178-
return _mongoDataAccess.ActiveSession != null
176+
await SaveChangesAsync(
177+
() => _mongoDataAccess.ActiveSession != null
179178
? Collection.InsertOneAsync(_mongoDataAccess.ActiveSession, resourceForDatabase, cancellationToken: cancellationToken)
180-
: Collection.InsertOneAsync(resourceForDatabase, cancellationToken: cancellationToken);
181-
}, cancellationToken);
179+
: Collection.InsertOneAsync(resourceForDatabase, cancellationToken: cancellationToken), cancellationToken);
182180

183181
await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
184182
}
@@ -217,12 +215,10 @@ public virtual async Task UpdateAsync(TResource resourceFromRequest, TResource r
217215

218216
FilterDefinition<TResource> filter = Builders<TResource>.Filter.Eq(resource => resource.Id, resourceFromDatabase.Id);
219217

220-
await SaveChangesAsync(async () =>
221-
{
222-
await (_mongoDataAccess.ActiveSession != null
218+
await SaveChangesAsync(
219+
() => _mongoDataAccess.ActiveSession != null
223220
? Collection.ReplaceOneAsync(_mongoDataAccess.ActiveSession, filter, resourceFromDatabase, cancellationToken: cancellationToken)
224-
: Collection.ReplaceOneAsync(filter, resourceFromDatabase, cancellationToken: cancellationToken));
225-
}, cancellationToken);
221+
: Collection.ReplaceOneAsync(filter, resourceFromDatabase, cancellationToken: cancellationToken), cancellationToken);
226222

227223
await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceFromDatabase, WriteOperationKind.UpdateResource, cancellationToken);
228224
}
@@ -238,9 +234,9 @@ public virtual async Task DeleteAsync(TResource? resourceFromDatabase, TId id, C
238234
FilterDefinition<TResource> filter = Builders<TResource>.Filter.Eq(resource => resource.Id, id);
239235

240236
DeleteResult result = await SaveChangesAsync(
241-
async () => _mongoDataAccess.ActiveSession != null
242-
? await Collection.DeleteOneAsync(_mongoDataAccess.ActiveSession, filter, cancellationToken: cancellationToken)
243-
: await Collection.DeleteOneAsync(filter, cancellationToken), cancellationToken);
237+
() => _mongoDataAccess.ActiveSession != null
238+
? Collection.DeleteOneAsync(_mongoDataAccess.ActiveSession, filter, cancellationToken: cancellationToken)
239+
: Collection.DeleteOneAsync(filter, cancellationToken), cancellationToken);
244240

245241
if (!result.IsAcknowledged)
246242
{

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ public async Task Can_rollback_created_resource_on_error()
2626
string newArtistName = _fakers.Performer.Generate().ArtistName!;
2727
DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
2828

29-
await _testContext.RunOnDatabaseAsync(dbContext =>
30-
{
31-
return dbContext.ClearTableAsync<Performer>();
32-
});
29+
await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<Performer>());
3330

3431
string unknownPerformerId = Unknown.StringId.For<Performer, string?>();
3532

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/Meta/TopLevelCountTests.cs

+2-8
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ public TopLevelCountTests(IntegrationTestContext<TestableStartup, MetaDbContext>
2323

2424
testContext.UseController<SupportTicketsController>();
2525

26-
testContext.ConfigureServices(services =>
27-
{
28-
services.TryAddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
29-
});
26+
testContext.ConfigureServices(services => services.TryAddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>)));
3027

3128
var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
3229
options.IncludeTotalResourceCount = true;
@@ -62,10 +59,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
6259
public async Task Renders_resource_count_for_empty_collection()
6360
{
6461
// Arrange
65-
await _testContext.RunOnDatabaseAsync(dbContext =>
66-
{
67-
return dbContext.ClearTableAsync<SupportTicket>();
68-
});
62+
await _testContext.RunOnDatabaseAsync(dbContext => dbContext.ClearTableAsync<SupportTicket>());
6963

7064
const string route = "/supportTickets";
7165

test/JsonApiDotNetCoreMongoDbTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ public CreateResourceWithClientGeneratedIdTests(IntegrationTestContext<TestableS
2222
testContext.UseController<WorkItemGroupsController>();
2323
testContext.UseController<RgbColorsController>();
2424

25-
testContext.ConfigureServices(services =>
26-
{
27-
services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
28-
});
25+
testContext.ConfigureServices(services => services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>());
2926

3027
var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
3128
options.ClientIdGeneration = ClientIdGenerationMode.Required;

0 commit comments

Comments
 (0)