From 154a4c41451a0c25e821e8a465617a96637496a1 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 20:55:51 +0000 Subject: [PATCH] refactor: simplify single-statement lambda expressions This PR refactors multiple lambda expressions that only contain a single statement, converting them from block-bodied forms with braces and explicit return keywords to concise expression-bodied lambdas. Across service registrations, domain logic, and test assertions, redundant braces and return statements have been removed to improve readability and reduce verbosity. - Consider simplifying lambda when its body has a single statement: Many lambdas in service registration (e.g., `AddSingleton>`, `AddSingleton>`) and in tests (e.g., `Should.Throw`, `Should.NotThrow`, `Retry.For`) were written with braces wrapping a single return or await call. Each of these has been converted to an expression-bodied lambda, eliminating unnecessary braces and `return`/`async` block syntax. > This Autofix was generated by AI. Please review the change before merging. --- .../Services/MessagingDomainServiceTests.cs | 4 +--- .../EmailAggregateTests.cs | 10 +++++----- .../MessagingSteps.cs | 10 +++------- .../SMSAggregateTests.cs | 20 ++++--------------- MessagingService.Tests/ControllerTests.cs | 8 ++------ .../Bootstrapper/MediatorRegistry.cs | 5 +---- .../Bootstrapper/RepositoryRegistry.cs | 4 +--- 7 files changed, 17 insertions(+), 44 deletions(-) diff --git a/MessagingService.BusinessLogic.Tests/Services/MessagingDomainServiceTests.cs b/MessagingService.BusinessLogic.Tests/Services/MessagingDomainServiceTests.cs index 98405c4..8af24e9 100644 --- a/MessagingService.BusinessLogic.Tests/Services/MessagingDomainServiceTests.cs +++ b/MessagingService.BusinessLogic.Tests/Services/MessagingDomainServiceTests.cs @@ -434,9 +434,7 @@ public async Task MessagingDomainService_UpdateSMSMessageStatus_MessageUpdated(B new(emailAggregateRepository.Object, smsAggregateRepository.Object, emailServiceProxy.Object, smsServiceProxy.Object); SMSCommands.UpdateMessageStatusCommand command = new(TestData.MessageId, status, TestData.ProviderStatusDescription, TestData.BouncedDateTime); - Should.NotThrow(async () => { - await messagingDomainService.UpdateMessageStatus(command, CancellationToken.None); - }); + Should.NotThrow(async () => await messagingDomainService.UpdateMessageStatus(command, CancellationToken.None)); } [Theory] diff --git a/MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs b/MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs index f034bb7..c24f21d 100644 --- a/MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs +++ b/MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs @@ -120,7 +120,7 @@ public void EmailAggregate_MarkMessageAsDelivered_IncorrectState_ErrorThrown(Mes } - Should.Throw(() => { emailAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime); }); + Should.Throw(() => emailAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime)); } [Fact] @@ -171,7 +171,7 @@ public void EmailAggregate_MarkMessageAsRejected_IncorrectState_ErrorThrown(Mess break; } - Should.Throw(() => { emailAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.RejectedDateTime); }); + Should.Throw(() => emailAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.RejectedDateTime)); } [Fact] @@ -222,7 +222,7 @@ public void EmailAggregate_MarkMessageAsFailed_IncorrectState_ErrorThrown(Messag break; } - Should.Throw(() => { emailAggregate.MarkMessageAsFailed(TestData.ProviderStatusDescription, TestData.FailedDateTime); }); + Should.Throw(() => emailAggregate.MarkMessageAsFailed(TestData.ProviderStatusDescription, TestData.FailedDateTime)); } [Fact] @@ -273,7 +273,7 @@ public void EmailAggregate_MarkMessageAsBounced_IncorrectState_ErrorThrown(Messa break; } - Should.Throw(() => { emailAggregate.MarkMessageAsBounced(TestData.ProviderStatusDescription, TestData.BouncedDateTime); }); + Should.Throw(() => emailAggregate.MarkMessageAsBounced(TestData.ProviderStatusDescription, TestData.BouncedDateTime)); } [Fact] @@ -324,7 +324,7 @@ public void EmailAggregate_MarkMessageAsSpam_IncorrectState_ErrorThrown(MessageS break; } - Should.Throw(() => { emailAggregate.MarkMessageAsSpam(TestData.ProviderStatusDescription, TestData.SpamDateTime); }); + Should.Throw(() => emailAggregate.MarkMessageAsSpam(TestData.ProviderStatusDescription, TestData.SpamDateTime)); } diff --git a/MessagingService.IntegrationTesting.Helpers/MessagingSteps.cs b/MessagingService.IntegrationTesting.Helpers/MessagingSteps.cs index 887b772..15e800a 100644 --- a/MessagingService.IntegrationTesting.Helpers/MessagingSteps.cs +++ b/MessagingService.IntegrationTesting.Helpers/MessagingSteps.cs @@ -39,13 +39,9 @@ public async Task GivenISendTheFollowingSMSMessages(String accessToken, List requests){ foreach (ResendEmailRequest resendEmailRequest in requests){ - await Retry.For(async () => { - Should.NotThrow(async () => { - await this.MessagingServiceClient.ResendEmail(accessToken, - resendEmailRequest, - CancellationToken.None); - }); - }); + await Retry.For(async () => Should.NotThrow(async () => await this.MessagingServiceClient.ResendEmail(accessToken, + resendEmailRequest, + CancellationToken.None))); } } diff --git a/MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs b/MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs index eb12c01..96b1428 100644 --- a/MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs +++ b/MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs @@ -95,10 +95,7 @@ public void SMSAggregate_MarkMessageAsDelivered_IncorrectState_ErrorThrown(Messa break; } - Should.Throw(() => - { - smsAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime); - }); + Should.Throw(() => smsAggregate.MarkMessageAsDelivered(TestData.ProviderStatusDescription, TestData.DeliveredDateTime)); } [Fact] @@ -150,10 +147,7 @@ public void SMSAggregate_MarkMessageAsExpired_IncorrectState_ErrorThrown(Message break; } - Should.Throw(() => - { - smsAggregate.MarkMessageAsExpired(TestData.ProviderStatusDescription, TestData.DeliveredDateTime); - }); + Should.Throw(() => smsAggregate.MarkMessageAsExpired(TestData.ProviderStatusDescription, TestData.DeliveredDateTime)); } [Fact] @@ -205,10 +199,7 @@ public void SMSAggregate_MarkMessageAsUndeliverable_IncorrectState_ErrorThrown(M break; } - Should.Throw(() => - { - smsAggregate.MarkMessageAsUndeliverable(TestData.ProviderStatusDescription, TestData.DeliveredDateTime); - }); + Should.Throw(() => smsAggregate.MarkMessageAsUndeliverable(TestData.ProviderStatusDescription, TestData.DeliveredDateTime)); } [Fact] @@ -260,10 +251,7 @@ public void SMSAggregate_MarkMessageAsRejected_IncorrectState_ErrorThrown(Messag break; } - Should.Throw(() => - { - smsAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.DeliveredDateTime); - }); + Should.Throw(() => smsAggregate.MarkMessageAsRejected(TestData.ProviderStatusDescription, TestData.DeliveredDateTime)); } [Fact] diff --git a/MessagingService.Tests/ControllerTests.cs b/MessagingService.Tests/ControllerTests.cs index e09291a..97cd806 100644 --- a/MessagingService.Tests/ControllerTests.cs +++ b/MessagingService.Tests/ControllerTests.cs @@ -39,9 +39,7 @@ public async Task DomainEventController_EventIdNotPresentInJson_ErrorThrown() { }; String json = "{\r\n \"messageId\": \"811bb215-0d99-4639-ac3a-195ba4a47449\",\r\n \"providerRequestReference\": \"d8f669fa-675d-11ec-8b59-f23c92160e3c\"\r\n}\t"; Object request = JsonConvert.DeserializeObject(json); - ArgumentException ex = Should.Throw(async () => { - await controller.PostEventAsync(request, CancellationToken.None); - }); + ArgumentException ex = Should.Throw(() => controller.PostEventAsync(request, CancellationToken.None)); ex.Message.ShouldBe("Domain Event must contain an Event Id"); } @@ -61,9 +59,7 @@ public async Task DomainEventController_EventIdPresentInJson_NoErrorThrown() }; 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"; Object request = JsonConvert.DeserializeObject(json); - Should.NotThrow(async () => { - await controller.PostEventAsync(request, CancellationToken.None); - }); + Should.NotThrow(async () => await controller.PostEventAsync(request, CancellationToken.None)); } } } diff --git a/MessagingService/Bootstrapper/MediatorRegistry.cs b/MessagingService/Bootstrapper/MediatorRegistry.cs index 1335ddd..f6f9467 100644 --- a/MessagingService/Bootstrapper/MediatorRegistry.cs +++ b/MessagingService/Bootstrapper/MediatorRegistry.cs @@ -25,9 +25,6 @@ public MediatorRegistry() this.AddSingleton, MessagingRequestHandler>(); this.AddSingleton, MessagingRequestHandler>(); - this.AddSingleton>(container => (serviceName) => - { - return ConfigurationReader.GetBaseServerUri(serviceName).OriginalString; - }); + this.AddSingleton>(container => (serviceName) => ConfigurationReader.GetBaseServerUri(serviceName).OriginalString); } } \ No newline at end of file diff --git a/MessagingService/Bootstrapper/RepositoryRegistry.cs b/MessagingService/Bootstrapper/RepositoryRegistry.cs index 618c770..042bc7b 100644 --- a/MessagingService/Bootstrapper/RepositoryRegistry.cs +++ b/MessagingService/Bootstrapper/RepositoryRegistry.cs @@ -38,8 +38,6 @@ public RepositoryRegistry() this.AddSingleton, AggregateRepository>(); this.AddSingleton, AggregateRepository>(); - this.AddSingleton>(cont => (esConnString, cacheDuration) => { - return SubscriptionRepository.Create(esConnString, cacheDuration); - }); + this.AddSingleton>(cont => (esConnString, cacheDuration) => SubscriptionRepository.Create(esConnString, cacheDuration)); } } \ No newline at end of file