From 595a44fa9406283fa09795d0cb316bc02983efe6 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 24 Feb 2020 18:04:19 +0800 Subject: [PATCH] Code formatting --- .../Quartz/QuartzBackgroundJobManager.cs | 2 -- .../Quartz/QuartzJobExecutionAdapter.cs | 3 +-- .../FodyWeavers.xml | 2 +- .../Quartz/AbpBackgroundWorkersQuartzModule.cs | 5 +---- .../Quartz/QuartzBackgroundWorkerBase.cs | 2 -- .../Quartz/QuartzBackgroundWorkerManager.cs | 5 +---- .../AbpQuartzServiceCollectionExtensions.cs | 16 ---------------- .../Volo/Abp/Quartz/AbpQuartzJobFactory.cs | 1 + .../Volo/Abp/Quartz/AbpQuartzModule.cs | 6 ++++-- .../Volo/Abp/Quartz/AbpQuartzPreOptions.cs | 1 - 10 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 framework/src/Volo.Abp.Quartz/Microsoft/Extensions/DependencyInjection/AbpQuartzServiceCollectionExtensions.cs diff --git a/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzBackgroundJobManager.cs b/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzBackgroundJobManager.cs index ebc1e747d0..2e7b8193b4 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzBackgroundJobManager.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzBackgroundJobManager.cs @@ -20,9 +20,7 @@ namespace Volo.Abp.BackgroundJobs.Quartz { var jobDetail = JobBuilder.Create>().SetJobData(new JobDataMap { { nameof(TArgs), args } }).Build(); var trigger = !delay.HasValue ? TriggerBuilder.Create().StartNow().Build() : TriggerBuilder.Create().StartAt(new DateTimeOffset(DateTime.Now.Add(delay.Value))).Build(); - await _scheduler.ScheduleJob(jobDetail, trigger); - return jobDetail.Key.ToString(); } } diff --git a/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzJobExecutionAdapter.cs b/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzJobExecutionAdapter.cs index 614c09af2c..59a0223465 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzJobExecutionAdapter.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo/Abp/BackgroundJobs/Quartz/QuartzJobExecutionAdapter.cs @@ -11,7 +11,7 @@ namespace Volo.Abp.BackgroundJobs.Quartz protected AbpBackgroundJobOptions Options { get; } protected IServiceScopeFactory ServiceScopeFactory { get; } protected IBackgroundJobExecuter JobExecuter { get; } - + public QuartzJobExecutionAdapter( IOptions options, IBackgroundJobExecuter jobExecuter, @@ -22,7 +22,6 @@ namespace Volo.Abp.BackgroundJobs.Quartz Options = options.Value; } - public async Task Execute(IJobExecutionContext context) { using (var scope = ServiceScopeFactory.CreateScope()) diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/FodyWeavers.xml b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/FodyWeavers.xml index 00e1d9a1c1..be0de3a908 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/FodyWeavers.xml +++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/FodyWeavers.xml @@ -1,3 +1,3 @@  - + \ No newline at end of file diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs index 37f9329b10..bf7e091e7b 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/AbpBackgroundWorkersQuartzModule.cs @@ -14,12 +14,9 @@ namespace Volo.Abp.BackgroundWorkers.Quartz public override void PreConfigureServices(ServiceConfigurationContext context) { context.Services.AddConventionalRegistrar(new AbpQuartzConventionalRegistrar()); - context.Services.Replace(ServiceDescriptor - .Transient()); - + context.Services.Replace(ServiceDescriptor.Transient()); } - public override void OnApplicationInitialization(ApplicationInitializationContext context) { using (var scope = context.ServiceProvider.CreateScope()) diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerBase.cs b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerBase.cs index a72d75b840..4b18b9424e 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerBase.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerBase.cs @@ -7,8 +7,6 @@ namespace Volo.Abp.BackgroundWorkers.Quartz { public ITrigger Trigger { get; set; } public IJobDetail JobDetail { get; set; } - - public abstract Task Execute(IJobExecutionContext context); } diff --git a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerManager.cs b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerManager.cs index beaa049f5a..3fbdfd7ba7 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerManager.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerManager.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading; +using System.Threading; using System.Threading.Tasks; using Quartz; using Volo.Abp.DependencyInjection; @@ -27,7 +26,6 @@ namespace Volo.Abp.BackgroundWorkers.Quartz { await _scheduler.PauseAll(cancellationToken); } - } public void Add(IBackgroundWorker worker) @@ -40,6 +38,5 @@ namespace Volo.Abp.BackgroundWorkers.Quartz AsyncHelper.RunSync(() => _scheduler.ScheduleJob(quartzWork.JobDetail, quartzWork.Trigger)); } } - } } diff --git a/framework/src/Volo.Abp.Quartz/Microsoft/Extensions/DependencyInjection/AbpQuartzServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Quartz/Microsoft/Extensions/DependencyInjection/AbpQuartzServiceCollectionExtensions.cs deleted file mode 100644 index 20597fc94e..0000000000 --- a/framework/src/Volo.Abp.Quartz/Microsoft/Extensions/DependencyInjection/AbpQuartzServiceCollectionExtensions.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Quartz.Impl; -using Quartz.Spi; -using Volo.Abp.Quartz; -using Volo.Abp.Threading; - -namespace Microsoft.Extensions.DependencyInjection -{ - public static class AbpQuartzServiceCollectionExtensions - { - public static IServiceCollection AddQuartz(this IServiceCollection services, AbpQuartzPreOptions options) - { - services.AddSingleton(AsyncHelper.RunSync(() => new StdSchedulerFactory(options.Properties).GetScheduler())); - return services.AddSingleton(typeof(IJobFactory), typeof(AbpQuartzJobFactory)); - } - } -} diff --git a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzJobFactory.cs b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzJobFactory.cs index 8e738b9bb8..808ee06e94 100644 --- a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzJobFactory.cs +++ b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzJobFactory.cs @@ -8,6 +8,7 @@ namespace Volo.Abp.Quartz public class AbpQuartzJobFactory : IJobFactory { private readonly IServiceProvider _serviceProvider; + public AbpQuartzJobFactory(IServiceProvider serviceProvider) { _serviceProvider = serviceProvider; diff --git a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs index e1ae376a12..c16ab14f4d 100644 --- a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs +++ b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzModule.cs @@ -1,19 +1,21 @@ using Microsoft.Extensions.DependencyInjection; using Quartz; +using Quartz.Impl; using Quartz.Spi; using Volo.Abp.Modularity; +using Volo.Abp.Threading; namespace Volo.Abp.Quartz { public class AbpQuartzModule : AbpModule { - private IScheduler _scheduler; public override void ConfigureServices(ServiceConfigurationContext context) { var options = context.Services.ExecutePreConfiguredActions(); - context.Services.AddQuartz(options); + context.Services.AddSingleton(AsyncHelper.RunSync(() => new StdSchedulerFactory(options.Properties).GetScheduler())); + context.Services.AddSingleton(typeof(IJobFactory), typeof(AbpQuartzJobFactory)); } public override void OnApplicationInitialization(ApplicationInitializationContext context) diff --git a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzPreOptions.cs b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzPreOptions.cs index cfab842a28..0c60ee13be 100644 --- a/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzPreOptions.cs +++ b/framework/src/Volo.Abp.Quartz/Volo/Abp/Quartz/AbpQuartzPreOptions.cs @@ -1,5 +1,4 @@ using System.Collections.Specialized; -using JetBrains.Annotations; namespace Volo.Abp.Quartz {