Browse Source

Enable nullable annotations for Volo.Abp.HangFire

pull/17109/head
liangshiwei 3 years ago
parent
commit
5c38aa1b74
  1. 2
      framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj
  2. 6
      framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs
  3. 2
      framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs
  4. 9
      framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireOptions.cs

2
framework/src/Volo.Abp.HangFire/Volo.Abp.HangFire.csproj

@ -5,6 +5,8 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks> <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.HangFire</AssemblyName> <AssemblyName>Volo.Abp.HangFire</AssemblyName>
<PackageId>Volo.Abp.HangFire</PackageId> <PackageId>Volo.Abp.HangFire</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

6
framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireAuthorizationFilter.cs

@ -10,9 +10,9 @@ namespace Volo.Abp.Hangfire;
public class AbpHangfireAuthorizationFilter : IDashboardAsyncAuthorizationFilter public class AbpHangfireAuthorizationFilter : IDashboardAsyncAuthorizationFilter
{ {
private readonly bool _enableTenant; 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; _enableTenant = requiredPermissionName.IsNullOrWhiteSpace() ? enableTenant : true;
_requiredPermissionName = requiredPermissionName; _requiredPermissionName = requiredPermissionName;
@ -30,7 +30,7 @@ public class AbpHangfireAuthorizationFilter : IDashboardAsyncAuthorizationFilter
return true; return true;
} }
return await IsPermissionGrantedAsync(context, _requiredPermissionName); return await IsPermissionGrantedAsync(context, _requiredPermissionName!);
} }
private static bool IsLoggedIn(DashboardContext context, bool enableTenant) private static bool IsLoggedIn(DashboardContext context, bool enableTenant)

2
framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireModule.cs

@ -9,7 +9,7 @@ namespace Volo.Abp.Hangfire;
[DependsOn(typeof(AbpAuthorizationAbstractionsModule))] [DependsOn(typeof(AbpAuthorizationAbstractionsModule))]
public class AbpHangfireModule : AbpModule public class AbpHangfireModule : AbpModule
{ {
private AbpHangfireBackgroundJobServer _backgroundJobServer; private AbpHangfireBackgroundJobServer? _backgroundJobServer;
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {

9
framework/src/Volo.Abp.HangFire/Volo/Abp/Hangfire/AbpHangfireOptions.cs

@ -12,14 +12,11 @@ namespace Volo.Abp.Hangfire;
public class AbpHangfireOptions public class AbpHangfireOptions
{ {
[CanBeNull] public BackgroundJobServerOptions? ServerOptions { get; set; }
public BackgroundJobServerOptions ServerOptions { get; set; }
[CanBeNull] public IEnumerable<IBackgroundProcess>? AdditionalProcesses { get; set; }
public IEnumerable<IBackgroundProcess> AdditionalProcesses { get; set; }
[CanBeNull] public JobStorage? Storage { get; set; }
public JobStorage Storage { get; set; }
[NotNull] [NotNull]
public Func<IServiceProvider, BackgroundJobServer> BackgroundJobServerFactory { public Func<IServiceProvider, BackgroundJobServer> BackgroundJobServerFactory {

Loading…
Cancel
Save