Merge pull request #131 from TransactionProcessing/deepsource-autofix-00463dc6

StuartFerguson · web-flow · commit 21e05db2e8c8 · 2025-09-18T20:18:05.000+01:00
refactor: drop redundant types from object instantiations
diff --git a/CallbackHander.Testing/TestData.cs b/CallbackHander.Testing/TestData.cs
@@ -41,7 +41,7 @@ public static CallbackMessageAggregate EmptyCallbackMessageAggregate()
 
         public static CallbackMessageAggregate RecordedCallbackMessageAggregate()
         {
-            CallbackMessageAggregate aggregate = new CallbackMessageAggregate();
+            CallbackMessageAggregate aggregate = new();
             aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, (MessageFormat)TestData.MessageFormat,
                 TestData.CallbackMessage, TestData.Reference, TestData.Destinations, EstateReference, MerchantReference);
 
diff --git a/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs b/CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs
@@ -30,20 +30,20 @@ public MediatorTests()
         [Fact]
         public async Task Mediator_Send_RequestHandled()
         {
-            Mock<IWebHostEnvironment> hostingEnvironment = new Mock<IWebHostEnvironment>();
+            Mock<IWebHostEnvironment> hostingEnvironment = new();
             hostingEnvironment.Setup(he => he.EnvironmentName).Returns("Development");
             hostingEnvironment.Setup(he => he.ContentRootPath).Returns("/home");
             hostingEnvironment.Setup(he => he.ApplicationName).Returns("Test Application");
 
-            ServiceRegistry services = new ServiceRegistry();
-            Startup s = new Startup(hostingEnvironment.Object);
+            ServiceRegistry services = new();
+            Startup s = new(hostingEnvironment.Object);
             Startup.Configuration = this.SetupMemoryConfiguration();
 
             this.AddTestRegistrations(services, hostingEnvironment.Object);
             s.ConfigureContainer(services);
             Startup.Container.AssertConfigurationIsValid(AssertMode.Full);
 
-            List<String> errors = new List<String>();
+            List<String> errors = new();
             IMediator mediator = Startup.Container.GetService<IMediator>();
             foreach (IBaseRequest baseRequest in this.Requests)
             {
@@ -90,7 +90,7 @@ private void AddTestRegistrations(ServiceRegistry services,
                                           IWebHostEnvironment hostingEnvironment)
         {
             services.AddLogging();
-            DiagnosticListener diagnosticSource = new DiagnosticListener(hostingEnvironment.ApplicationName);
+            DiagnosticListener diagnosticSource = new(hostingEnvironment.ApplicationName);
             services.AddSingleton<DiagnosticSource>(diagnosticSource);
             services.AddSingleton<DiagnosticListener>(diagnosticSource);
             services.AddSingleton<IWebHostEnvironment>(hostingEnvironment);
diff --git a/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs b/CallbackHandler.BusinessLogic.Tests/RequestHandler/CallbackHandlerRequestHandlerTests.cs
@@ -23,19 +23,17 @@ public class CallbackHandlerRequestHandlerTests
         [Fact]
         public void CallbackHandlerRequestHandlerTests_RecordCallbackRequest_IsHandled()
         {
-            Mock<ICallbackDomainService> domainService =
-                new Mock<ICallbackDomainService>();
+            Mock<ICallbackDomainService> domainService = new();
             domainService.Setup(a => a.RecordCallback(It.IsAny<Guid>(),
                                                       It.IsAny<String>(),
                                                       It.IsAny<MessageFormat>(),
                                                       It.IsAny<String>(),
                                                       It.IsAny<String>(),
                                                       It.IsAny<String[]>(),
                                                       It.IsAny<CancellationToken>()));
-            Mock<IAggregateRepository<CallbackMessageAggregate, DomainEvent>> aggregateRepository =
-                new Mock<IAggregateRepository<CallbackMessageAggregate, DomainEvent>>();
+            Mock<IAggregateRepository<CallbackMessageAggregate, DomainEvent>> aggregateRepository = new();
 
-            CallbackHandlerRequestHandler handler = new CallbackHandlerRequestHandler(domainService.Object, aggregateRepository.Object);
+            CallbackHandlerRequestHandler handler = new(domainService.Object, aggregateRepository.Object);
             
             CallbackCommands.RecordCallbackRequest request = TestData.RecordCallbackRequest;
 
@@ -46,7 +44,7 @@ public void CallbackHandlerRequestHandlerTests_RecordCallbackRequest_IsHandled()
         public void CallbackHandlerRequestHandlerTests_GetCallbackQuery_IsHandled()
         {
             Mock<ICallbackDomainService> domainService =
-                new Mock<ICallbackDomainService>();
+                new();
             domainService.Setup(a => a.RecordCallback(It.IsAny<Guid>(),
                 It.IsAny<String>(),
                 It.IsAny<MessageFormat>(),
@@ -55,12 +53,12 @@ public void CallbackHandlerRequestHandlerTests_GetCallbackQuery_IsHandled()
                 It.IsAny<String[]>(),
                 It.IsAny<CancellationToken>()));
             Mock<IAggregateRepository<CallbackMessageAggregate, DomainEvent>> aggregateRepository =
-                new Mock<IAggregateRepository<CallbackMessageAggregate, DomainEvent>>();
+                new();
 
             aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
                 .ReturnsAsync(TestData.RecordedCallbackMessageAggregate());
 
-            CallbackHandlerRequestHandler handler = new CallbackHandlerRequestHandler(domainService.Object, aggregateRepository.Object);
+            CallbackHandlerRequestHandler handler = new(domainService.Object, aggregateRepository.Object);
 
             CallbackQueries.GetCallbackQuery query = TestData.GetCallbackQuery;
 
diff --git a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs
@@ -20,7 +20,7 @@ public class CallbackMessageAggregateTests
         [Fact]
         public void CallbackMessageAggregate_RecordCallback_CallbackIsRecorded()
         {
-            CallbackMessageAggregate aggregate = new CallbackMessageAggregate();
+            CallbackMessageAggregate aggregate = new();
 
             Result result = aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, MessageFormat.JSON, TestData.CallbackMessage, TestData.Reference, TestData.Destinations,
                 TestData.EstateReference, TestData.MerchantReference);
diff --git a/CallbackHandler.IntegrationTests/Common/DockerHelper.cs b/CallbackHandler.IntegrationTests/Common/DockerHelper.cs
@@ -49,7 +49,7 @@ public async Task StartSystem()
         {
             // Initialise a logger
             String scenarioName = this.ScenarioContext.ScenarioInfo.Title.Replace(" ", "");
-            NlogLogger logger = new NlogLogger();
+            NlogLogger logger = new();
             logger.Initialise(LogManager.GetLogger(scenarioName), scenarioName);
             LogManager.AddHiddenAssembly(typeof(NlogLogger).Assembly);
 
diff --git a/CallbackHandler.IntegrationTests/Shared/SharedSteps.cs b/CallbackHandler.IntegrationTests/Shared/SharedSteps.cs
@@ -40,12 +40,12 @@ public async Task GivenIHaveTheFollowingBankDepositCallbacks(DataTable table)
         [When(@"I send the requests to the callback handler for deposits")]
         public async Task WhenISendTheRequestsToTheCallbackHandlerForDeposits()
         {
-            using HttpClient client = new HttpClient();
+            using HttpClient client = new();
             foreach (var testingContextDeposit in this.TestingContext.Deposits)
             {
                 String requestUri =
                     $"http://localhost:{this.TestingContext.DockerHelper.GetCallbackHandlerPort()}/api/callbacks";
-                HttpRequestMessage msg = new HttpRequestMessage(HttpMethod.Post, requestUri);
+                HttpRequestMessage msg = new(HttpMethod.Post, requestUri);
                 var payload = JsonConvert.SerializeObject(testingContextDeposit);
 
                 msg.Content = new StringContent(payload, Encoding.UTF8,
@@ -63,12 +63,12 @@ public async Task WhenISendTheRequestsToTheCallbackHandlerForDeposits()
         [Then("the deposit records are recorded")]
         public async Task ThenTheDepositRecordsAreRecorded()
         {
-            using HttpClient client = new HttpClient();
+            using HttpClient client = new();
             foreach (var sentCallback in this.TestingContext.SentCallbacks)
             {
                 String requestUri =
                     $"http://localhost:{this.TestingContext.DockerHelper.GetCallbackHandlerPort()}/api/callbacks/{sentCallback.Key}";
-                HttpRequestMessage msg = new HttpRequestMessage(HttpMethod.Get, requestUri);
+                HttpRequestMessage msg = new(HttpMethod.Get, requestUri);
                 var response = await client.SendAsync(msg);
                 response.StatusCode.ShouldBe(HttpStatusCode.OK);
 
@@ -90,10 +90,10 @@ public static class ReqnrollExtensions
     {
         public static List<Deposit> ToDepositRequests(this DataTableRows tableRows)
         {
-            List<Deposit> requests = new List<Deposit>();
+            List<Deposit> requests = new();
             foreach (DataTableRow tableRow in tableRows)
             {
-                Deposit depositCallback = new Deposit
+                Deposit depositCallback = new()
                 {
                     AccountNumber = ReqnrollTableHelper.GetStringRowValue(tableRow, "AccountNumber"),
                     Amount = ReqnrollTableHelper.GetDecimalValue(tableRow, "Amount"),
diff --git a/CallbackHandler.Tests/BootstrapperTests.cs b/CallbackHandler.Tests/BootstrapperTests.cs
@@ -18,13 +18,13 @@ public class BootstrapperTests
         [Fact]
         public void VerifyBootstrapperIsValid()
         {
-            Mock<IWebHostEnvironment> hostingEnvironment = new Mock<IWebHostEnvironment>();
+            Mock<IWebHostEnvironment> hostingEnvironment = new();
             hostingEnvironment.Setup(he => he.EnvironmentName).Returns("Development");
             hostingEnvironment.Setup(he => he.ContentRootPath).Returns("/home");
             hostingEnvironment.Setup(he => he.ApplicationName).Returns("Test Application");
 
-            ServiceRegistry services = new ServiceRegistry();
-            Startup s = new Startup(hostingEnvironment.Object);
+            ServiceRegistry services = new();
+            Startup s = new(hostingEnvironment.Object);
             Startup.Configuration = this.SetupMemoryConfiguration();
 
             this.AddTestRegistrations(services, hostingEnvironment.Object);
@@ -58,7 +58,7 @@ private void AddTestRegistrations(ServiceRegistry services,
                                                         IWebHostEnvironment hostingEnvironment)
         {
             services.AddLogging();
-            DiagnosticListener diagnosticSource = new DiagnosticListener(hostingEnvironment.ApplicationName);
+            DiagnosticListener diagnosticSource = new(hostingEnvironment.ApplicationName);
             services.AddSingleton<DiagnosticSource>(diagnosticSource);
             services.AddSingleton<DiagnosticListener>(diagnosticSource);
             services.AddSingleton<IWebHostEnvironment>(hostingEnvironment);
diff --git a/CallbackHandler/Bootstrapper/MiddlewareRegistry.cs b/CallbackHandler/Bootstrapper/MiddlewareRegistry.cs
@@ -53,7 +53,7 @@ public MiddlewareRegistry()
                                    c.ExampleFilters();
 
                                    //Locate the XML files being generated by ASP.NET...
-                                   DirectoryInfo directory = new DirectoryInfo(AppContext.BaseDirectory);
+                                   DirectoryInfo directory = new(AppContext.BaseDirectory);
                                    FileInfo[] xmlFiles = directory.GetFiles("*.xml");
 
                                    //... and tell Swagger to use those XML comments.
@@ -82,7 +82,7 @@ public MiddlewareRegistry()
             LogLevel middlewareLogLevel = ConfigurationReader.GetValueOrDefault<LogLevel>("MiddlewareLogging", "MiddlewareLogLevel", LogLevel.Warning);
 
             RequestResponseMiddlewareLoggingConfig config =
-                new RequestResponseMiddlewareLoggingConfig(middlewareLogLevel, logRequests, logResponses);
+                new(middlewareLogLevel, logRequests, logResponses);
 
             this.AddSingleton(config);
         }
diff --git a/CallbackHandler/Program.cs b/CallbackHandler/Program.cs
@@ -31,6 +31,7 @@ public static void Main(string[] args)
         public static IHostBuilder CreateHostBuilder(string[] args)
         {
             //At this stage, we only need our hosting file for ip and ports
+
             FileInfo fi = new(typeof(Program).Assembly.Location);
 
             IConfigurationRoot config = new ConfigurationBuilder().SetBasePath(fi.Directory.FullName)

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static CallbackMessageAggregate EmptyCallbackMessageAggregate()`
`41`	`41`
`42`	`42`	`public static CallbackMessageAggregate RecordedCallbackMessageAggregate()`
`43`	`43`	`{`
`44`		`- CallbackMessageAggregate aggregate = new CallbackMessageAggregate();`
	`44`	`+ CallbackMessageAggregate aggregate = new();`
`45`	`45`	`aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, (MessageFormat)TestData.MessageFormat,`
`46`	`46`	`TestData.CallbackMessage, TestData.Reference, TestData.Destinations, EstateReference, MerchantReference);`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class CallbackMessageAggregateTests`
`20`	`20`	`[Fact]`
`21`	`21`	`public void CallbackMessageAggregate_RecordCallback_CallbackIsRecorded()`
`22`	`22`	`{`
`23`		`- CallbackMessageAggregate aggregate = new CallbackMessageAggregate();`
	`23`	`+ CallbackMessageAggregate aggregate = new();`
`24`	`24`
`25`	`25`	`Result result = aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, MessageFormat.JSON, TestData.CallbackMessage, TestData.Reference, TestData.Destinations,`
`26`	`26`	`TestData.EstateReference, TestData.MerchantReference);`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public async Task StartSystem()`
`49`	`49`	`{`
`50`	`50`	`// Initialise a logger`
`51`	`51`	`String scenarioName = this.ScenarioContext.ScenarioInfo.Title.Replace(" ", "");`
`52`		`- NlogLogger logger = new NlogLogger();`
	`52`	`+ NlogLogger logger = new();`
`53`	`53`	`logger.Initialise(LogManager.GetLogger(scenarioName), scenarioName);`
`54`	`54`	`LogManager.AddHiddenAssembly(typeof(NlogLogger).Assembly);`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ public async Task GivenIHaveTheFollowingBankDepositCallbacks(DataTable table)`
`40`	`40`	`[When(@"I send the requests to the callback handler for deposits")]`
`41`	`41`	`public async Task WhenISendTheRequestsToTheCallbackHandlerForDeposits()`
`42`	`42`	`{`
`43`		`- using HttpClient client = new HttpClient();`
	`43`	`+ using HttpClient client = new();`
`44`	`44`	`foreach (var testingContextDeposit in this.TestingContext.Deposits)`
`45`	`45`	`{`
`46`	`46`	`String requestUri =`
`47`	`47`	`$"http://localhost:{this.TestingContext.DockerHelper.GetCallbackHandlerPort()}/api/callbacks";`
`48`		`- HttpRequestMessage msg = new HttpRequestMessage(HttpMethod.Post, requestUri);`
	`48`	`+ HttpRequestMessage msg = new(HttpMethod.Post, requestUri);`
`49`	`49`	`var payload = JsonConvert.SerializeObject(testingContextDeposit);`
`50`	`50`
`51`	`51`	`msg.Content = new StringContent(payload, Encoding.UTF8,`
`@@ -63,12 +63,12 @@ public async Task WhenISendTheRequestsToTheCallbackHandlerForDeposits()`
`63`	`63`	`[Then("the deposit records are recorded")]`
`64`	`64`	`public async Task ThenTheDepositRecordsAreRecorded()`
`65`	`65`	`{`
`66`		`- using HttpClient client = new HttpClient();`
	`66`	`+ using HttpClient client = new();`
`67`	`67`	`foreach (var sentCallback in this.TestingContext.SentCallbacks)`
`68`	`68`	`{`
`69`	`69`	`String requestUri =`
`70`	`70`	`$"http://localhost:{this.TestingContext.DockerHelper.GetCallbackHandlerPort()}/api/callbacks/{sentCallback.Key}";`
`71`		`- HttpRequestMessage msg = new HttpRequestMessage(HttpMethod.Get, requestUri);`
	`71`	`+ HttpRequestMessage msg = new(HttpMethod.Get, requestUri);`
`72`	`72`	`var response = await client.SendAsync(msg);`
`73`	`73`	`response.StatusCode.ShouldBe(HttpStatusCode.OK);`
`74`	`74`
`@@ -90,10 +90,10 @@ public static class ReqnrollExtensions`
`90`	`90`	`{`
`91`	`91`	`public static List<Deposit> ToDepositRequests(this DataTableRows tableRows)`
`92`	`92`	`{`
`93`		`- List<Deposit> requests = new List<Deposit>();`
	`93`	`+ List<Deposit> requests = new();`
`94`	`94`	`foreach (DataTableRow tableRow in tableRows)`
`95`	`95`	`{`
`96`		`- Deposit depositCallback = new Deposit`
	`96`	`+ Deposit depositCallback = new()`
`97`	`97`	`{`
`98`	`98`	`AccountNumber = ReqnrollTableHelper.GetStringRowValue(tableRow, "AccountNumber"),`
`99`	`99`	`Amount = ReqnrollTableHelper.GetDecimalValue(tableRow, "Amount"),`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public static void Main(string[] args)`
`31`	`31`	`public static IHostBuilder CreateHostBuilder(string[] args)`
`32`	`32`	`{`
`33`	`33`	`//At this stage, we only need our hosting file for ip and ports`
	`34`	`+`
`34`	`35`	`FileInfo fi = new(typeof(Program).Assembly.Location);`
`35`	`36`
`36`	`37`	`IConfigurationRoot config = new ConfigurationBuilder().SetBasePath(fi.Directory.FullName)`