From 61106bcf270612965a91394031d5b50870116db0 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:49:47 +0300 Subject: [PATCH] RabbitMqBackgroundJobOptions to AbpRabbitMqBackgroundJobOptions --- ...obOptions.cs => AbpRabbitMqBackgroundJobOptions.cs} | 4 ++-- .../Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/{RabbitMqBackgroundJobOptions.cs => AbpRabbitMqBackgroundJobOptions.cs} (85%) diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/RabbitMqBackgroundJobOptions.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs similarity index 85% rename from framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/RabbitMqBackgroundJobOptions.cs rename to framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs index 95ad677e55..8d588debe9 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/RabbitMqBackgroundJobOptions.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace Volo.Abp.BackgroundJobs.RabbitMQ { - public class RabbitMqBackgroundJobOptions + public class AbpRabbitMqBackgroundJobOptions { /// /// Key: Job Args Type @@ -15,7 +15,7 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ /// public string DefaultQueueNamePrefix { get; set; } - public RabbitMqBackgroundJobOptions() + public AbpRabbitMqBackgroundJobOptions() { JobQueues = new Dictionary(); DefaultQueueNamePrefix = "AbpBackgroundJobs."; diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs index 6979d76999..f2b00345a1 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs @@ -25,7 +25,7 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ public ILogger> Logger { get; set; } protected AbpBackgroundJobOptions AbpBackgroundJobOptions { get; } - protected RabbitMqBackgroundJobOptions RabbitMqBackgroundJobOptions { get; } + protected AbpRabbitMqBackgroundJobOptions AbpRabbitMqBackgroundJobOptions { get; } protected IChannelPool ChannelPool { get; } protected IRabbitMqSerializer Serializer { get; } protected IBackgroundJobExecuter JobExecuter { get; } @@ -36,14 +36,14 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ public JobQueue( IOptions backgroundJobOptions, - IOptions rabbitMqAbpBackgroundJobOptions, + IOptions rabbitMqAbpBackgroundJobOptions, IChannelPool channelPool, IRabbitMqSerializer serializer, IBackgroundJobExecuter jobExecuter, IServiceScopeFactory serviceScopeFactory) { AbpBackgroundJobOptions = backgroundJobOptions.Value; - RabbitMqBackgroundJobOptions = rabbitMqAbpBackgroundJobOptions.Value; + AbpRabbitMqBackgroundJobOptions = rabbitMqAbpBackgroundJobOptions.Value; Serializer = serializer; JobExecuter = jobExecuter; ServiceScopeFactory = serviceScopeFactory; @@ -57,10 +57,10 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ protected virtual JobQueueConfiguration GetOrCreateJobQueueConfiguration() { - return RabbitMqBackgroundJobOptions.JobQueues.GetOrDefault(typeof(TArgs)) ?? + return AbpRabbitMqBackgroundJobOptions.JobQueues.GetOrDefault(typeof(TArgs)) ?? new JobQueueConfiguration( typeof(TArgs), - RabbitMqBackgroundJobOptions.DefaultQueueNamePrefix + JobConfiguration.JobName + AbpRabbitMqBackgroundJobOptions.DefaultQueueNamePrefix + JobConfiguration.JobName ); }