diff --git a/Chapter-1-initial-architecture/Src/Fitnet.AppHost/Fitnet.AppHost.csproj b/Chapter-1-initial-architecture/Src/Fitnet.AppHost/Fitnet.AppHost.csproj index c40ca4eb..02030611 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.AppHost/Fitnet.AppHost.csproj +++ b/Chapter-1-initial-architecture/Src/Fitnet.AppHost/Fitnet.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -10,13 +9,12 @@ - - + - + diff --git a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/BussinessRulesArchitectureTests.cs b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/BussinessRulesArchitectureTests.cs index 06d9b7e1..e8f9a245 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/BussinessRulesArchitectureTests.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/BussinessRulesArchitectureTests.cs @@ -18,7 +18,7 @@ internal void BusinessRules_Should_Not_Have_Dependency_On_Module(string forbidde .HaveNameEndingWith(forbiddenTypeEnding); // Act - var validationResult = forbiddenTypes!.Should().NotHaveDependencyOnAny(businessRules).GetResult(); + var validationResult = forbiddenTypes.Should().NotHaveDependencyOnAny(businessRules).GetResult(); // Assert validationResult.FailingTypes.ShouldBeNull(); diff --git a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/ContractsArchitectureTests.cs b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/ContractsArchitectureTests.cs index 56b9ffea..b79acc24 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/ContractsArchitectureTests.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/ContractsArchitectureTests.cs @@ -24,7 +24,7 @@ internal void Contracts_should_not_have_dependency_on_module(string moduleName) var rules = contractsModule .Should() .NotHaveDependencyOnAny(forbiddenModuleTypes); - var validationResult = rules!.GetResult(); + var validationResult = rules.GetResult(); // Assert validationResult.FailingTypes.ShouldBeNull(); diff --git a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/OffersArchitectureTests.cs b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/OffersArchitectureTests.cs index 541e8295..c4caca7c 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/OffersArchitectureTests.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/OffersArchitectureTests.cs @@ -25,7 +25,7 @@ internal void Offers_should_not_have_dependency_on_module(string moduleName) var rules = offersModule .Should() .NotHaveDependencyOnAny(forbiddenModuleTypes); - var validationResult = rules!.GetResult(); + var validationResult = rules.GetResult(); // Assert validationResult.FailingTypes.ShouldBeNull(); @@ -49,7 +49,7 @@ public void OffersShouldCommunicateWithPassesViaEvents() var rules = offersModule .Should() .NotHaveDependencyOnAny(forbiddenModuleTypes); - var validationResult = rules!.GetResult(); + var validationResult = rules.GetResult(); // Assert validationResult.FailingTypes.ShouldBeNull(); diff --git a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/PassesArchitectureTests.cs b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/PassesArchitectureTests.cs index d864b62b..6d0b46c7 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/PassesArchitectureTests.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/PassesArchitectureTests.cs @@ -25,7 +25,7 @@ internal void Passes_should_not_have_dependency_on_module(string moduleName) var rules = passesModule .Should() .NotHaveDependencyOnAny(forbiddenModuleTypes); - var validationResult = rules!.GetResult(); + var validationResult = rules.GetResult(); // Assert validationResult.FailingTypes.ShouldBeNull(); @@ -50,7 +50,7 @@ internal void PassesShouldCommunicateWithContractViaEvents() var rules = passesModule .Should() .NotHaveDependencyOnAny(forbiddenModuleTypes); - var validationResult = rules!.GetResult(); + var validationResult = rules.GetResult(); // Assert validationResult.FailingTypes.ShouldBeNull(); diff --git a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/ReportsArchitectureTests.cs b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/ReportsArchitectureTests.cs index bf026a20..bb877b95 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/ReportsArchitectureTests.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet.ArchitectureTests/ReportsArchitectureTests.cs @@ -24,7 +24,7 @@ internal void Reports_should_not_have_dependency_on_module(string moduleName) var rules = reportsModule .Should() .NotHaveDependencyOnAny(forbiddenModuleTypes); - var validationResult = rules!.GetResult(); + var validationResult = rules.GetResult(); // Assert validationResult.FailingTypes.ShouldBeNull(); diff --git a/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Common/Events/EventBus/InMemory/InMemoryEventBusTests.cs b/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Common/Events/EventBus/InMemory/InMemoryEventBusTests.cs index 5b2226e5..cdcda0cd 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Common/Events/EventBus/InMemory/InMemoryEventBusTests.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet.IntegrationTests/Common/Events/EventBus/InMemory/InMemoryEventBusTests.cs @@ -19,7 +19,7 @@ internal async Task Given_valid_event_published_Then_event_should_be_consumed() var fakeEvent = FakeEvent.Create(); // Act - await eventBus!.PublishAsync(fakeEvent, CancellationToken.None); + await eventBus.PublishAsync(fakeEvent, CancellationToken.None); // Assert fakeEvent.Consumed.ShouldBeTrue(); @@ -27,7 +27,7 @@ internal async Task Given_valid_event_published_Then_event_should_be_consumed() private IEventBus GetEventBus() => _applicationInMemory.Services - .CreateScope()! + .CreateScope() .ServiceProvider .GetRequiredService(); } diff --git a/Chapter-1-initial-architecture/Src/Fitnet/Common/Documentation/SwaggerDocumentationExtensions.cs b/Chapter-1-initial-architecture/Src/Fitnet/Common/Documentation/SwaggerDocumentationExtensions.cs index ae7bce7c..b6a9cca4 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet/Common/Documentation/SwaggerDocumentationExtensions.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet/Common/Documentation/SwaggerDocumentationExtensions.cs @@ -3,7 +3,7 @@ internal static class ApiDocumentationExtensions { internal static void UseApiDocumentation(this IEndpointRouteBuilder app) => - app.MapGet("/", () => Results.Redirect("/swagger")) + app.MapGet("/", () => Results.Redirect("/docs/v1")) .WithSummary("Documentation for the API") .WithDescription("This endpoint is used to redirect to the documentation for the API.") .Produces(StatusCodes.Status200OK) diff --git a/Chapter-1-initial-architecture/Src/Fitnet/Fitnet.csproj b/Chapter-1-initial-architecture/Src/Fitnet/Fitnet.csproj index e49eebca..63ec28b4 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet/Fitnet.csproj +++ b/Chapter-1-initial-architecture/Src/Fitnet/Fitnet.csproj @@ -14,7 +14,7 @@ - + diff --git a/Chapter-1-initial-architecture/Src/Fitnet/Program.cs b/Chapter-1-initial-architecture/Src/Fitnet/Program.cs index 5a502426..a2caa2ca 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet/Program.cs +++ b/Chapter-1-initial-architecture/Src/Fitnet/Program.cs @@ -7,13 +7,13 @@ using EvolutionaryArchitecture.Fitnet.Offers; using EvolutionaryArchitecture.Fitnet.Passes; using EvolutionaryArchitecture.Fitnet.Reports; +using Scalar.AspNetCore; var builder = WebApplication.CreateBuilder(args); builder.Services.AddControllers(); builder.Services.AddExceptionHandling(); -builder.Services.AddEndpointsApiExplorer(); -builder.Services.AddSwaggerGen(); +builder.Services.AddOpenApi(); builder.Services.AddEventBus(); builder.Services.AddRequestsValidations(); builder.Services.AddClock(); @@ -27,8 +27,8 @@ if (app.Environment.IsDevelopment()) { - app.UseSwagger(); - app.UseSwaggerUI(); + app.MapOpenApi(); + app.MapScalarApiReference("/docs/v1"); } app.UseApiDocumentation(); diff --git a/Chapter-1-initial-architecture/Src/Fitnet/Properties/launchSettings.json b/Chapter-1-initial-architecture/Src/Fitnet/Properties/launchSettings.json index 180f6314..5e0438fd 100644 --- a/Chapter-1-initial-architecture/Src/Fitnet/Properties/launchSettings.json +++ b/Chapter-1-initial-architecture/Src/Fitnet/Properties/launchSettings.json @@ -13,7 +13,7 @@ "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, - "launchUrl": "swagger", + "launchUrl": "docs/v1", "applicationUrl": "http://localhost:5013", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" @@ -23,19 +23,11 @@ "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, - "launchUrl": "swagger", + "launchUrl": "docs/v1", "applicationUrl": "https://localhost:7098;http://localhost:5014", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } } } }