From 9b6c545bd78713537c042fb264aea0c2de968acf Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 13 Jul 2023 15:36:26 +0800 Subject: [PATCH] Enable nullable annotations for Volo.Abp.BackgroundJobs.Abstractions --- .../Volo.Abp.BackgroundJobs.Abstractions.csproj | 2 ++ .../Volo/Abp/BackgroundJobs/BackgroundJobExecuter.cs | 4 ++-- .../BackgroundJobExecutionException.cs | 4 ++-- .../Abp/BackgroundJobs/BackgroundJobNameAttribute.cs | 12 ++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.csproj b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.csproj index 3633fd45e3..e12574e992 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.csproj +++ b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo.Abp.BackgroundJobs.Abstractions.csproj @@ -5,6 +5,8 @@ netstandard2.0;netstandard2.1;net7.0 + enable + Nullable Volo.Abp.BackgroundJobs.Abstractions Volo.Abp.BackgroundJobs.Abstractions $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecuter.cs b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecuter.cs index 7798a8d9a6..6b6d822c50 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecuter.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecuter.cs @@ -54,7 +54,7 @@ public class BackgroundJobExecuter : IBackgroundJobExecuter, ITransientDependenc { if (jobExecuteMethod.Name == nameof(IAsyncBackgroundJob.ExecuteAsync)) { - await ((Task)jobExecuteMethod.Invoke(job, new[] { context.JobArgs })); + await ((Task)jobExecuteMethod.Invoke(job, new[] { context.JobArgs })!); } else { @@ -74,7 +74,7 @@ public class BackgroundJobExecuter : IBackgroundJobExecuter, ITransientDependenc throw new BackgroundJobExecutionException("A background job execution is failed. See inner exception for details.", ex) { - JobType = context.JobType.AssemblyQualifiedName, + JobType = context.JobType.AssemblyQualifiedName!, JobArgs = context.JobArgs }; } diff --git a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecutionException.cs b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecutionException.cs index 6c2df10a4f..f8c98437dc 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecutionException.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecutionException.cs @@ -6,9 +6,9 @@ namespace Volo.Abp.BackgroundJobs; [Serializable] public class BackgroundJobExecutionException : AbpException { - public string JobType { get; set; } + public string JobType { get; set; } = default!; - public object JobArgs { get; set; } + public object JobArgs { get; set; } = default!; public BackgroundJobExecutionException() { diff --git a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobNameAttribute.cs b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobNameAttribute.cs index edac395039..012569c423 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobNameAttribute.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobNameAttribute.cs @@ -22,11 +22,11 @@ public class BackgroundJobNameAttribute : Attribute, IBackgroundJobNameProvider { Check.NotNull(jobArgsType, nameof(jobArgsType)); - return jobArgsType - .GetCustomAttributes(true) - .OfType() - .FirstOrDefault() - ?.Name - ?? jobArgsType.FullName; + return (jobArgsType + .GetCustomAttributes(true) + .OfType() + .FirstOrDefault() + ?.Name + ?? jobArgsType.FullName)!; } }