Skip to content

Commit 7ecfeb4

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #211 from TransactionProcessing/deepsource-autofix-7a7f9296
refactor: simplify single-statement lambda expressions
2 parents e251d66 + 154a4c4 commit 7ecfeb4

7 files changed

Lines changed: 17 additions & 44 deletions

File tree

‎MessagingService.BusinessLogic.Tests/Services/MessagingDomainServiceTests.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,7 @@ public async Task MessagingDomainService_UpdateSMSMessageStatus_MessageUpdated(B
434434
new(emailAggregateRepository.Object, smsAggregateRepository.Object, emailServiceProxy.Object, smsServiceProxy.Object);
435435

436436
SMSCommands.UpdateMessageStatusCommand command = new(TestData.MessageId, status, TestData.ProviderStatusDescription, TestData.BouncedDateTime);
437-
Should.NotThrow(async () => {
438-
await messagingDomainService.UpdateMessageStatus(command, CancellationToken.None);
439-
});
437+
Should.NotThrow(async () => await messagingDomainService.UpdateMessageStatus(command, CancellationToken.None));
440438
}
441439

442440
[Theory]

‎MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void EmailAggregate_MarkMessageAsDelivered_IncorrectState_ErrorThrown(Mes
120120

121121
}
122122

123-
Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime); });
123+
Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
124124
}
125125

126126
[Fact]
@@ -171,7 +171,7 @@ public void EmailAggregate_MarkMessageAsRejected_IncorrectState_ErrorThrown(Mess
171171
break;
172172
}
173173

174-
Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.RejectedDateTime); });
174+
Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.RejectedDateTime));
175175
}
176176

177177
[Fact]
@@ -222,7 +222,7 @@ public void EmailAggregate_MarkMessageAsFailed_IncorrectState_ErrorThrown(Messag
222222
break;
223223
}
224224

225-
Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsFailed(TestData.ProviderStatusDescription, TestData.FailedDateTime); });
225+
Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsFailed(TestData.ProviderStatusDescription, TestData.FailedDateTime));
226226
}
227227

228228
[Fact]
@@ -273,7 +273,7 @@ public void EmailAggregate_MarkMessageAsBounced_IncorrectState_ErrorThrown(Messa
273273
break;
274274
}
275275

276-
Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsBounced(TestData.ProviderStatusDescription, TestData.BouncedDateTime); });
276+
Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsBounced(TestData.ProviderStatusDescription, TestData.BouncedDateTime));
277277
}
278278

279279
[Fact]
@@ -324,7 +324,7 @@ public void EmailAggregate_MarkMessageAsSpam_IncorrectState_ErrorThrown(MessageS
324324
break;
325325
}
326326

327-
Should.Throw<InvalidOperationException>(() => { emailAggregate.MarkMessageAsSpam(TestData.ProviderStatusDescription, TestData.SpamDateTime); });
327+
Should.Throw<InvalidOperationException>(() => emailAggregate.MarkMessageAsSpam(TestData.ProviderStatusDescription, TestData.SpamDateTime));
328328
}
329329

330330

‎MessagingService.IntegrationTesting.Helpers/MessagingSteps.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,9 @@ public async Task GivenISendTheFollowingSMSMessages(String accessToken, List<Sen
3939

4040
public async Task WhenIResendTheFollowingMessages(String accessToken, List<ResendEmailRequest> requests){
4141
foreach (ResendEmailRequest resendEmailRequest in requests){
42-
await Retry.For(async () => {
43-
Should.NotThrow(async () => {
44-
await this.MessagingServiceClient.ResendEmail(accessToken,
45-
resendEmailRequest,
46-
CancellationToken.None);
47-
});
48-
});
42+
await Retry.For(async () => Should.NotThrow(async () => await this.MessagingServiceClient.ResendEmail(accessToken,
43+
resendEmailRequest,
44+
CancellationToken.None)));
4945
}
5046
}
5147

‎MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,7 @@ public void SMSAggregate_MarkMessageAsDelivered_IncorrectState_ErrorThrown(Messa
9595
break;
9696
}
9797

98-
Should.Throw<InvalidOperationException>(() =>
99-
{
100-
smsAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime);
101-
});
98+
Should.Throw<InvalidOperationException>(() => smsAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
10299
}
103100

104101
[Fact]
@@ -150,10 +147,7 @@ public void SMSAggregate_MarkMessageAsExpired_IncorrectState_ErrorThrown(Message
150147
break;
151148
}
152149

