From 5d3610f9a532ecf51f710637294158bb92b2ca94 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Thu, 13 Jul 2023 16:30:58 +0800
Subject: [PATCH] Enable nullable annotations for Volo.Abp.BackgroundWorkers

---
 .../Volo.Abp.BackgroundWorkers.csproj                     | 2 ++
 .../Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs    | 8 ++++----
 .../Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.csproj b/framework/src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.csproj
index f01a73d7a1..48e4b5fdf7 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.csproj
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo.Abp.BackgroundWorkers.csproj
@@ -5,6 +5,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
     <AssemblyName>Volo.Abp.BackgroundWorkers</AssemblyName>
     <PackageId>Volo.Abp.BackgroundWorkers</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs
index dc32981d58..91bc360f72 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerBase.cs
@@ -14,13 +14,13 @@ public abstract class BackgroundWorkerBase : IBackgroundWorker
 {
     //TODO: Add UOW, Localization and other useful properties..?
 
-    public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
+    public IAbpLazyServiceProvider LazyServiceProvider { get; set; } = default!;
 
-    public IServiceProvider ServiceProvider { get; set; }
+    public IServiceProvider ServiceProvider { get; set; } = default!;
 
     protected ILoggerFactory LoggerFactory => LazyServiceProvider.LazyGetRequiredService<ILoggerFactory>();
 
-    protected ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance);
+    protected ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName!) ?? NullLogger.Instance);
 
     protected CancellationTokenSource StoppingTokenSource { get; }
     protected CancellationToken StoppingToken { get; }
@@ -47,6 +47,6 @@ public abstract class BackgroundWorkerBase : IBackgroundWorker
 
     public override string ToString()
     {
-        return GetType().FullName;
+        return GetType().FullName!;
     }
 }
diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs
index 393a4766cf..9d78d9237d 100644
--- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/PeriodicBackgroundWorkerBase.cs
@@ -37,7 +37,7 @@ public abstract class PeriodicBackgroundWorkerBase : BackgroundWorkerBase
         await base.StopAsync(cancellationToken);
     }
 
-    private void Timer_Elapsed(object sender, System.EventArgs e)
+    private void Timer_Elapsed(object? sender, System.EventArgs e)
     {
         using (var scope = ServiceScopeFactory.CreateScope())
         {