diff --git a/src/Squidex.Infrastructure/CQRS/Commands/AggregateHandler.cs b/src/Squidex.Infrastructure/Commands/AggregateHandler.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/AggregateHandler.cs rename to src/Squidex.Infrastructure/Commands/AggregateHandler.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/CommandContext.cs b/src/Squidex.Infrastructure/Commands/CommandContext.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/CommandContext.cs rename to src/Squidex.Infrastructure/Commands/CommandContext.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/CommandingExtensions.cs b/src/Squidex.Infrastructure/Commands/CommandingExtensions.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/CommandingExtensions.cs rename to src/Squidex.Infrastructure/Commands/CommandingExtensions.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/DefaultDomainObjectFactory.cs b/src/Squidex.Infrastructure/Commands/DefaultDomainObjectFactory.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/DefaultDomainObjectFactory.cs rename to src/Squidex.Infrastructure/Commands/DefaultDomainObjectFactory.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/DefaultDomainObjectRepository.cs b/src/Squidex.Infrastructure/Commands/DefaultDomainObjectRepository.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/DefaultDomainObjectRepository.cs rename to src/Squidex.Infrastructure/Commands/DefaultDomainObjectRepository.cs diff --git a/src/Squidex.Infrastructure/CQRS/DomainObjectBase.cs b/src/Squidex.Infrastructure/Commands/DomainObjectBase.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/DomainObjectBase.cs rename to src/Squidex.Infrastructure/Commands/DomainObjectBase.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/EnrichWithTimestampCommandMiddleware.cs b/src/Squidex.Infrastructure/Commands/EnrichWithTimestampCommandMiddleware.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/EnrichWithTimestampCommandMiddleware.cs rename to src/Squidex.Infrastructure/Commands/EnrichWithTimestampCommandMiddleware.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult.cs b/src/Squidex.Infrastructure/Commands/EntityCreatedResult.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult.cs rename to src/Squidex.Infrastructure/Commands/EntityCreatedResult.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult{T}.cs b/src/Squidex.Infrastructure/Commands/EntityCreatedResult{T}.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/EntityCreatedResult{T}.cs rename to src/Squidex.Infrastructure/Commands/EntityCreatedResult{T}.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/EntitySavedResult.cs b/src/Squidex.Infrastructure/Commands/EntitySavedResult.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/EntitySavedResult.cs rename to src/Squidex.Infrastructure/Commands/EntitySavedResult.cs diff --git a/src/Squidex.Infrastructure/CQRS/IAggregate.cs b/src/Squidex.Infrastructure/Commands/IAggregate.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/IAggregate.cs rename to src/Squidex.Infrastructure/Commands/IAggregate.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/IAggregateCommand.cs b/src/Squidex.Infrastructure/Commands/IAggregateCommand.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/IAggregateCommand.cs rename to src/Squidex.Infrastructure/Commands/IAggregateCommand.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/IAggregateHandler.cs b/src/Squidex.Infrastructure/Commands/IAggregateHandler.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/IAggregateHandler.cs rename to src/Squidex.Infrastructure/Commands/IAggregateHandler.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/ICommand.cs b/src/Squidex.Infrastructure/Commands/ICommand.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/ICommand.cs rename to src/Squidex.Infrastructure/Commands/ICommand.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/ICommandBus.cs b/src/Squidex.Infrastructure/Commands/ICommandBus.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/ICommandBus.cs rename to src/Squidex.Infrastructure/Commands/ICommandBus.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/ICommandMiddleware.cs b/src/Squidex.Infrastructure/Commands/ICommandMiddleware.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/ICommandMiddleware.cs rename to src/Squidex.Infrastructure/Commands/ICommandMiddleware.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/IDomainObjectFactory.cs b/src/Squidex.Infrastructure/Commands/IDomainObjectFactory.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/IDomainObjectFactory.cs rename to src/Squidex.Infrastructure/Commands/IDomainObjectFactory.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/IDomainObjectRepository.cs b/src/Squidex.Infrastructure/Commands/IDomainObjectRepository.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/IDomainObjectRepository.cs rename to src/Squidex.Infrastructure/Commands/IDomainObjectRepository.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/ITimestampCommand.cs b/src/Squidex.Infrastructure/Commands/ITimestampCommand.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/ITimestampCommand.cs rename to src/Squidex.Infrastructure/Commands/ITimestampCommand.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/InMemoryCommandBus.cs b/src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/InMemoryCommandBus.cs rename to src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs diff --git a/src/Squidex.Infrastructure/CQRS/Commands/LogCommandMiddleware.cs b/src/Squidex.Infrastructure/Commands/LogCommandMiddleware.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Commands/LogCommandMiddleware.cs rename to src/Squidex.Infrastructure/Commands/LogCommandMiddleware.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/CommonHeaders.cs b/src/Squidex.Infrastructure/EventSourcing/CommonHeaders.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/CommonHeaders.cs rename to src/Squidex.Infrastructure/EventSourcing/CommonHeaders.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/CompoundEventConsumer.cs b/src/Squidex.Infrastructure/EventSourcing/CompoundEventConsumer.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/CompoundEventConsumer.cs rename to src/Squidex.Infrastructure/EventSourcing/CompoundEventConsumer.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/DefaultEventNotifier.cs b/src/Squidex.Infrastructure/EventSourcing/DefaultEventNotifier.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/DefaultEventNotifier.cs rename to src/Squidex.Infrastructure/EventSourcing/DefaultEventNotifier.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Envelope.cs b/src/Squidex.Infrastructure/EventSourcing/Envelope.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Envelope.cs rename to src/Squidex.Infrastructure/EventSourcing/Envelope.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/EnvelopeExtensions.cs b/src/Squidex.Infrastructure/EventSourcing/EnvelopeExtensions.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/EnvelopeExtensions.cs rename to src/Squidex.Infrastructure/EventSourcing/EnvelopeExtensions.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/EnvelopeHeaders.cs b/src/Squidex.Infrastructure/EventSourcing/EnvelopeHeaders.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/EnvelopeHeaders.cs rename to src/Squidex.Infrastructure/EventSourcing/EnvelopeHeaders.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Envelope{T}.cs b/src/Squidex.Infrastructure/EventSourcing/Envelope{T}.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Envelope{T}.cs rename to src/Squidex.Infrastructure/EventSourcing/Envelope{T}.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/EventConsumerInfo.cs b/src/Squidex.Infrastructure/EventSourcing/EventConsumerInfo.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/EventConsumerInfo.cs rename to src/Squidex.Infrastructure/EventSourcing/EventConsumerInfo.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/EventData.cs b/src/Squidex.Infrastructure/EventSourcing/EventData.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/EventData.cs rename to src/Squidex.Infrastructure/EventSourcing/EventData.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/EventDataFormatter.cs b/src/Squidex.Infrastructure/EventSourcing/EventDataFormatter.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/EventDataFormatter.cs rename to src/Squidex.Infrastructure/EventSourcing/EventDataFormatter.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/EventTypeAttribute.cs b/src/Squidex.Infrastructure/EventSourcing/EventTypeAttribute.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/EventTypeAttribute.cs rename to src/Squidex.Infrastructure/EventSourcing/EventTypeAttribute.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Grains/EventConsumerGrain.cs b/src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerGrain.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Grains/EventConsumerGrain.cs rename to src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerGrain.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Grains/EventConsumerGrainManager.cs b/src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerGrainManager.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Grains/EventConsumerGrainManager.cs rename to src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerGrainManager.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Grains/EventConsumerState.cs b/src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerState.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Grains/EventConsumerState.cs rename to src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerState.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/GetStatesRequest.cs b/src/Squidex.Infrastructure/EventSourcing/Grains/Messages/GetStatesRequest.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/GetStatesRequest.cs rename to src/Squidex.Infrastructure/EventSourcing/Grains/Messages/GetStatesRequest.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/GetStatesResponse.cs b/src/Squidex.Infrastructure/EventSourcing/Grains/Messages/GetStatesResponse.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/GetStatesResponse.cs rename to src/Squidex.Infrastructure/EventSourcing/Grains/Messages/GetStatesResponse.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/ResetConsumerMessage.cs b/src/Squidex.Infrastructure/EventSourcing/Grains/Messages/ResetConsumerMessage.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/ResetConsumerMessage.cs rename to src/Squidex.Infrastructure/EventSourcing/Grains/Messages/ResetConsumerMessage.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/StartConsumerMessage.cs b/src/Squidex.Infrastructure/EventSourcing/Grains/Messages/StartConsumerMessage.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/StartConsumerMessage.cs rename to src/Squidex.Infrastructure/EventSourcing/Grains/Messages/StartConsumerMessage.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/StopConsumerMessage.cs b/src/Squidex.Infrastructure/EventSourcing/Grains/Messages/StopConsumerMessage.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/Grains/Messages/StopConsumerMessage.cs rename to src/Squidex.Infrastructure/EventSourcing/Grains/Messages/StopConsumerMessage.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/IEvent.cs b/src/Squidex.Infrastructure/EventSourcing/IEvent.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/IEvent.cs rename to src/Squidex.Infrastructure/EventSourcing/IEvent.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/IEventConsumer.cs b/src/Squidex.Infrastructure/EventSourcing/IEventConsumer.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/IEventConsumer.cs rename to src/Squidex.Infrastructure/EventSourcing/IEventConsumer.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/IEventNotifier.cs b/src/Squidex.Infrastructure/EventSourcing/IEventNotifier.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/IEventNotifier.cs rename to src/Squidex.Infrastructure/EventSourcing/IEventNotifier.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/IEventStore.cs b/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/IEventStore.cs rename to src/Squidex.Infrastructure/EventSourcing/IEventStore.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/IEventSubscriber.cs b/src/Squidex.Infrastructure/EventSourcing/IEventSubscriber.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/IEventSubscriber.cs rename to src/Squidex.Infrastructure/EventSourcing/IEventSubscriber.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/IEventSubscription.cs b/src/Squidex.Infrastructure/EventSourcing/IEventSubscription.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/IEventSubscription.cs rename to src/Squidex.Infrastructure/EventSourcing/IEventSubscription.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/IMigratedEvent.cs b/src/Squidex.Infrastructure/EventSourcing/IMigratedEvent.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/IMigratedEvent.cs rename to src/Squidex.Infrastructure/EventSourcing/IMigratedEvent.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/NoopEvent.cs b/src/Squidex.Infrastructure/EventSourcing/NoopEvent.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/NoopEvent.cs rename to src/Squidex.Infrastructure/EventSourcing/NoopEvent.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/PollingSubscription.cs b/src/Squidex.Infrastructure/EventSourcing/PollingSubscription.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/PollingSubscription.cs rename to src/Squidex.Infrastructure/EventSourcing/PollingSubscription.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/RetrySubscription.cs b/src/Squidex.Infrastructure/EventSourcing/RetrySubscription.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/RetrySubscription.cs rename to src/Squidex.Infrastructure/EventSourcing/RetrySubscription.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/StoredEvent.cs b/src/Squidex.Infrastructure/EventSourcing/StoredEvent.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/StoredEvent.cs rename to src/Squidex.Infrastructure/EventSourcing/StoredEvent.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/WrongEventVersionException.cs b/src/Squidex.Infrastructure/EventSourcing/WrongEventVersionException.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/WrongEventVersionException.cs rename to src/Squidex.Infrastructure/EventSourcing/WrongEventVersionException.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/DefaultStreamNameResolver.cs b/src/Squidex.Infrastructure/States/DefaultStreamNameResolver.cs similarity index 100% rename from src/Squidex.Infrastructure/CQRS/Events/DefaultStreamNameResolver.cs rename to src/Squidex.Infrastructure/States/DefaultStreamNameResolver.cs diff --git a/src/Squidex.Infrastructure/CQRS/Events/IStreamNameResolver.cs b/src/Squidex.Infrastructure/States/IStreamNameResolver.cs similarity index 91% rename from src/Squidex.Infrastructure/CQRS/Events/IStreamNameResolver.cs rename to src/Squidex.Infrastructure/States/IStreamNameResolver.cs index 502956fb7..3be65a867 100644 --- a/src/Squidex.Infrastructure/CQRS/Events/IStreamNameResolver.cs +++ b/src/Squidex.Infrastructure/States/IStreamNameResolver.cs @@ -8,7 +8,7 @@ using System; -namespace Squidex.Infrastructure.CQRS.Events +namespace Squidex.Infrastructure.States { public interface IStreamNameResolver { diff --git a/tests/Squidex.Infrastructure.Tests/CQRS/Events/DefaultStreamNameResolverTests.cs b/tests/Squidex.Infrastructure.Tests/CQRS/Events/DefaultStreamNameResolverTests.cs index 181e4c698..7930b68f5 100644 --- a/tests/Squidex.Infrastructure.Tests/CQRS/Events/DefaultStreamNameResolverTests.cs +++ b/tests/Squidex.Infrastructure.Tests/CQRS/Events/DefaultStreamNameResolverTests.cs @@ -6,10 +6,12 @@ // All rights reserved. // ========================================================================== +using Squidex.Infrastructure.CQRS; +using Squidex.Infrastructure.CQRS.Events; using System; using Xunit; -namespace Squidex.Infrastructure.CQRS.Events +namespace Squidex.Infrastructure.States { public class DefaultStreamNameResolverTests {