From f96c6cdea655b3b25dc685f97760debc13e13532 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Fri, 14 Jul 2023 15:06:45 +0800
Subject: [PATCH] Enable nullable annotations for Volo.Abp.BlobStoring.Minio

---
 .../Volo.Abp.BlobStoring.Minio.csproj                         | 2 ++
 .../Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs           | 4 ++--
 .../Abp/BlobStoring/Minio/MinioBlobProviderConfiguration.cs   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj b/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj
index 2b1b19e92f..ab6e32fe12 100644
--- a/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj
+++ b/framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj
@@ -4,6 +4,8 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
     <AssemblyName>Volo.Abp.BlobStoring.Minio</AssemblyName>
     <PackageId>Volo.Abp.BlobStoring.Minio</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
diff --git a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs
index 3b62cd4983..627de6e5cf 100644
--- a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs
@@ -69,7 +69,7 @@ public class MinioBlobProvider : BlobProviderBase, ITransientDependency
         return await BlobExistsAsync(client, containerName, blobName);
     }
 
-    public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+    public override async Task<Stream?> GetOrNullAsync(BlobProviderGetArgs args)
     {
         var blobName = MinioBlobNameCalculator.Calculate(args);
         var client = GetMinioClient(args);
@@ -152,6 +152,6 @@ public class MinioBlobProvider : BlobProviderBase, ITransientDependency
 
         return configuration.BucketName.IsNullOrWhiteSpace()
             ? args.ContainerName
-            : BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.BucketName);
+            : BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.BucketName!);
     }
 }
diff --git a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProviderConfiguration.cs b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProviderConfiguration.cs
index a9ec2abe28..e626a6837e 100644
--- a/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProviderConfiguration.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProviderConfiguration.cs
@@ -2,7 +2,7 @@
 
 public class MinioBlobProviderConfiguration
 {
-    public string BucketName {
+    public string? BucketName {
         get => _containerConfiguration.GetConfigurationOrDefault<string>(MinioBlobProviderConfigurationNames.BucketName);
         set => _containerConfiguration.SetConfiguration(MinioBlobProviderConfigurationNames.BucketName, value);
     }