diff --git a/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuer.cs b/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuer.cs index 5ae2477bf..da523ac95 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuer.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuer.cs @@ -21,7 +21,7 @@ using Squidex.Infrastructure.Timers; namespace Squidex.Domain.Apps.Entities.Rules { - public class RuleDequeuer : DisposableObjectBase, IExternalSystem + public class RuleDequeuer : DisposableObjectBase, IRunnable { private readonly ActionBlock requestBlock; private readonly IRuleEventRepository ruleEventRepository; @@ -63,7 +63,7 @@ namespace Squidex.Domain.Apps.Entities.Rules } } - public void Connect() + public void Run() { } diff --git a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs index 87a5d16a2..7300e7720 100644 --- a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs +++ b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs @@ -14,7 +14,7 @@ using Microsoft.WindowsAzure.Storage.Blob; namespace Squidex.Infrastructure.Assets { - public class AzureBlobAssetStore : IAssetStore, IExternalSystem + public class AzureBlobAssetStore : IAssetStore, IInitializable { private const string AssetVersion = "AssetVersion"; private const string AssetId = "AssetId"; @@ -31,7 +31,7 @@ namespace Squidex.Infrastructure.Assets this.containerName = containerName; } - public void Connect() + public void Initialize() { try { diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs index 12cbd708b..f224dfe3f 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs @@ -15,7 +15,7 @@ using EventStore.ClientAPI; namespace Squidex.Infrastructure.EventSourcing { - public sealed class GetEventStore : IEventStore, IExternalSystem + public sealed class GetEventStore : IEventStore, IInitializable { private const int WritePageSize = 500; private const int ReadPageSize = 500; @@ -37,7 +37,7 @@ namespace Squidex.Infrastructure.EventSourcing { } - public void Connect() + public void Initialize() { try { diff --git a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs index 6df5f83a8..7c6b68e0b 100644 --- a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs +++ b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs @@ -16,7 +16,7 @@ using Google.Cloud.Storage.V1; namespace Squidex.Infrastructure.Assets { - public sealed class GoogleCloudAssetStore : IAssetStore, IExternalSystem + public sealed class GoogleCloudAssetStore : IAssetStore, IInitializable { private readonly string bucketName; private StorageClient storageClient; @@ -28,7 +28,7 @@ namespace Squidex.Infrastructure.Assets this.bucketName = bucketName; } - public void Connect() + public void Initialize() { try { diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs index 056dd8595..746195863 100644 --- a/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoRepositoryBase.cs @@ -17,7 +17,7 @@ using Squidex.Infrastructure.Tasks; namespace Squidex.Infrastructure.MongoDb { - public abstract class MongoRepositoryBase : IExternalSystem + public abstract class MongoRepositoryBase : IInitializable { private const string CollectionFormat = "{0}Set"; @@ -106,7 +106,7 @@ namespace Squidex.Infrastructure.MongoDb } } - public void Connect() + public void Initialize() { try { diff --git a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs index 8628d75ec..bbdb89a98 100644 --- a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs @@ -13,7 +13,7 @@ using Squidex.Infrastructure.MongoDb; namespace Squidex.Infrastructure.States { - public class MongoSnapshotStore : MongoRepositoryBase>, ISnapshotStore, IExternalSystem + public class MongoSnapshotStore : MongoRepositoryBase>, ISnapshotStore, IInitializable { private readonly JsonSerializer serializer; diff --git a/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs b/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs index ecf9ce5e9..24f6611db 100644 --- a/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs +++ b/src/Squidex.Infrastructure.RabbitMq/CQRS/Events/RabbitMqEventConsumer.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure.Tasks; namespace Squidex.Infrastructure.EventSourcing { - public sealed class RabbitMqEventConsumer : DisposableObjectBase, IExternalSystem, IEventConsumer + public sealed class RabbitMqEventConsumer : DisposableObjectBase, IInitializable, IEventConsumer { private readonly JsonSerializerSettings serializerSettings; private readonly string eventPublisherName; @@ -61,7 +61,7 @@ namespace Squidex.Infrastructure.EventSourcing } } - public void Connect() + public void Initialize() { try { diff --git a/src/Squidex.Infrastructure.Redis/RedisPubSub.cs b/src/Squidex.Infrastructure.Redis/RedisPubSub.cs index 238b912d8..c548a178f 100644 --- a/src/Squidex.Infrastructure.Redis/RedisPubSub.cs +++ b/src/Squidex.Infrastructure.Redis/RedisPubSub.cs @@ -13,7 +13,7 @@ using StackExchange.Redis; namespace Squidex.Infrastructure { - public sealed class RedisPubSub : IPubSub, IExternalSystem + public sealed class RedisPubSub : IPubSub, IInitializable { private readonly ConcurrentDictionary subscriptions = new ConcurrentDictionary(); private readonly Lazy redisClient; @@ -31,7 +31,7 @@ namespace Squidex.Infrastructure redisSubscriber = new Lazy(() => redis.Value.GetSubscriber()); } - public void Connect() + public void Initialize() { try { diff --git a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs index 951503235..557a3e7a5 100644 --- a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs @@ -14,7 +14,7 @@ using Squidex.Infrastructure.Tasks; namespace Squidex.Infrastructure.Assets { - public sealed class FolderAssetStore : IAssetStore, IExternalSystem + public sealed class FolderAssetStore : IAssetStore, IInitializable { private readonly ISemanticLog log; private readonly DirectoryInfo directory; @@ -29,7 +29,7 @@ namespace Squidex.Infrastructure.Assets directory = new DirectoryInfo(path); } - public void Connect() + public void Initialize() { try { diff --git a/src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerGrainManager.cs b/src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerGrainManager.cs index 70ef98c40..8d4497e4e 100644 --- a/src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerGrainManager.cs +++ b/src/Squidex.Infrastructure/EventSourcing/Grains/EventConsumerGrainManager.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure.States; namespace Squidex.Infrastructure.EventSourcing.Grains { - public sealed class EventConsumerGrainManager : DisposableObjectBase, IExternalSystem + public sealed class EventConsumerGrainManager : DisposableObjectBase, IRunnable { private readonly IStateFactory factory; private readonly IPubSub pubSub; @@ -33,7 +33,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains this.consumers = consumers.ToList(); } - public void Connect() + public void Run() { var actors = new Dictionary(); diff --git a/src/Squidex.Infrastructure/IInitializable.cs b/src/Squidex.Infrastructure/IInitializable.cs new file mode 100644 index 000000000..44a853641 --- /dev/null +++ b/src/Squidex.Infrastructure/IInitializable.cs @@ -0,0 +1,15 @@ +// ========================================================================== +// IInitializable.cs +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex Group +// All rights reserved. +// ========================================================================== + +namespace Squidex.Infrastructure +{ + public interface IInitializable + { + void Initialize(); + } +} diff --git a/src/Squidex.Infrastructure/IExternalSystem.cs b/src/Squidex.Infrastructure/IRunnable.cs similarity index 81% rename from src/Squidex.Infrastructure/IExternalSystem.cs rename to src/Squidex.Infrastructure/IRunnable.cs index 8943f9de6..b36a94eeb 100644 --- a/src/Squidex.Infrastructure/IExternalSystem.cs +++ b/src/Squidex.Infrastructure/IRunnable.cs @@ -1,5 +1,5 @@ // ========================================================================== -// IExternalSystem.cs +// IRunnable.cs // Squidex Headless CMS // ========================================================================== // Copyright (c) Squidex Group @@ -8,8 +8,8 @@ namespace Squidex.Infrastructure { - public interface IExternalSystem + public interface IRunnable { - void Connect(); + void Run(); } } diff --git a/src/Squidex.Infrastructure/Log/FileChannel.cs b/src/Squidex.Infrastructure/Log/FileChannel.cs index bf70e22ee..c351aa7d2 100644 --- a/src/Squidex.Infrastructure/Log/FileChannel.cs +++ b/src/Squidex.Infrastructure/Log/FileChannel.cs @@ -10,7 +10,7 @@ using Squidex.Infrastructure.Log.Internal; namespace Squidex.Infrastructure.Log { - public sealed class FileChannel : DisposableObjectBase, ILogChannel, IExternalSystem + public sealed class FileChannel : DisposableObjectBase, ILogChannel, IInitializable { private readonly FileLogProcessor processor; @@ -34,7 +34,7 @@ namespace Squidex.Infrastructure.Log processor.EnqueueMessage(new LogMessageEntry { Message = message }); } - public void Connect() + public void Initialize() { processor.Connect(); } diff --git a/src/Squidex.Infrastructure/States/StateFactory.cs b/src/Squidex.Infrastructure/States/StateFactory.cs index abeb95d8a..dedc268f3 100644 --- a/src/Squidex.Infrastructure/States/StateFactory.cs +++ b/src/Squidex.Infrastructure/States/StateFactory.cs @@ -15,7 +15,7 @@ using Squidex.Infrastructure.EventSourcing; namespace Squidex.Infrastructure.States { - public sealed class StateFactory : DisposableObjectBase, IExternalSystem, IStateFactory + public sealed class StateFactory : DisposableObjectBase, IInitializable, IStateFactory { private static readonly TimeSpan CacheDuration = TimeSpan.FromMinutes(10); private readonly IPubSub pubSub; @@ -70,7 +70,7 @@ namespace Squidex.Infrastructure.States this.streamNameResolver = streamNameResolver; } - public void Connect() + public void Initialize() { pubSubSubscription = pubSub.Subscribe(m => { diff --git a/src/Squidex/Config/Domain/AssetServices.cs b/src/Squidex/Config/Domain/AssetServices.cs index 3694cde33..b958f6ff0 100644 --- a/src/Squidex/Config/Domain/AssetServices.cs +++ b/src/Squidex/Config/Domain/AssetServices.cs @@ -26,7 +26,7 @@ namespace Squidex.Config.Domain services.AddSingletonAs(c => new FolderAssetStore(path, c.GetRequiredService())) .As() - .As(); + .As(); }, ["GoogleCloud"] = () => { @@ -34,7 +34,7 @@ namespace Squidex.Config.Domain services.AddSingletonAs(c => new GoogleCloudAssetStore(bucketName)) .As() - .As(); + .As(); }, ["AzureBlob"] = () => { @@ -43,7 +43,7 @@ namespace Squidex.Config.Domain services.AddSingletonAs(c => new AzureBlobAssetStore(connectionString, containerName)) .As() - .As(); + .As(); } }); } diff --git a/src/Squidex/Config/Domain/EventPublishersServices.cs b/src/Squidex/Config/Domain/EventPublishersServices.cs index b191350f6..a645708c5 100644 --- a/src/Squidex/Config/Domain/EventPublishersServices.cs +++ b/src/Squidex/Config/Domain/EventPublishersServices.cs @@ -56,7 +56,7 @@ namespace Squidex.Config.Domain { services.AddSingletonAs(c => new RabbitMqEventConsumer(c.GetRequiredService(), name, publisherConfig, exchange, eventsFilter)) .As() - .As(); + .As(); } } else diff --git a/src/Squidex/Config/Domain/EventStoreServices.cs b/src/Squidex/Config/Domain/EventStoreServices.cs index 59b2bb727..e5287f813 100644 --- a/src/Squidex/Config/Domain/EventStoreServices.cs +++ b/src/Squidex/Config/Domain/EventStoreServices.cs @@ -33,7 +33,7 @@ namespace Squidex.Config.Domain return new MongoEventStore(mongDatabase, c.GetRequiredService()); }) - .As() + .As() .As(); }, ["GetEventStore"] = () => @@ -45,7 +45,7 @@ namespace Squidex.Config.Domain var connection = EventStoreConnection.Create(eventStoreConfiguration); services.AddSingletonAs(c => new GetEventStore(connection, eventStorePrefix, eventStoreProjectionHost)) - .As() + .As() .As(); } }); diff --git a/src/Squidex/Config/Domain/InfrastructureServices.cs b/src/Squidex/Config/Domain/InfrastructureServices.cs index b8cd37168..5ea0bd2b9 100644 --- a/src/Squidex/Config/Domain/InfrastructureServices.cs +++ b/src/Squidex/Config/Domain/InfrastructureServices.cs @@ -45,7 +45,7 @@ namespace Squidex.Config.Domain { services.AddSingletonAs(new FileChannel(loggingFile)) .As() - .As(); + .As(); } services.AddSingletonAs(c => new ApplicationInfoLogAppender(typeof(Program).Assembly, Guid.NewGuid())) diff --git a/src/Squidex/Config/Domain/PubSubServices.cs b/src/Squidex/Config/Domain/PubSubServices.cs index b19b462ba..fe3cc14b3 100644 --- a/src/Squidex/Config/Domain/PubSubServices.cs +++ b/src/Squidex/Config/Domain/PubSubServices.cs @@ -33,7 +33,7 @@ namespace Squidex.Config.Domain services.AddSingletonAs(c => new RedisPubSub(redis, c.GetRequiredService())) .As() - .As(); + .As(); } }); } diff --git a/src/Squidex/Config/Domain/ReadServices.cs b/src/Squidex/Config/Domain/ReadServices.cs index 54c9958ce..eda0d92a0 100644 --- a/src/Squidex/Config/Domain/ReadServices.cs +++ b/src/Squidex/Config/Domain/ReadServices.cs @@ -44,9 +44,9 @@ namespace Squidex.Config.Domain services.AddTransient(); services.AddSingletonAs() - .As(); + .As(); services.AddSingletonAs() - .As(); + .As(); } var exposeSourceUrl = config.GetOptionalValue("assetStore:exposeSourceUrl", true); @@ -58,7 +58,7 @@ namespace Squidex.Config.Domain .As(); services.AddSingletonAs() - .As() + .As() .As(); services.AddSingletonAs(c => c.GetService>()?.Value?.Plans.OrEmpty()); diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs index ce4fe184d..2a3224ab8 100644 --- a/src/Squidex/Config/Domain/StoreServices.cs +++ b/src/Squidex/Config/Domain/StoreServices.cs @@ -64,74 +64,74 @@ namespace Squidex.Config.Domain services.AddSingletonAs(c => new MongoXmlRepository(mongoDatabase)) .As() - .As(); + .As(); services.AddSingletonAs(c => new MongoMigrationStatus(mongoDatabase)) .As() - .As(); + .As(); services.AddSingletonAs(c => new MongoSnapshotStore(mongoDatabase, c.GetRequiredService())) .As>() - .As(); + .As(); services.AddSingletonAs(c => new MongoUserStore(mongoDatabase)) .As>() .As() .As() - .As(); + .As(); services.AddSingletonAs(c => new MongoRoleStore(mongoDatabase)) .As>() .As() - .As(); + .As(); services.AddSingletonAs(c => new MongoPersistedGrantStore(mongoDatabase)) .As() - .As(); + .As(); services.AddSingletonAs(c => new MongoUsageStore(mongoDatabase)) .As() - .As(); + .As(); services.AddSingletonAs(c => new MongoRuleEventRepository(mongoDatabase)) .As() - .As(); + .As(); services.AddSingletonAs(c => new MongoAppRepository(mongoDatabase)) .As() .As>() - .As(); + .As(); services.AddSingletonAs(c => new MongoAssetRepository(mongoDatabase)) .As() .As>() - .As(); + .As(); services.AddSingletonAs(c => new MongoRuleRepository(mongoDatabase)) .As() .As>() - .As(); + .As(); services.AddSingletonAs(c => new MongoSchemaRepository(mongoDatabase)) .As() .As>() - .As(); + .As(); services.AddSingletonAs(c => new MongoContentRepository(mongoContentDatabase, c.GetService())) .As() .As>() .As() - .As(); + .As(); services.AddSingletonAs(c => new MongoHistoryEventRepository(mongoDatabase, c.GetServices())) .As() .As() - .As(); + .As(); services.AddSingletonAs(c => new MongoAssetStatsRepository(mongoDatabase)) .As() .As() - .As(); + .As(); } }); } diff --git a/src/Squidex/Config/Domain/SystemExtensions.cs b/src/Squidex/Config/Domain/SystemExtensions.cs index 95538ef4c..ccd4543ed 100644 --- a/src/Squidex/Config/Domain/SystemExtensions.cs +++ b/src/Squidex/Config/Domain/SystemExtensions.cs @@ -16,13 +16,23 @@ namespace Squidex.Config.Domain { public static class SystemExtensions { - public static void TestExternalSystems(this IServiceProvider services) + public static void InitializeAll(this IServiceProvider services) { - var systems = services.GetRequiredService>(); + var systems = services.GetRequiredService>(); foreach (var system in systems) { - system.Connect(); + system.Initialize(); + } + } + + public static void RunAll(this IServiceProvider services) + { + var systems = services.GetRequiredService>(); + + foreach (var system in systems) + { + system.Run(); } } diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index d88b28055..6c9bdd9f2 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -39,8 +39,9 @@ namespace Squidex public void Configure(IApplicationBuilder app) { app.ApplicationServices.LogConfiguration(); + app.ApplicationServices.InitializeAll(); app.ApplicationServices.Migrate(); - app.ApplicationServices.TestExternalSystems(); + app.ApplicationServices.RunAll(); app.UseMyCors(); app.UseMyForwardingRules(); diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs index bf6c35b64..56c74f7c3 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs @@ -34,7 +34,7 @@ namespace Squidex.Infrastructure.Assets [Fact] public Task Should_throw_exception_if_asset_to_download_is_not_found() { - ((IExternalSystem)Sut).Connect(); + ((IInitializable)Sut).Initialize(); return Assert.ThrowsAsync(() => Sut.DownloadAsync(Id(), 1, "suffix", new MemoryStream())); } @@ -42,7 +42,7 @@ namespace Squidex.Infrastructure.Assets [Fact] public Task Should_throw_exception_if_asset_to_copy_is_not_found() { - ((IExternalSystem)Sut).Connect(); + ((IInitializable)Sut).Initialize(); return Assert.ThrowsAsync(() => Sut.CopyTemporaryAsync(Id(), Id(), 1, null)); } @@ -50,7 +50,7 @@ namespace Squidex.Infrastructure.Assets [Fact] public async Task Should_read_and_write_file() { - ((IExternalSystem)Sut).Connect(); + ((IInitializable)Sut).Initialize(); var assetId = Id(); var assetData = new MemoryStream(new byte[] { 0x1, 0x2, 0x3, 0x4 }); @@ -67,7 +67,7 @@ namespace Squidex.Infrastructure.Assets [Fact] public async Task Should_commit_temporary_file() { - ((IExternalSystem)Sut).Connect(); + ((IInitializable)Sut).Initialize(); var tempId = Id(); @@ -87,7 +87,7 @@ namespace Squidex.Infrastructure.Assets [Fact] public async Task Should_ignore_when_deleting_twice() { - ((IExternalSystem)Sut).Connect(); + ((IInitializable)Sut).Initialize(); var tempId = Id(); diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs index dcab0c97b..47953e893 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/AzureBlobAssetStoreTests.cs @@ -25,7 +25,7 @@ namespace Squidex.Infrastructure.Assets // [Fact] public void Should_calculate_source_url() { - Sut.Connect(); + Sut.Initialize(); var id = Guid.NewGuid().ToString(); diff --git a/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs index 721b8465f..e1b5b0f16 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/FolderAssetStoreTests.cs @@ -34,13 +34,13 @@ namespace Squidex.Infrastructure.Assets [Fact] public void Should_throw_when_creating_directory_failed() { - Assert.Throws(() => new FolderAssetStore(CreateInvalidPath(), A.Dummy()).Connect()); + Assert.Throws(() => new FolderAssetStore(CreateInvalidPath(), A.Dummy()).Initialize()); } [Fact] public void Should_create_directory_when_connecting() { - Sut.Connect(); + Sut.Initialize(); Assert.True(Directory.Exists(testFolder)); } @@ -48,7 +48,7 @@ namespace Squidex.Infrastructure.Assets [Fact] public void Should_calculate_source_url() { - Sut.Connect(); + Sut.Initialize(); var id = Guid.NewGuid().ToString(); diff --git a/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs index 2318a2208..f89a7e9d5 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/GoogleCloudAssetStoreTests.cs @@ -25,7 +25,7 @@ namespace Squidex.Infrastructure.Assets // [Fact] public void Should_calculate_source_url() { - Sut.Connect(); + Sut.Initialize(); var id = Guid.NewGuid().ToString(); diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/Grains/EventConsumerManagerTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/Grains/EventConsumerManagerTests.cs index e6d1edd31..84d336a02 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/Grains/EventConsumerManagerTests.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/Grains/EventConsumerManagerTests.cs @@ -42,7 +42,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains [Fact] public void Should_activate_all_actors() { - sut.Connect(); + sut.Run(); A.CallTo(() => actor1.Activate(consumer1)) .MustHaveHappened(); @@ -54,7 +54,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains [Fact] public void Should_start_correct_actor() { - sut.Connect(); + sut.Run(); pubSub.Publish(new StartConsumerMessage { ConsumerName = consumerName1 }, true); @@ -68,7 +68,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains [Fact] public void Should_stop_correct_actor() { - sut.Connect(); + sut.Run(); pubSub.Publish(new StopConsumerMessage { ConsumerName = consumerName1 }, true); @@ -82,7 +82,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains [Fact] public void Should_reset_correct_actor() { - sut.Connect(); + sut.Run(); pubSub.Publish(new ResetConsumerMessage { ConsumerName = consumerName2 }, true); @@ -96,7 +96,7 @@ namespace Squidex.Infrastructure.EventSourcing.Grains [Fact] public async Task Should_get_state_from_all_actors() { - sut.Connect(); + sut.Run(); A.CallTo(() => actor1.GetState()) .Returns(new EventConsumerInfo { Name = consumerName1, Position = "123 " }); diff --git a/tests/Squidex.Infrastructure.Tests/States/StateEventSourcingTests.cs b/tests/Squidex.Infrastructure.Tests/States/StateEventSourcingTests.cs index ac1581d2e..7af4608b9 100644 --- a/tests/Squidex.Infrastructure.Tests/States/StateEventSourcingTests.cs +++ b/tests/Squidex.Infrastructure.Tests/States/StateEventSourcingTests.cs @@ -88,7 +88,7 @@ namespace Squidex.Infrastructure.States .Returns(key); sut = new StateFactory(pubSub, cache, eventStore, eventDataFormatter, services, streamNameResolver); - sut.Connect(); + sut.Initialize(); } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/States/StateSnapshotTests.cs b/tests/Squidex.Infrastructure.Tests/States/StateSnapshotTests.cs index 1a84194a0..0243c0c55 100644 --- a/tests/Squidex.Infrastructure.Tests/States/StateSnapshotTests.cs +++ b/tests/Squidex.Infrastructure.Tests/States/StateSnapshotTests.cs @@ -75,7 +75,7 @@ namespace Squidex.Infrastructure.States .Returns(snapshotStore); sut = new StateFactory(pubSub, cache, eventStore, eventDataFormatter, services, streamNameResolver); - sut.Connect(); + sut.Initialize(); } public void Dispose()