From 5c38aa1b74cec7569f01d9ed6a7d532ecf130c9c Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 13 Jul 2023 17:15:01 +0800 Subject: [PATCH] Enable nullable annotations for Volo.Abp.HangFire --- framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj | 2 ++ .../Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs | 6 +++--- .../Volo/Abp/Hangfire/AbpHangfireModule.cs | 2 +- .../Volo/Abp/Hangfire/AbpHangfireOptions.cs | 9 +++------ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj index dfd64e0b1a..07e299f859 100644 --- a/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj +++ b/framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj @@ -5,6 +5,8 @@ netstandard2.0;netstandard2.1;net7.0 + enable + Nullable Volo.Abp.HangFire Volo.Abp.HangFire $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs index 9b6a6941ae..bd65b22dba 100644 --- a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs +++ b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs @@ -10,9 +10,9 @@ namespace Volo.Abp.Hangfire; public class AbpHangfireAuthorizationFilter : IDashboardAsyncAuthorizationFilter { private readonly bool _enableTenant; - private readonly string _requiredPermissionName; + private readonly string? _requiredPermissionName; - public AbpHangfireAuthorizationFilter(bool enableTenant = false, string requiredPermissionName = null) + public AbpHangfireAuthorizationFilter(bool enableTenant = false, string? requiredPermissionName = null) { _enableTenant = requiredPermissionName.IsNullOrWhiteSpace() ? enableTenant : true; _requiredPermissionName = requiredPermissionName; @@ -30,7 +30,7 @@ public class AbpHangfireAuthorizationFilter : IDashboardAsyncAuthorizationFilter return true; } - return await IsPermissionGrantedAsync(context, _requiredPermissionName); + return await IsPermissionGrantedAsync(context, _requiredPermissionName!); } private static bool IsLoggedIn(DashboardContext context, bool enableTenant) diff --git a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs index 13f36751aa..6c34b86904 100644 --- a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs +++ b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Hangfire; [DependsOn(typeof(AbpAuthorizationAbstractionsModule))] public class AbpHangfireModule : AbpModule { - private AbpHangfireBackgroundJobServer _backgroundJobServer; + private AbpHangfireBackgroundJobServer? _backgroundJobServer; public override void ConfigureServices(ServiceConfigurationContext context) { diff --git a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireOptions.cs b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireOptions.cs index 43c5554d55..31888ccc57 100644 --- a/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireOptions.cs +++ b/framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireOptions.cs @@ -12,14 +12,11 @@ namespace Volo.Abp.Hangfire; public class AbpHangfireOptions { - [CanBeNull] - public BackgroundJobServerOptions ServerOptions { get; set; } + public BackgroundJobServerOptions? ServerOptions { get; set; } - [CanBeNull] - public IEnumerable AdditionalProcesses { get; set; } + public IEnumerable? AdditionalProcesses { get; set; } - [CanBeNull] - public JobStorage Storage { get; set; } + public JobStorage? Storage { get; set; } [NotNull] public Func BackgroundJobServerFactory {