More structure changes to the console app

src/BuslyCLI.Console/Commands/Demo/StartCommand.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using BuslyCLI.Commands.Transport;
 using BuslyCLI.Config;
-using BuslyCLI.Factories;
+using BuslyCLI.Infrastructure.Factories;
 using Spectre.Console;
 using Spectre.Console.Cli;
 

src/BuslyCLI.Console/Commands/Command/SendCommand.cs → src/BuslyCLI.Console/Commands/NsbCommand/SendCommand.cs

@@ -1,11 +1,11 @@
 using System.Text;
 using BuslyCLI.Config;
-using BuslyCLI.Factories;
+using BuslyCLI.Infrastructure.Factories;
 using NServiceBus.Routing;
 using NServiceBus.Transport;
 using Spectre.Console.Cli;
 
-namespace BuslyCLI.Commands.Command;
+namespace BuslyCLI.Commands.NsbCommand;
 
 public class SendCommand(IRawEndpointFactory rawEndpointFactory, INServiceBusConfiguration nServiceBusConfiguration) : AsyncCommand<SendCommandSettings>
 {

src/BuslyCLI.Console/Commands/Command/SendCommandSettings.cs → src/BuslyCLI.Console/Commands/NsbCommand/SendCommandSettings.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Commands.Command;
+namespace BuslyCLI.Commands.NsbCommand;
 
 public class SendCommandSettings : CommonCommandSettings
 {

src/BuslyCLI.Console/Commands/Event/PublishCommand.cs → src/BuslyCLI.Console/Commands/NsbEvent/PublishCommand.cs

@@ -2,12 +2,12 @@
 using System.Reflection.Emit;
 using System.Text;
 using BuslyCLI.Config;
-using BuslyCLI.Factories;
+using BuslyCLI.Infrastructure.Factories;
 using NServiceBus.Routing;
 using NServiceBus.Transport;
 using Spectre.Console.Cli;
 
-namespace BuslyCLI.Commands.Event;
+namespace BuslyCLI.Commands.NsbEvent;
 
 public class PublishCommand(IRawEndpointFactory rawEndpointFactory, INServiceBusConfiguration nServiceBusConfiguration) : AsyncCommand<PublishCommandSettings>
 {

src/BuslyCLI.Console/Commands/Event/PublishCommandSettings.cs → src/BuslyCLI.Console/Commands/NsbEvent/PublishCommandSettings.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Commands.Event;
+namespace BuslyCLI.Commands.NsbEvent;
 
 public class PublishCommandSettings : CommonMessageSettings
 {

src/BuslyCLI.Console/Commands/Transport/ListTransportsCommand.cs

@@ -1,4 +1,5 @@
 using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using Spectre.Console;
 using Spectre.Console.Cli;
 

src/BuslyCLI.Console/Config/TransportConfig.cs

@@ -1,4 +1,5 @@
-using YamlDotNet.Serialization;
+using BuslyCLI.Config.Transports;
+using YamlDotNet.Serialization;
 
 namespace BuslyCLI.Config;
 

src/BuslyCLI.Console/Config/AmazonsqsTransportConfig.cs → src/BuslyCLI.Console/Config/Transports/AmazonsqsTransportConfig.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Config;
+namespace BuslyCLI.Config.Transports;
 
 
 public class AmazonsqsTransportConfig : ITransportConfig

src/BuslyCLI.Console/Config/AzureServiceBusTransportConfig.cs → src/BuslyCLI.Console/Config/Transports/AzureServiceBusTransportConfig.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Config;
+namespace BuslyCLI.Config.Transports;
 
 public class AzureServiceBusTransportConfig : ITransportConfig
 {

src/BuslyCLI.Console/Config/AzureStorageQueuesTransportConfig.cs → src/BuslyCLI.Console/Config/Transports/AzureStorageQueuesTransportConfig.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Config;
+namespace BuslyCLI.Config.Transports;
 
 public class AzureStorageQueuesTransportConfig : ITransportConfig
 {

src/BuslyCLI.Console/Config/ITransportConfig.cs → src/BuslyCLI.Console/Config/Transports/ITransportConfig.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Config;
+namespace BuslyCLI.Config.Transports;
 
 public interface ITransportConfig
 {

src/BuslyCLI.Console/Config/LearningTransportConfig.cs → src/BuslyCLI.Console/Config/Transports/LearningTransportConfig.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Config;
+namespace BuslyCLI.Config.Transports;
 
 public class LearningTransportConfig : ITransportConfig
 {

src/BuslyCLI.Console/Config/PostgreSqlTransportConfig.cs → src/BuslyCLI.Console/Config/Transports/PostgreSqlTransportConfig.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Config;
+namespace BuslyCLI.Config.Transports;
 
 public class PostgreSqlTransportConfig : ITransportConfig
 {

src/BuslyCLI.Console/Config/RabbitmqTransportConfig.cs → src/BuslyCLI.Console/Config/Transports/RabbitmqTransportConfig.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Config;
+namespace BuslyCLI.Config.Transports;
 
 public class RabbitmqTransportConfig : ITransportConfig
 {

src/BuslyCLI.Console/Config/SqlServerTransportConfig.cs → src/BuslyCLI.Console/Config/Transports/SqlServerTransportConfig.cs

@@ -1,4 +1,4 @@
-namespace BuslyCLI.Config;
+namespace BuslyCLI.Config.Transports;
 
 public class SqlServerTransportConfig : ITransportConfig
 {

src/BuslyCLI.Console/Config/Validators/AmazonsqsTransportConfigValidator.cs

@@ -1,4 +1,5 @@
-using FluentValidation;
+using BuslyCLI.Config.Transports;
+using FluentValidation;
 
 namespace BuslyCLI.Config.Validators;
 

src/BuslyCLI.Console/Config/Validators/AzureServiceBusTransportConfigValidator.cs

@@ -1,4 +1,5 @@
-using FluentValidation;
+using BuslyCLI.Config.Transports;
+using FluentValidation;
 
 namespace BuslyCLI.Config.Validators;
 

src/BuslyCLI.Console/Config/Validators/AzureStorageQueuesTransportConfigValidator.cs

@@ -1,4 +1,5 @@
-using FluentValidation;
+using BuslyCLI.Config.Transports;
+using FluentValidation;
 
 namespace BuslyCLI.Config.Validators;
 

src/BuslyCLI.Console/Config/Validators/LearningTransportConfigValidator.cs

@@ -1,4 +1,5 @@
-using FluentValidation;
+using BuslyCLI.Config.Transports;
+using FluentValidation;
 
 namespace BuslyCLI.Config.Validators;
 

src/BuslyCLI.Console/Config/Validators/PostgreSqlTransportConfigValidator.cs

@@ -1,4 +1,5 @@
-using FluentValidation;
+using BuslyCLI.Config.Transports;
+using FluentValidation;
 
 namespace BuslyCLI.Config.Validators;
 

src/BuslyCLI.Console/Config/Validators/RabbitMqTransportConfigValidator.cs

@@ -1,4 +1,5 @@
-using FluentValidation;
+using BuslyCLI.Config.Transports;
+using FluentValidation;
 
 namespace BuslyCLI.Config.Validators;
 

src/BuslyCLI.Console/Config/Validators/SqlServerTransportConfigValidator.cs

@@ -1,4 +1,5 @@
-using FluentValidation;
+using BuslyCLI.Config.Transports;
+using FluentValidation;
 
 namespace BuslyCLI.Config.Validators;
 

src/BuslyCLI.Console/Spectre/AppConfiguration.cs → src/BuslyCLI.Console/Infrastructure/AppConfiguration.cs

@@ -1,12 +1,12 @@
 using System.Reflection;
-using BuslyCLI.Commands.Command;
 using BuslyCLI.Commands.Demo;
-using BuslyCLI.Commands.Event;
+using BuslyCLI.Commands.NsbCommand;
+using BuslyCLI.Commands.NsbEvent;
 using BuslyCLI.Commands.Transport;
 using Spectre.Console;
 using Spectre.Console.Cli;
 
-namespace BuslyCLI.Spectre;
+namespace BuslyCLI.Infrastructure;
 
 public static class AppConfiguration
 {

src/BuslyCLI.Console/Factories/RawEndpoint.cs → src/BuslyCLI.Console/Infrastructure/Endpoints/RawEndpoint.cs

@@ -1,11 +1,11 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Reflection;
 using System.Reflection.Emit;
 using NServiceBus.Extensibility;
 using NServiceBus.Transport;
 using NServiceBus.Unicast.Messages;
 
-namespace BuslyCLI.Factories;
+namespace BuslyCLI.Infrastructure.Endpoints;
 
 public class RawEndpoint(TransportInfrastructure infrastructure, string endpointName) : RawSendOnlyEndpoint(infrastructure, endpointName)
 {

src/BuslyCLI.Console/Factories/RawSendOnlyEndpoint.cs → src/BuslyCLI.Console/Infrastructure/Endpoints/RawSendOnlyEndpoint.cs

@@ -1,6 +1,6 @@
-using NServiceBus.Transport;
+using NServiceBus.Transport;
 
-namespace BuslyCLI.Factories;
+namespace BuslyCLI.Infrastructure.Endpoints;
 
 public class RawSendOnlyEndpoint
 {

src/BuslyCLI.Console/Factories/IRawEndpointFactory.cs → src/BuslyCLI.Console/Infrastructure/Factories/IRawEndpointFactory.cs

@@ -1,6 +1,7 @@
-using TransportConfig = BuslyCLI.Config.TransportConfig;
+using BuslyCLI.Infrastructure.Endpoints;
+using TransportConfig = BuslyCLI.Config.TransportConfig;
 
-namespace BuslyCLI.Factories;
+namespace BuslyCLI.Infrastructure.Factories;
 
 public interface IRawEndpointFactory
 {

src/BuslyCLI.Console/Factories/RawEndpointFactory.cs → src/BuslyCLI.Console/Infrastructure/Factories/RawEndpointFactory.cs

@@ -1,13 +1,14 @@
-using Amazon;
+using Amazon;
 using Amazon.Runtime;
 using Amazon.S3;
 using Amazon.SimpleNotificationService;
 using Amazon.SQS;
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
+using BuslyCLI.Infrastructure.Endpoints;
 using NServiceBus.Transport;
 using TransportConfig = BuslyCLI.Config.TransportConfig;
 
-namespace BuslyCLI.Factories;
+namespace BuslyCLI.Infrastructure.Factories;
 
 public class RawEndpointFactory : IRawEndpointFactory
 {

src/BuslyCLI.Console/DependencyInjection/ServiceCollectionExtensions.cs → src/BuslyCLI.Console/Infrastructure/ServiceCollectionExtensions.cs

@@ -1,12 +1,13 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
-using BuslyCLI.Factories;
+using BuslyCLI.Infrastructure.Factories;
 using FluentValidation;
 using Microsoft.Extensions.DependencyInjection;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
-namespace BuslyCLI.DependencyInjection;
+namespace BuslyCLI.Infrastructure;
 
 public static class ServiceCollectionExtensions
 {

src/BuslyCLI.Console/Program.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
-using BuslyCLI.DependencyInjection;
-using BuslyCLI.Spectre;
+using BuslyCLI.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli;
 using Spectre.Console.Cli.Extensions.DependencyInjection;

tests/BuslyCLI.Console.Tests/Commands/Command/SendCommandTests.cs → tests/BuslyCLI.Console.Tests/Commands/NsbCommand/SendCommandTests.cs

@@ -4,7 +4,7 @@
 // using Spectre.Console.Cli.Extensions.DependencyInjection;
 // using Spectre.Console.Testing;
 //
-// namespace BuslyCLI.Console.Tests.Commands.Command;
+// namespace BuslyCLI.Console.Tests.Commands.NsbCommand;
 //
 // public class SendCommandTests
 // {

tests/BuslyCLI.Console.Tests/Commands/Transport/CurrentTransportTests.cs

@@ -1,6 +1,5 @@
 using BuslyCLI.Console.Tests.TestHelpers;
-using BuslyCLI.DependencyInjection;
-using BuslyCLI.Spectre;
+using BuslyCLI.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Testing;

tests/BuslyCLI.Console.Tests/Commands/Transport/DeleteTransportTests.cs

@@ -1,6 +1,5 @@
 using BuslyCLI.Console.Tests.TestHelpers;
-using BuslyCLI.DependencyInjection;
-using BuslyCLI.Spectre;
+using BuslyCLI.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Testing;

tests/BuslyCLI.Console.Tests/Commands/Transport/ListTransportTests.cs

@@ -1,6 +1,5 @@
 using BuslyCLI.Console.Tests.TestHelpers;
-using BuslyCLI.DependencyInjection;
-using BuslyCLI.Spectre;
+using BuslyCLI.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Testing;

tests/BuslyCLI.Console.Tests/Commands/Transport/SetTransportTests.cs

@@ -1,6 +1,5 @@
 using BuslyCLI.Console.Tests.TestHelpers;
-using BuslyCLI.DependencyInjection;
-using BuslyCLI.Spectre;
+using BuslyCLI.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Extensions.DependencyInjection;
 using Spectre.Console.Cli.Testing;

tests/BuslyCLI.Console.Tests/Config/TransportDefinitionTypeConverterTests.cs

@@ -1,4 +1,5 @@
 using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 using TransportConfig = BuslyCLI.Config.TransportConfig;

tests/BuslyCLI.Console.Tests/Config/Validators/AmazonsqsTransportConfigValidatorTests.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 

tests/BuslyCLI.Console.Tests/Config/Validators/AwsS3BucketSettingsValidatorTests.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 

tests/BuslyCLI.Console.Tests/Config/Validators/AzureServiceBusTransportConfigValidatorTests.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 

tests/BuslyCLI.Console.Tests/Config/Validators/AzureStorageQueuesTransportConfigValidatorTests.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 

tests/BuslyCLI.Console.Tests/Config/Validators/LearningTransportConfigValidatorTests.cs

@@ -1,5 +1,5 @@
 using Bogus;
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 

tests/BuslyCLI.Console.Tests/Config/Validators/ManagementApiConfigValidatorTests.cs

@@ -1,5 +1,5 @@
 using Bogus;
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 

tests/BuslyCLI.Console.Tests/Config/Validators/PostgreSqlTransportConfigValidatorTests.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 

tests/BuslyCLI.Console.Tests/Config/Validators/RabbitMqTransportConfigValidatorTests.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 

tests/BuslyCLI.Console.Tests/Config/Validators/SqlServerTransportConfigValidatorTests.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 

tests/BuslyCLI.Console.Tests/Config/Validators/TransportConfigValidatorTests.cs

@@ -1,5 +1,4 @@
-using BuslyCLI.Config;
-using BuslyCLI.Config.Validators;
+using BuslyCLI.Config.Validators;
 using FluentValidation.TestHelper;
 using TransportConfig = BuslyCLI.Config.TransportConfig;
 

tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/AmazonSqsEndToEndTestBase.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using Testcontainers.LocalStack;
 using TransportConfig = BuslyCLI.Config.TransportConfig;
 

tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/AzureServiceBusEndToEndTestBase.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using Testcontainers.ServiceBus;
 using TransportConfig = BuslyCLI.Config.TransportConfig;
 

tests/BuslyCLI.Console.Tests/EndToEnd/AzureStorageQueues/AzureStorageQueuesEndToEndTestBase.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using Testcontainers.Azurite;
 using TransportConfig = BuslyCLI.Config.TransportConfig;
 

tests/BuslyCLI.Console.Tests/EndToEnd/EndToEndTestBase.cs

@@ -1,9 +1,8 @@
 using System.Text;
 using System.Text.Json;
-using BuslyCLI.Config;
-using BuslyCLI.DependencyInjection;
-using BuslyCLI.Factories;
-using BuslyCLI.Spectre;
+using BuslyCLI.Infrastructure;
+using BuslyCLI.Infrastructure.Endpoints;
+using BuslyCLI.Infrastructure.Factories;
 using Microsoft.Extensions.DependencyInjection;
 using NServiceBus.Transport;
 using Spectre.Console.Cli.Extensions.DependencyInjection;

tests/BuslyCLI.Console.Tests/EndToEnd/Learning/LearningEndToEndTestBase.cs

@@ -1,4 +1,4 @@
-using BuslyCLI.Config;
+using BuslyCLI.Config.Transports;
 using TransportConfig = BuslyCLI.Config.TransportConfig;
 
 namespace BuslyCLI.Console.Tests.EndToEnd.Learning;