153-
Should.Throw<InvalidOperationException>(() =>
154-
{
155-
smsAggregate.MarkMessageAsExpired(TestData.ProviderStatusDescription, TestData.DeliveredDateTime);
156-
});
150+
Should.Throw<InvalidOperationException>(() => smsAggregate.MarkMessageAsExpired(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
157151
}
158152

159153
[Fact]
@@ -205,10 +199,7 @@ public void SMSAggregate_MarkMessageAsUndeliverable_IncorrectState_ErrorThrown(M
205199
break;
206200
}
207201

208-
Should.Throw<InvalidOperationException>(() =>
209-
{
210-
smsAggregate.MarkMessageAsUndeliverable(TestData.ProviderStatusDescription, TestData.DeliveredDateTime);
211-
});
202+
Should.Throw<InvalidOperationException>(() => smsAggregate.MarkMessageAsUndeliverable(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
212203
}
213204

214205
[Fact]
@@ -260,10 +251,7 @@ public void SMSAggregate_MarkMessageAsRejected_IncorrectState_ErrorThrown(Messag
260251
break;
261252
}
262253

263-
Should.Throw<InvalidOperationException>(() =>
264-
{
265-
smsAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.DeliveredDateTime);
266-
});
254+
Should.Throw<InvalidOperationException>(() => smsAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.DeliveredDateTime));
267255
}
268256

269257
[Fact]

‎MessagingService.Tests/ControllerTests.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ public async Task DomainEventController_EventIdNotPresentInJson_ErrorThrown() {
3939
};
4040
String json = "{\r\n \"messageId\": \"811bb215-0d99-4639-ac3a-195ba4a47449\",\r\n \"providerRequestReference\": \"d8f669fa-675d-11ec-8b59-f23c92160e3c\"\r\n}\t";
4141
Object request = JsonConvert.DeserializeObject(json);
42-
ArgumentException ex = Should.Throw<ArgumentException>(async () => {
43-
await controller.PostEventAsync(request, CancellationToken.None);
44-
});
42+
ArgumentException ex = Should.Throw<ArgumentException>(() => controller.PostEventAsync(request, CancellationToken.None));
4543
ex.Message.ShouldBe("Domain Event must contain an Event Id");
4644
}
4745

@@ -61,9 +59,7 @@ public async Task DomainEventController_EventIdPresentInJson_NoErrorThrown()
6159
};
6260
String json = "{\r\n \"messageId\": \"811bb215-0d99-4639-ac3a-195ba4a47449\",\r\n \"providerRequestReference\": \"d8f669fa-675d-11ec-8b59-f23c92160e3c\",\r\n \"eventId\": \"123bb215-0d99-4639-ac3a-195ba4a47449\"\r\n}\t";
6361
Object request = JsonConvert.DeserializeObject(json);
64-
Should.NotThrow(async () => {
65-
await controller.PostEventAsync(request, CancellationToken.None);
66-
});
62+
Should.NotThrow(async () => await controller.PostEventAsync(request, CancellationToken.None));
6763
}
6864
}
6965
}

‎MessagingService/Bootstrapper/MediatorRegistry.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ public MediatorRegistry()
2525
this.AddSingleton<IRequestHandler<SMSCommands.UpdateMessageStatusCommand, Result>, MessagingRequestHandler>();
2626
this.AddSingleton<IRequestHandler<EmailCommands.UpdateMessageStatusCommand, Result>, MessagingRequestHandler>();
2727

28-
this.AddSingleton<Func<String, String>>(container => (serviceName) =>
29-
{
30-
return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString;
31-
});
28+
this.AddSingleton<Func<String, String>>(container => (serviceName) => ConfigurationReader.GetBaseServerUri(serviceName).OriginalString);
3229
}
3330
}

‎MessagingService/Bootstrapper/RepositoryRegistry.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ public RepositoryRegistry()
3838
this.AddSingleton<IAggregateRepository<EmailAggregate, DomainEvent>, AggregateRepository<EmailAggregate, DomainEvent>>();
3939
this.AddSingleton<IAggregateRepository<SMSAggregate, DomainEvent>, AggregateRepository<SMSAggregate, DomainEvent>>();
4040

41-
this.AddSingleton<Func<String, Int32, ISubscriptionRepository>>(cont => (esConnString, cacheDuration) => {
42-
return SubscriptionRepository.Create(esConnString, cacheDuration);
43-
});
41+
this.AddSingleton<Func<String, Int32, ISubscriptionRepository>>(cont => (esConnString, cacheDuration) => SubscriptionRepository.Create(esConnString, cacheDuration));
4442
}
4543
}

0 commit comments

Comments
 (0)