diff --git a/src/BuslyCLI.Console/Commands/Demo/StartCommand.cs b/src/BuslyCLI.Console/Commands/Demo/StartCommand.cs index 422d996b..092d4084 100644 --- a/src/BuslyCLI.Console/Commands/Demo/StartCommand.cs +++ b/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; diff --git a/src/BuslyCLI.Console/Commands/Command/SendCommand.cs b/src/BuslyCLI.Console/Commands/NsbCommand/SendCommand.cs similarity index 95% rename from src/BuslyCLI.Console/Commands/Command/SendCommand.cs rename to src/BuslyCLI.Console/Commands/NsbCommand/SendCommand.cs index f5934da7..4717c4c1 100644 --- a/src/BuslyCLI.Console/Commands/Command/SendCommand.cs +++ b/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 { diff --git a/src/BuslyCLI.Console/Commands/Command/SendCommandSettings.cs b/src/BuslyCLI.Console/Commands/NsbCommand/SendCommandSettings.cs similarity index 58% rename from src/BuslyCLI.Console/Commands/Command/SendCommandSettings.cs rename to src/BuslyCLI.Console/Commands/NsbCommand/SendCommandSettings.cs index 64d48616..160aaae8 100644 --- a/src/BuslyCLI.Console/Commands/Command/SendCommandSettings.cs +++ b/src/BuslyCLI.Console/Commands/NsbCommand/SendCommandSettings.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Commands.Command; +namespace BuslyCLI.Commands.NsbCommand; public class SendCommandSettings : CommonCommandSettings { diff --git a/src/BuslyCLI.Console/Commands/Event/PublishCommand.cs b/src/BuslyCLI.Console/Commands/NsbEvent/PublishCommand.cs similarity index 97% rename from src/BuslyCLI.Console/Commands/Event/PublishCommand.cs rename to src/BuslyCLI.Console/Commands/NsbEvent/PublishCommand.cs index 20429945..7cd64c37 100644 --- a/src/BuslyCLI.Console/Commands/Event/PublishCommand.cs +++ b/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 { diff --git a/src/BuslyCLI.Console/Commands/Event/PublishCommandSettings.cs b/src/BuslyCLI.Console/Commands/NsbEvent/PublishCommandSettings.cs similarity index 60% rename from src/BuslyCLI.Console/Commands/Event/PublishCommandSettings.cs rename to src/BuslyCLI.Console/Commands/NsbEvent/PublishCommandSettings.cs index 9cbbd975..b4d9eb0c 100644 --- a/src/BuslyCLI.Console/Commands/Event/PublishCommandSettings.cs +++ b/src/BuslyCLI.Console/Commands/NsbEvent/PublishCommandSettings.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Commands.Event; +namespace BuslyCLI.Commands.NsbEvent; public class PublishCommandSettings : CommonMessageSettings { diff --git a/src/BuslyCLI.Console/Commands/Transport/ListTransportsCommand.cs b/src/BuslyCLI.Console/Commands/Transport/ListTransportsCommand.cs index cee224cc..4291b408 100644 --- a/src/BuslyCLI.Console/Commands/Transport/ListTransportsCommand.cs +++ b/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; diff --git a/src/BuslyCLI.Console/Config/TransportConfig.cs b/src/BuslyCLI.Console/Config/TransportConfig.cs index c75ab3aa..9d7b9d99 100644 --- a/src/BuslyCLI.Console/Config/TransportConfig.cs +++ b/src/BuslyCLI.Console/Config/TransportConfig.cs @@ -1,4 +1,5 @@ -using YamlDotNet.Serialization; +using BuslyCLI.Config.Transports; +using YamlDotNet.Serialization; namespace BuslyCLI.Config; diff --git a/src/BuslyCLI.Console/Config/AmazonsqsTransportConfig.cs b/src/BuslyCLI.Console/Config/Transports/AmazonsqsTransportConfig.cs similarity index 92% rename from src/BuslyCLI.Console/Config/AmazonsqsTransportConfig.cs rename to src/BuslyCLI.Console/Config/Transports/AmazonsqsTransportConfig.cs index c9c09dda..8db33b9c 100644 --- a/src/BuslyCLI.Console/Config/AmazonsqsTransportConfig.cs +++ b/src/BuslyCLI.Console/Config/Transports/AmazonsqsTransportConfig.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Config; +namespace BuslyCLI.Config.Transports; public class AmazonsqsTransportConfig : ITransportConfig diff --git a/src/BuslyCLI.Console/Config/AzureServiceBusTransportConfig.cs b/src/BuslyCLI.Console/Config/Transports/AzureServiceBusTransportConfig.cs similarity index 75% rename from src/BuslyCLI.Console/Config/AzureServiceBusTransportConfig.cs rename to src/BuslyCLI.Console/Config/Transports/AzureServiceBusTransportConfig.cs index 34364a25..8abf87ba 100644 --- a/src/BuslyCLI.Console/Config/AzureServiceBusTransportConfig.cs +++ b/src/BuslyCLI.Console/Config/Transports/AzureServiceBusTransportConfig.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Config; +namespace BuslyCLI.Config.Transports; public class AzureServiceBusTransportConfig : ITransportConfig { diff --git a/src/BuslyCLI.Console/Config/AzureStorageQueuesTransportConfig.cs b/src/BuslyCLI.Console/Config/Transports/AzureStorageQueuesTransportConfig.cs similarity index 75% rename from src/BuslyCLI.Console/Config/AzureStorageQueuesTransportConfig.cs rename to src/BuslyCLI.Console/Config/Transports/AzureStorageQueuesTransportConfig.cs index 2548d807..7163746b 100644 --- a/src/BuslyCLI.Console/Config/AzureStorageQueuesTransportConfig.cs +++ b/src/BuslyCLI.Console/Config/Transports/AzureStorageQueuesTransportConfig.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Config; +namespace BuslyCLI.Config.Transports; public class AzureStorageQueuesTransportConfig : ITransportConfig { diff --git a/src/BuslyCLI.Console/Config/ITransportConfig.cs b/src/BuslyCLI.Console/Config/Transports/ITransportConfig.cs similarity index 50% rename from src/BuslyCLI.Console/Config/ITransportConfig.cs rename to src/BuslyCLI.Console/Config/Transports/ITransportConfig.cs index 5d993eda..fbe5cdaa 100644 --- a/src/BuslyCLI.Console/Config/ITransportConfig.cs +++ b/src/BuslyCLI.Console/Config/Transports/ITransportConfig.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Config; +namespace BuslyCLI.Config.Transports; public interface ITransportConfig { diff --git a/src/BuslyCLI.Console/Config/LearningTransportConfig.cs b/src/BuslyCLI.Console/Config/Transports/LearningTransportConfig.cs similarity index 81% rename from src/BuslyCLI.Console/Config/LearningTransportConfig.cs rename to src/BuslyCLI.Console/Config/Transports/LearningTransportConfig.cs index d2467a43..8e7d3140 100644 --- a/src/BuslyCLI.Console/Config/LearningTransportConfig.cs +++ b/src/BuslyCLI.Console/Config/Transports/LearningTransportConfig.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Config; +namespace BuslyCLI.Config.Transports; public class LearningTransportConfig : ITransportConfig { diff --git a/src/BuslyCLI.Console/Config/PostgreSqlTransportConfig.cs b/src/BuslyCLI.Console/Config/Transports/PostgreSqlTransportConfig.cs similarity index 74% rename from src/BuslyCLI.Console/Config/PostgreSqlTransportConfig.cs rename to src/BuslyCLI.Console/Config/Transports/PostgreSqlTransportConfig.cs index 96320582..ddd038bf 100644 --- a/src/BuslyCLI.Console/Config/PostgreSqlTransportConfig.cs +++ b/src/BuslyCLI.Console/Config/Transports/PostgreSqlTransportConfig.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Config; +namespace BuslyCLI.Config.Transports; public class PostgreSqlTransportConfig : ITransportConfig { diff --git a/src/BuslyCLI.Console/Config/RabbitmqTransportConfig.cs b/src/BuslyCLI.Console/Config/Transports/RabbitmqTransportConfig.cs similarity index 96% rename from src/BuslyCLI.Console/Config/RabbitmqTransportConfig.cs rename to src/BuslyCLI.Console/Config/Transports/RabbitmqTransportConfig.cs index 9e15795a..a9f1adff 100644 --- a/src/BuslyCLI.Console/Config/RabbitmqTransportConfig.cs +++ b/src/BuslyCLI.Console/Config/Transports/RabbitmqTransportConfig.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Config; +namespace BuslyCLI.Config.Transports; public class RabbitmqTransportConfig : ITransportConfig { diff --git a/src/BuslyCLI.Console/Config/SqlServerTransportConfig.cs b/src/BuslyCLI.Console/Config/Transports/SqlServerTransportConfig.cs similarity index 74% rename from src/BuslyCLI.Console/Config/SqlServerTransportConfig.cs rename to src/BuslyCLI.Console/Config/Transports/SqlServerTransportConfig.cs index 5992bfd0..67e314d6 100644 --- a/src/BuslyCLI.Console/Config/SqlServerTransportConfig.cs +++ b/src/BuslyCLI.Console/Config/Transports/SqlServerTransportConfig.cs @@ -1,4 +1,4 @@ -namespace BuslyCLI.Config; +namespace BuslyCLI.Config.Transports; public class SqlServerTransportConfig : ITransportConfig { diff --git a/src/BuslyCLI.Console/Config/Validators/AmazonsqsTransportConfigValidator.cs b/src/BuslyCLI.Console/Config/Validators/AmazonsqsTransportConfigValidator.cs index 37e4b0a0..08d60c0b 100644 --- a/src/BuslyCLI.Console/Config/Validators/AmazonsqsTransportConfigValidator.cs +++ b/src/BuslyCLI.Console/Config/Validators/AmazonsqsTransportConfigValidator.cs @@ -1,4 +1,5 @@ -using FluentValidation; +using BuslyCLI.Config.Transports; +using FluentValidation; namespace BuslyCLI.Config.Validators; diff --git a/src/BuslyCLI.Console/Config/Validators/AzureServiceBusTransportConfigValidator.cs b/src/BuslyCLI.Console/Config/Validators/AzureServiceBusTransportConfigValidator.cs index 10d2da49..aff23a71 100644 --- a/src/BuslyCLI.Console/Config/Validators/AzureServiceBusTransportConfigValidator.cs +++ b/src/BuslyCLI.Console/Config/Validators/AzureServiceBusTransportConfigValidator.cs @@ -1,4 +1,5 @@ -using FluentValidation; +using BuslyCLI.Config.Transports; +using FluentValidation; namespace BuslyCLI.Config.Validators; diff --git a/src/BuslyCLI.Console/Config/Validators/AzureStorageQueuesTransportConfigValidator.cs b/src/BuslyCLI.Console/Config/Validators/AzureStorageQueuesTransportConfigValidator.cs index 553e7a07..d4e9945e 100644 --- a/src/BuslyCLI.Console/Config/Validators/AzureStorageQueuesTransportConfigValidator.cs +++ b/src/BuslyCLI.Console/Config/Validators/AzureStorageQueuesTransportConfigValidator.cs @@ -1,4 +1,5 @@ -using FluentValidation; +using BuslyCLI.Config.Transports; +using FluentValidation; namespace BuslyCLI.Config.Validators; diff --git a/src/BuslyCLI.Console/Config/Validators/LearningTransportConfigValidator.cs b/src/BuslyCLI.Console/Config/Validators/LearningTransportConfigValidator.cs index 15fc54ff..ab2974c1 100644 --- a/src/BuslyCLI.Console/Config/Validators/LearningTransportConfigValidator.cs +++ b/src/BuslyCLI.Console/Config/Validators/LearningTransportConfigValidator.cs @@ -1,4 +1,5 @@ -using FluentValidation; +using BuslyCLI.Config.Transports; +using FluentValidation; namespace BuslyCLI.Config.Validators; diff --git a/src/BuslyCLI.Console/Config/Validators/PostgreSqlTransportConfigValidator.cs b/src/BuslyCLI.Console/Config/Validators/PostgreSqlTransportConfigValidator.cs index bbb15c2f..6e7b9d29 100644 --- a/src/BuslyCLI.Console/Config/Validators/PostgreSqlTransportConfigValidator.cs +++ b/src/BuslyCLI.Console/Config/Validators/PostgreSqlTransportConfigValidator.cs @@ -1,4 +1,5 @@ -using FluentValidation; +using BuslyCLI.Config.Transports; +using FluentValidation; namespace BuslyCLI.Config.Validators; diff --git a/src/BuslyCLI.Console/Config/Validators/RabbitMqTransportConfigValidator.cs b/src/BuslyCLI.Console/Config/Validators/RabbitMqTransportConfigValidator.cs index c1ca571f..951208da 100644 --- a/src/BuslyCLI.Console/Config/Validators/RabbitMqTransportConfigValidator.cs +++ b/src/BuslyCLI.Console/Config/Validators/RabbitMqTransportConfigValidator.cs @@ -1,4 +1,5 @@ -using FluentValidation; +using BuslyCLI.Config.Transports; +using FluentValidation; namespace BuslyCLI.Config.Validators; diff --git a/src/BuslyCLI.Console/Config/Validators/SqlServerTransportConfigValidator.cs b/src/BuslyCLI.Console/Config/Validators/SqlServerTransportConfigValidator.cs index aed20829..a1c521c0 100644 --- a/src/BuslyCLI.Console/Config/Validators/SqlServerTransportConfigValidator.cs +++ b/src/BuslyCLI.Console/Config/Validators/SqlServerTransportConfigValidator.cs @@ -1,4 +1,5 @@ -using FluentValidation; +using BuslyCLI.Config.Transports; +using FluentValidation; namespace BuslyCLI.Config.Validators; diff --git a/src/BuslyCLI.Console/Spectre/AppConfiguration.cs b/src/BuslyCLI.Console/Infrastructure/AppConfiguration.cs similarity index 96% rename from src/BuslyCLI.Console/Spectre/AppConfiguration.cs rename to src/BuslyCLI.Console/Infrastructure/AppConfiguration.cs index 30ae8f69..0fdcca0a 100644 --- a/src/BuslyCLI.Console/Spectre/AppConfiguration.cs +++ b/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 { diff --git a/src/BuslyCLI.Console/Factories/RawEndpoint.cs b/src/BuslyCLI.Console/Infrastructure/Endpoints/RawEndpoint.cs similarity index 97% rename from src/BuslyCLI.Console/Factories/RawEndpoint.cs rename to src/BuslyCLI.Console/Infrastructure/Endpoints/RawEndpoint.cs index dc6d4ae2..8fb15dba 100644 --- a/src/BuslyCLI.Console/Factories/RawEndpoint.cs +++ b/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) { diff --git a/src/BuslyCLI.Console/Factories/RawSendOnlyEndpoint.cs b/src/BuslyCLI.Console/Infrastructure/Endpoints/RawSendOnlyEndpoint.cs similarity index 90% rename from src/BuslyCLI.Console/Factories/RawSendOnlyEndpoint.cs rename to src/BuslyCLI.Console/Infrastructure/Endpoints/RawSendOnlyEndpoint.cs index fcb54ea7..e370528f 100644 --- a/src/BuslyCLI.Console/Factories/RawSendOnlyEndpoint.cs +++ b/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 { diff --git a/src/BuslyCLI.Console/Factories/IRawEndpointFactory.cs b/src/BuslyCLI.Console/Infrastructure/Factories/IRawEndpointFactory.cs similarity index 66% rename from src/BuslyCLI.Console/Factories/IRawEndpointFactory.cs rename to src/BuslyCLI.Console/Infrastructure/Factories/IRawEndpointFactory.cs index 31a70bd8..faca6ac1 100644 --- a/src/BuslyCLI.Console/Factories/IRawEndpointFactory.cs +++ b/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 { diff --git a/src/BuslyCLI.Console/Factories/RawEndpointFactory.cs b/src/BuslyCLI.Console/Infrastructure/Factories/RawEndpointFactory.cs similarity index 98% rename from src/BuslyCLI.Console/Factories/RawEndpointFactory.cs rename to src/BuslyCLI.Console/Infrastructure/Factories/RawEndpointFactory.cs index 65071f8f..87251e91 100644 --- a/src/BuslyCLI.Console/Factories/RawEndpointFactory.cs +++ b/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 { diff --git a/src/BuslyCLI.Console/DependencyInjection/ServiceCollectionExtensions.cs b/src/BuslyCLI.Console/Infrastructure/ServiceCollectionExtensions.cs similarity index 94% rename from src/BuslyCLI.Console/DependencyInjection/ServiceCollectionExtensions.cs rename to src/BuslyCLI.Console/Infrastructure/ServiceCollectionExtensions.cs index 0038dbf9..29b20f19 100644 --- a/src/BuslyCLI.Console/DependencyInjection/ServiceCollectionExtensions.cs +++ b/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 { diff --git a/src/BuslyCLI.Console/Program.cs b/src/BuslyCLI.Console/Program.cs index fef0a6bd..a854d531 100644 --- a/src/BuslyCLI.Console/Program.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Commands/Command/SendCommandTests.cs b/tests/BuslyCLI.Console.Tests/Commands/NsbCommand/SendCommandTests.cs similarity index 97% rename from tests/BuslyCLI.Console.Tests/Commands/Command/SendCommandTests.cs rename to tests/BuslyCLI.Console.Tests/Commands/NsbCommand/SendCommandTests.cs index b852db70..4aca4e21 100644 --- a/tests/BuslyCLI.Console.Tests/Commands/Command/SendCommandTests.cs +++ b/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 // { diff --git a/tests/BuslyCLI.Console.Tests/Commands/Transport/CurrentTransportTests.cs b/tests/BuslyCLI.Console.Tests/Commands/Transport/CurrentTransportTests.cs index 43cf0a93..9002fbda 100644 --- a/tests/BuslyCLI.Console.Tests/Commands/Transport/CurrentTransportTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Commands/Transport/DeleteTransportTests.cs b/tests/BuslyCLI.Console.Tests/Commands/Transport/DeleteTransportTests.cs index 9fb4879e..44e19ecd 100644 --- a/tests/BuslyCLI.Console.Tests/Commands/Transport/DeleteTransportTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Commands/Transport/ListTransportTests.cs b/tests/BuslyCLI.Console.Tests/Commands/Transport/ListTransportTests.cs index cb554b62..7b808d52 100644 --- a/tests/BuslyCLI.Console.Tests/Commands/Transport/ListTransportTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Commands/Transport/SetTransportTests.cs b/tests/BuslyCLI.Console.Tests/Commands/Transport/SetTransportTests.cs index 43c97a72..756c2df9 100644 --- a/tests/BuslyCLI.Console.Tests/Commands/Transport/SetTransportTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/TransportDefinitionTypeConverterTests.cs b/tests/BuslyCLI.Console.Tests/Config/TransportDefinitionTypeConverterTests.cs index 709843d4..89e41173 100644 --- a/tests/BuslyCLI.Console.Tests/Config/TransportDefinitionTypeConverterTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/AmazonsqsTransportConfigValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/AmazonsqsTransportConfigValidatorTests.cs index f4a76548..1f525da6 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/AmazonsqsTransportConfigValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/AwsS3BucketSettingsValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/AwsS3BucketSettingsValidatorTests.cs index 401b2f1f..d3a03dd6 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/AwsS3BucketSettingsValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/AzureServiceBusTransportConfigValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/AzureServiceBusTransportConfigValidatorTests.cs index efa0d26c..d24b3d2b 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/AzureServiceBusTransportConfigValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/AzureStorageQueuesTransportConfigValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/AzureStorageQueuesTransportConfigValidatorTests.cs index 0dc57c11..673f53a7 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/AzureStorageQueuesTransportConfigValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/LearningTransportConfigValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/LearningTransportConfigValidatorTests.cs index d76e75eb..3fffbaaf 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/LearningTransportConfigValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/ManagementApiConfigValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/ManagementApiConfigValidatorTests.cs index 7831c225..f46f0a35 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/ManagementApiConfigValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/PostgreSqlTransportConfigValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/PostgreSqlTransportConfigValidatorTests.cs index e7d34329..b70707ec 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/PostgreSqlTransportConfigValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/RabbitMqTransportConfigValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/RabbitMqTransportConfigValidatorTests.cs index df0b6941..0cdc11a0 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/RabbitMqTransportConfigValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/SqlServerTransportConfigValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/SqlServerTransportConfigValidatorTests.cs index 5bf45531..7c59fa62 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/SqlServerTransportConfigValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/Config/Validators/TransportConfigValidatorTests.cs b/tests/BuslyCLI.Console.Tests/Config/Validators/TransportConfigValidatorTests.cs index c6fb6fe8..92fedbe3 100644 --- a/tests/BuslyCLI.Console.Tests/Config/Validators/TransportConfigValidatorTests.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/AmazonSqsEndToEndTestBase.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/AmazonSqsEndToEndTestBase.cs index 79bb3bf6..82e95d8e 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/AmazonSQS/AmazonSqsEndToEndTestBase.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/AzureServiceBusEndToEndTestBase.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/AzureServiceBusEndToEndTestBase.cs index 5834ac33..faf00087 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/AzureServiceBusEndToEndTestBase.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/AzureStorageQueues/AzureStorageQueuesEndToEndTestBase.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/AzureStorageQueues/AzureStorageQueuesEndToEndTestBase.cs index 99a277f3..afdb88e8 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/AzureStorageQueues/AzureStorageQueuesEndToEndTestBase.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/EndToEndTestBase.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/EndToEndTestBase.cs index 844bdf67..adee9f40 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/EndToEndTestBase.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/Learning/LearningEndToEndTestBase.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/Learning/LearningEndToEndTestBase.cs index 1c5cc804..8ca596d8 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/Learning/LearningEndToEndTestBase.cs +++ b/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; diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/PostgreSql/PostgreSqlEndToEndTestBase.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/PostgreSql/PostgreSqlEndToEndTestBase.cs index 549b8156..f5b81a5a 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/PostgreSql/PostgreSqlEndToEndTestBase.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/PostgreSql/PostgreSqlEndToEndTestBase.cs @@ -1,4 +1,4 @@ -using BuslyCLI.Config; +using BuslyCLI.Config.Transports; using Testcontainers.PostgreSql; using TransportConfig = BuslyCLI.Config.TransportConfig; diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/RabbitMQ/RabbitMqEndToEndTestBase.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/RabbitMQ/RabbitMqEndToEndTestBase.cs index 116faf48..109ca9a0 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/RabbitMQ/RabbitMqEndToEndTestBase.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/RabbitMQ/RabbitMqEndToEndTestBase.cs @@ -1,4 +1,4 @@ -using BuslyCLI.Config; +using BuslyCLI.Config.Transports; using Testcontainers.RabbitMq; using TransportConfig = BuslyCLI.Config.TransportConfig; diff --git a/tests/BuslyCLI.Console.Tests/EndToEnd/SqlServer/SqlServerEndToEndTestBase.cs b/tests/BuslyCLI.Console.Tests/EndToEnd/SqlServer/SqlServerEndToEndTestBase.cs index ba313539..c4c344d9 100644 --- a/tests/BuslyCLI.Console.Tests/EndToEnd/SqlServer/SqlServerEndToEndTestBase.cs +++ b/tests/BuslyCLI.Console.Tests/EndToEnd/SqlServer/SqlServerEndToEndTestBase.cs @@ -1,4 +1,4 @@ -using BuslyCLI.Config; +using BuslyCLI.Config.Transports; using Testcontainers.MsSql; using TransportConfig = BuslyCLI.Config.TransportConfig;