From 8d235f08e424f7988736abfef22144ab4b9d3feb Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Tue, 13 Oct 2020 11:16:18 +0800 Subject: [PATCH] Rename AbpEventBusRebusOptions to AbpRebusEventBusOptions --- .../Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs | 4 ++-- ...EventBusRebusOptions.cs => AbpRebusEventBusOptions.cs} | 4 ++-- .../Volo/Abp/EventBus/Rebus/RebusDistributedEventBus.cs | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) rename framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/{AbpEventBusRebusOptions.cs => AbpRebusEventBusOptions.cs} (94%) diff --git a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs index ec9dfe6b07..9ebd91a6a5 100644 --- a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs +++ b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusModule.cs @@ -11,11 +11,11 @@ namespace Volo.Abp.EventBus.Rebus { public override void ConfigureServices(ServiceConfigurationContext context) { - var options = context.Services.ExecutePreConfiguredActions(); + var options = context.Services.ExecutePreConfiguredActions(); context.Services.AddTransient(typeof(IHandleMessages<>), typeof(RebusDistributedEventHandlerAdapter<>)); - Configure(rebusOptions => + Configure(rebusOptions => { rebusOptions.Configurer = options.Configurer; rebusOptions.Publish = options.Publish; diff --git a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusOptions.cs b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpRebusEventBusOptions.cs similarity index 94% rename from framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusOptions.cs rename to framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpRebusEventBusOptions.cs index 06a138f66b..8aaee7bd63 100644 --- a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpEventBusRebusOptions.cs +++ b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/AbpRebusEventBusOptions.cs @@ -8,7 +8,7 @@ using Rebus.Transport.InMem; namespace Volo.Abp.EventBus.Rebus { - public class AbpEventBusRebusOptions + public class AbpRebusEventBusOptions { [NotNull] public string InputQueueName { get; set; } @@ -29,7 +29,7 @@ namespace Volo.Abp.EventBus.Rebus } private Func _publish; - public AbpEventBusRebusOptions() + public AbpRebusEventBusOptions() { _publish = DefaultPublish; _configurer = DefaultConfigurer; diff --git a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/RebusDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/RebusDistributedEventBus.cs index 9a30281617..ce3549646e 100644 --- a/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/RebusDistributedEventBus.cs +++ b/framework/src/Volo.Abp.EventBus.Rebus/Volo/Abp/EventBus/Rebus/RebusDistributedEventBus.cs @@ -23,18 +23,18 @@ namespace Volo.Abp.EventBus.Rebus protected ConcurrentDictionary> HandlerFactories { get; } protected ConcurrentDictionary EventTypes { get; } protected AbpDistributedEventBusOptions AbpDistributedEventBusOptions { get; } - protected AbpEventBusRebusOptions AbpEventBusRebusOptions { get; } + protected AbpRebusEventBusOptions AbpRebusEventBusOptions { get; } public RebusDistributedEventBus( IServiceScopeFactory serviceScopeFactory, ICurrentTenant currentTenant, IBus rebus, IOptions abpDistributedEventBusOptions, - IOptions abpEventBusRebusOptions) : + IOptions abpEventBusRebusOptions) : base(serviceScopeFactory, currentTenant) { Rebus = rebus; - AbpEventBusRebusOptions = abpEventBusRebusOptions.Value; + AbpRebusEventBusOptions = abpEventBusRebusOptions.Value; AbpDistributedEventBusOptions = abpDistributedEventBusOptions.Value; HandlerFactories = new ConcurrentDictionary>(); @@ -126,7 +126,7 @@ namespace Volo.Abp.EventBus.Rebus public override async Task PublishAsync(Type eventType, object eventData) { - await AbpEventBusRebusOptions.Publish(Rebus, eventType, eventData); + await AbpRebusEventBusOptions.Publish(Rebus, eventType, eventData); } private List GetOrCreateHandlerFactories(Type eventType)