Code reformatting

CHANGELOG

@@ -1,3 +1,6 @@
+[vnext]
+- Did a complete code cleanup and refactoring in the .NET project (https://github.com/dukeofharen/httplaceholder/pull/346/files).
+
 [2024.2.24]
 - Upgraded application to .NET 8 (https://github.com/dukeofharen/httplaceholder/pull/338).
 - Use file watches to check if the .yml stub files are updated on disk (https://github.com/dukeofharen/httplaceholder/pull/339).

gui/package.json

@@ -9,57 +9,57 @@
     "lint": "eslint . --ext .vue,.js,.jsx,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
   },
   "dependencies": {
-    "@codemirror/lang-html": "^6.4.7",
+    "@codemirror/lang-html": "^6.4.8",
     "@codemirror/lang-json": "^6.0.1",
-    "@codemirror/lang-markdown": "^6.2.3",
-    "@codemirror/lang-xml": "^6.0.2",
-    "@codemirror/language": "^6.9.3",
+    "@codemirror/lang-markdown": "^6.2.4",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/language": "^6.10.1",
     "@codemirror/legacy-modes": "^6.3.3",
-    "@codemirror/view": "^6.22.1",
-    "@fontsource/roboto-mono": "^5.0.16",
+    "@codemirror/view": "^6.26.0",
+    "@fontsource/roboto-mono": "^5.0.17",
     "@lezer/highlight": "^1.2.0",
     "@microsoft/signalr": "^8.0.0",
-    "bootstrap": "^5.3.2",
-    "bootstrap-icons": "^1.11.2",
+    "bootstrap": "^5.3.3",
+    "bootstrap-icons": "^1.11.3",
     "codemirror": "^6.0.1",
     "dayjs": "^1.11.10",
     "highlight.js": "^11.9.0",
     "js-yaml": "^4.1.0",
-    "marked": "^11.0.0",
+    "marked": "^12.0.1",
     "mime-types": "^2.1.35",
     "pinia": "^2.1.7",
     "sprintf-js": "^1.1.3",
     "toastr": "^2.1.4",
-    "vue": "^3.3.10",
-    "vue-pdf-embed": "^1.2.1",
-    "vue-router": "^4.2.5",
+    "vue": "^3.4.21",
+    "vue-pdf-embed": "^2.0.2",
+    "vue-router": "^4.3.0",
     "vue3-slide-up-down": "^2.0.1",
-    "xml-formatter": "^3.6.0"
+    "xml-formatter": "^3.6.2"
   },
   "devDependencies": {
-    "@babel/types": "^7.23.5",
-    "@rushstack/eslint-patch": "^1.6.0",
+    "@babel/types": "^7.24.0",
+    "@rushstack/eslint-patch": "^1.7.2",
     "@types/bootstrap": "^5.2.10",
     "@types/js-yaml": "^4.0.9",
     "@types/jsdom": "^21.1.6",
     "@types/marked": "^5.0.2",
     "@types/mime-types": "^2.1.4",
-    "@types/node": "^20.10.3",
+    "@types/node": "^20.11.28",
     "@types/sprintf-js": "^1.1.4",
     "@types/toastr": "^2.1.43",
-    "@vitejs/plugin-vue": "^4.5.1",
-    "@vue/eslint-config-prettier": "^8.0.0",
-    "@vue/eslint-config-typescript": "^12.0.0",
-    "@vue/tsconfig": "^0.4.0",
-    "eslint": "^8.55.0",
-    "eslint-plugin-vue": "^9.19.2",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "@vue/eslint-config-prettier": "^9.0.0",
+    "@vue/eslint-config-typescript": "^13.0.0",
+    "@vue/tsconfig": "^0.5.1",
+    "eslint": "^8.57.0",
+    "eslint-plugin-vue": "^9.23.0",
     "fs-extra": "^11.2.0",
-    "jsdom": "^23.0.1",
+    "jsdom": "^24.0.0",
     "mustache": "^4.2.0",
-    "prettier": "^3.1.0",
-    "sass": "^1.69.5",
-    "typescript": "~5.3.3",
-    "vite": "^5.0.6",
-    "vue-tsc": "^1.8.25"
+    "prettier": "^3.2.5",
+    "sass": "^1.72.0",
+    "typescript": "~5.4.2",
+    "vite": "^5.1.6",
+    "vue-tsc": "^2.0.6"
   }
 }

gui/src/components/bootstrap/Modal.vue

@@ -2,7 +2,7 @@
   <div class="modal fade" tabindex="-1" ref="modal" @keyup.enter="onYesClick">
     <div class="modal-dialog">
       <div class="modal-content">
-        <div class="modal-header">
+        <div class="modal-header d-flex justify-content-between">
           <h5 class="modal-title">{{ title }}</h5>
           <button
             type="button"

scripts/Install-Windows.ps1

@@ -1,5 +1,6 @@
 # This is added to ensure that the whole script is downloaded before running it.
-if ($True) {
+if ($True)
+{
     $global:ProgressPreference = 'SilentlyContinue'
     $ErrorActionPreference = "Stop"
     $tempDir = [System.IO.Path]::GetTempPath()
@@ -21,8 +22,9 @@ if ($True) {
     Invoke-WebRequest -Uri $downloadUrl -UseBasicParsing -OutFile $downloadPath
 
     $mainDrive = (Get-Item $env:windir).PSDrive.Name
-    $installLocation = "$($mainDrive):\httplaceholder"
-    if (Test-Path $installLocation) {
+    $installLocation = "$( $mainDrive ):\httplaceholder"
+    if (Test-Path $installLocation)
+    {
         Write-Host "Removing directory $installLocation"
         Remove-Item -Path $installLocation -Recurse -Force
     }
@@ -31,7 +33,8 @@ if ($True) {
     Expand-Archive -Path $downloadPath -DestinationPath $installLocation
 
     $pathVar = [Environment]::GetEnvironmentVariable("Path", [System.EnvironmentVariableTarget]::Machine)
-    if (!($pathVar -match [regex]::Escape($installLocation))) {
+    if (!($pathVar -match [regex]::Escape($installLocation)))
+    {
         Write-Host "Adding path $installLocation to the path variable"
         $newPath = "$pathVar;$installLocation"
         [Environment]::SetEnvironmentVariable("Path", $newPath, [System.EnvironmentVariableTarget]::Machine)

scripts/buildscript/installscripts/windows/Add-Path-Var.ps1

@@ -1,14 +1,14 @@
 # Make sure the install folder is added to the system path variable after install.
 Param(
-    [Parameter(Mandatory=$True)]
+    [Parameter(Mandatory = $True)]
     [string]$installFolder
 )
 
 $environmentLocation = "hklm:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment"
 $environment = Get-ItemProperty $environmentLocation
 $pathVar = $environment.Path
-if(!($pathVar -like "*$installFolder*"))
+if (!($pathVar -like "*$installFolder*"))
 {
-   $pathVar = "$pathVar;$installFolder"
-   New-ItemProperty -Path $environmentLocation -Name "Path" -Value $pathVar -Force
+    $pathVar = "$pathVar;$installFolder"
+    New-ItemProperty -Path $environmentLocation -Name "Path" -Value $pathVar -Force
 }

scripts/buildscript/installscripts/windows/Install-Private-Key.ps1

@@ -1,5 +1,6 @@
 $pfxFile = Join-Path -Path $PSScriptRoot "key.pfx"
-if(!(Test-Path $pfxFile)) {
+if (!(Test-Path $pfxFile))
+{
     Write-Error "File $pfxFile not found."
     Exit -1
 }

scripts/buildscript/installscripts/windows/Remove-Path-Var.ps1

@@ -1,6 +1,6 @@
 # Make sure the install folder is removed from the path variable after deinstallation.
 Param(
-    [Parameter(Mandatory=$True)]
+    [Parameter(Mandatory = $True)]
     [string]$installFolder
 )
 

src/HttPlaceholder.Application.Tests/Configuration/Commands/UpdateConfigurationValueCommandHandlerFacts.cs

@@ -1,5 +1,4 @@
-using HttPlaceholder.Application.Configuration.Commands.UpdateConfigurationValue;
-using HttPlaceholder.Application.Configuration.Provider;
+using HttPlaceholder.Application.Configuration.Commands;
 using HttPlaceholder.Application.Exceptions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.Memory;
@@ -11,7 +10,7 @@ public class UpdateConfigurationValueCommandHandlerFacts
 {
     private readonly Mock<IConfigurationRoot> _configurationRootMock = new();
     private readonly AutoMocker _mocker = new();
-    private readonly HttPlaceholderConfigurationProvider _provider = new(new MemoryConfigurationSource());
+    private readonly MemoryConfigurationProvider _provider = new(new MemoryConfigurationSource());
 
     [TestInitialize]
     public void Initialize() => _mocker.Use<IConfiguration>(_configurationRootMock.Object);
@@ -94,13 +93,14 @@ public async Task Handle_HappyFlow(string value)
 
         _configurationRootMock
             .Setup(m => m.Providers)
-            .Returns(new[] {_provider});
+            .Returns(new[] { _provider });
 
         // Act
         await handler.Handle(request, CancellationToken.None);
 
         // Assert
         Assert.IsTrue(_provider.TryGet("Storage:StoreResponses", out var foundValue));
         Assert.AreEqual(value, foundValue);
+        _configurationRootMock.Verify(m => m.Reload());
     }
 }

src/HttPlaceholder.Application.Tests/Configuration/Queries/GetConfigurationQueryHandlerFacts.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using HttPlaceholder.Application.Configuration.Queries.GetConfiguration;
+using HttPlaceholder.Application.Configuration.Queries;
 using HttPlaceholder.Domain.Enums;
 using Microsoft.Extensions.Configuration;
 
@@ -20,7 +20,7 @@ public async Task Handle_HappyFlow()
         // Arrange
         var testConfig = new Dictionary<string, string>
         {
-            {"Authentication:ApiUsername", "value1"}, {"Authentication:ApiPassword", "value2"}
+            { "Authentication:ApiUsername", "value1" }, { "Authentication:ApiPassword", "value2" }
         };
         var configuration = new ConfigurationBuilder()
             .AddInMemoryCollection(testConfig)

src/HttPlaceholder.Application.Tests/Export/Implementations/RequestToCurlCommandServiceFacts.cs

@@ -12,22 +12,22 @@ public class RequestToCurlCommandServiceFacts
     public static IEnumerable<object[]> TestData =>
         new[]
         {
-            new object[]
-            {
+            [
                 CreateModel("GET", "http://localhost:5000/url",
-                    new Dictionary<string, string> {{"Accept", "*/*"}}),
+                    new Dictionary<string, string> { { "Accept", "*/*" } }),
                 "curl 'http://localhost:5000/url' -H 'Accept: */*'"
-            },
-            new object[]
-            {
+            ],
+            [
                 CreateModel("DELETE", "http://localhost:5000/url",
-                    new Dictionary<string, string> {{"Accept", "*/*"}}),
+                    new Dictionary<string, string> { { "Accept", "*/*" } }),
                 "curl -X DELETE 'http://localhost:5000/url' -H 'Accept: */*'"
-            },
-            new object[]
-            {
+            ],
+            [
                 CreateModel("POST", "http://localhost:5000/url",
-                    new Dictionary<string, string> {{"Accept", "*/*"}, {"Content-Type", "application/json"}, {"Content-Length", "100"}},
+                    new Dictionary<string, string>
+                    {
+                        { "Accept", "*/*" }, { "Content-Type", "application/json" }, { "Content-Length", "100" }
+                    },
                     """
                     {
                         "key": "val"
@@ -38,11 +38,14 @@ public class RequestToCurlCommandServiceFacts
                     "key": "val"
                 }'
                 """
-            },
+            ],
             new object[]
             {
                 CreateModel("PUT", "http://localhost:5000/url",
-                    new Dictionary<string, string> {{"Accept", "*/*"}, {"Content-Type", "application/json"}, {"Content-Length", "100"}},
+                    new Dictionary<string, string>
+                    {
+                        { "Accept", "*/*" }, { "Content-Type", "application/json" }, { "Content-Length", "100" }
+                    },
                     """
                     {
                         "key": "val"

src/HttPlaceholder.Application.Tests/Export/Implementations/RequestToHarServiceFacts.cs

@@ -39,19 +39,19 @@ public void Convert_HappyFlow()
                 Method = "POST",
                 Headers = new Dictionary<string, string>
                 {
-                    {HeaderKeys.ContentType, "application/json"}, {"X-Some-Header", "SomeValue"}
+                    { HeaderKeys.ContentType, "application/json" }, { "X-Some-Header", "SomeValue" }
                 },
-                BinaryBody = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new {key = "val"})),
+                BinaryBody = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new { key = "val" })),
                 Url = "http://localhost:5000/some-url?q1=v1&q2=v2"
             }
         };
         var response = new ResponseModel
         {
             Headers = new Dictionary<string, string>
             {
-                {HeaderKeys.ContentType, "application/json"}, {"X-Some-Header", "SomeValue"}
+                { HeaderKeys.ContentType, "application/json" }, { "X-Some-Header", "SomeValue" }
             },
-            Body = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new {key = "responsevalue"})),
+            Body = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new { key = "responsevalue" })),
             BodyIsBinary = false,
             StatusCode = 200
         };
@@ -129,21 +129,15 @@ public void Convert_HappyFlow_BinaryResponse()
             RequestParameters = new RequestParametersModel
             {
                 Method = "POST",
-                Headers = new Dictionary<string, string>
-                {
-                    {HeaderKeys.ContentType, "application/json"}
-                },
-                BinaryBody = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new {key = "val"})),
+                Headers = new Dictionary<string, string> { { HeaderKeys.ContentType, "application/json" } },
+                BinaryBody = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(new { key = "val" })),
                 Url = "http://localhost:5000/some-url?q1=v1&q2=v2"
             }
         };
         var response = new ResponseModel
         {
-            Headers = new Dictionary<string, string>
-            {
-                {HeaderKeys.ContentType, "image/png"}
-            },
-            Body = new byte[] {1, 2, 3},
+            Headers = new Dictionary<string, string> { { HeaderKeys.ContentType, "image/png" } },
+            Body = [1, 2, 3],
             BodyIsBinary = true,
             StatusCode = 200
         };

src/HttPlaceholder.Application.Tests/Export/Queries/ExportRequestQueryHandlerFacts.cs

@@ -1,6 +1,6 @@
 using HttPlaceholder.Application.Exceptions;
 using HttPlaceholder.Application.Export;
-using HttPlaceholder.Application.Export.Queries.ExportRequest;
+using HttPlaceholder.Application.Export.Queries;
 using HttPlaceholder.Application.StubExecution;
 using HttPlaceholder.Domain.Enums;
 
@@ -38,7 +38,8 @@ public async Task Handle_RequestNotFound_ShouldThrowNotFoundException()
     [DataTestMethod]
     [DataRow(RequestExportType.Hurl)]
     [DataRow(RequestExportType.NotSet)]
-    public async Task Handle_RequestExportTypeNotSupported_ShouldThrowNotImplementedException(RequestExportType requestExportType)
+    public async Task Handle_RequestExportTypeNotSupported_ShouldThrowNotImplementedException(
+        RequestExportType requestExportType)
     {
         // Arrange
         var stubContextMock = _mocker.GetMock<IStubContext>();

src/HttPlaceholder.Application.Tests/HttPlaceholder.Application.Tests.csproj

@@ -22,7 +22,6 @@
     <ItemGroup>
         <ProjectReference Include="..\HttPlaceholder.Application\HttPlaceholder.Application.csproj" />
         <ProjectReference Include="..\HttPlaceholder.Infrastructure\HttPlaceholder.Infrastructure.csproj" />
-        <ProjectReference Include="..\HttPlaceholder.Resources\HttPlaceholder.Resources.csproj" />
         <ProjectReference Include="..\HttPlaceholder.TestUtilities\HttPlaceholder.TestUtilities.csproj" />
     </ItemGroup>
 

src/HttPlaceholder.Application.Tests/Import/Commands/CreateCurlStubCommandHandlerFacts.cs

@@ -1,4 +1,4 @@
-using HttPlaceholder.Application.Import.Commands.CreateCurlStub;
+using HttPlaceholder.Application.Import.Commands;
 using HttPlaceholder.Application.StubExecution;
 
 namespace HttPlaceholder.Application.Tests.Import.Commands;
@@ -20,7 +20,7 @@ public async Task Handle_HappyFlow_TenantSet()
 
         const string tenant = "tenant1";
         var request = new CreateCurlStubCommand("curl bladibla", true, tenant, "prefix");
-        var expectedResult = new[] {new FullStubModel()};
+        var expectedResult = new[] { new FullStubModel() };
         curlStubGeneratorMock
             .Setup(m => m.GenerateStubsAsync(request.Input, request.DoNotCreateStub, tenant, "prefix",
                 It.IsAny<CancellationToken>()))
@@ -41,7 +41,7 @@ public async Task Handle_HappyFlow_TenantNotSet()
         var handler = _mocker.CreateInstance<CreateCurlStubCommandHandler>();
 
         var request = new CreateCurlStubCommand("curl bladibla", true, null, "prefix");
-        var expectedResult = new[] {new FullStubModel()};
+        var expectedResult = new[] { new FullStubModel() };
         string capturedTenant = null;
         curlStubGeneratorMock
             .Setup(m => m.GenerateStubsAsync(request.Input, request.DoNotCreateStub, It.IsAny<string>(), "prefix",

src/HttPlaceholder.Application.Tests/Import/Commands/CreateHarStubCommandHandlerFacts.cs

@@ -1,4 +1,4 @@
-using HttPlaceholder.Application.Import.Commands.CreateHarStub;
+using HttPlaceholder.Application.Import.Commands;
 using HttPlaceholder.Application.StubExecution;
 
 namespace HttPlaceholder.Application.Tests.Import.Commands;

src/HttPlaceholder.Application.Tests/Import/Commands/CreateOpenApiStubCommandHandlerFacts.cs

@@ -1,4 +1,4 @@
-using HttPlaceholder.Application.Import.Commands.CreateOpenApiStub;
+using HttPlaceholder.Application.Import.Commands;
 using HttPlaceholder.Application.StubExecution;
 
 namespace HttPlaceholder.Application.Tests.Import.Commands;