From 411d7afa9badfb2ec5a1c7073dcf48043f29392f Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Fri, 14 Jul 2023 14:58:58 +0800
Subject: [PATCH] Enable nullable annotations for Volo.Abp.BlobStoring.Azure

---
 .../Volo.Abp.BlobStoring.Azure.csproj                         | 2 ++
 .../Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs           | 4 ++--
 .../Abp/BlobStoring/Azure/AzureBlobProviderConfiguration.cs   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj b/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj
index 03b01e537c..4f37df6d90 100644
--- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj
+++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj
@@ -5,6 +5,8 @@
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+        <Nullable>enable</Nullable>
+        <WarningsAsErrors>Nullable</WarningsAsErrors>
         <AssemblyName>Volo.Abp.BlobStoring.Azure</AssemblyName>
         <PackageId>Volo.Abp.BlobStoring.Azure</PackageId>
         <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs
index 1a6c45feef..5d45e749ea 100644
--- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs
@@ -56,7 +56,7 @@ public class AzureBlobProvider : BlobProviderBase, ITransientDependency
         return await BlobExistsAsync(args, blobName);
     }
 
-    public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+    public override async Task<Stream?> GetOrNullAsync(BlobProviderGetArgs args)
     {
         var blobName = AzureBlobNameCalculator.Calculate(args);
 
@@ -101,7 +101,7 @@ public class AzureBlobProvider : BlobProviderBase, ITransientDependency
         var configuration = args.Configuration.GetAzureConfiguration();
         return configuration.ContainerName.IsNullOrWhiteSpace()
             ? args.ContainerName
-            : BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.ContainerName);
+            : BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.ContainerName!);
     }
 
     protected virtual async Task<bool> ContainerExistsAsync(BlobContainerClient blobContainerClient)
diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProviderConfiguration.cs b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProviderConfiguration.cs
index 792c9aef66..3a4deeffde 100644
--- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProviderConfiguration.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProviderConfiguration.cs
@@ -13,7 +13,7 @@ public class AzureBlobProviderConfiguration
     /// The name must also be between 3 and 63 characters long.
     /// If this parameter is not specified, the ContainerName of the <see cref="BlobProviderArgs"/> will be used.
     /// </summary>
-    public string ContainerName {
+    public string? ContainerName {
         get => _containerConfiguration.GetConfigurationOrDefault<string>(AzureBlobProviderConfigurationNames.ContainerName);
         set => _containerConfiguration.SetConfiguration(AzureBlobProviderConfigurationNames.ContainerName, value);
     }