From 5531e827f04a83871b725eb55363b044047f104a Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Wed, 30 Dec 2020 14:13:49 +0800
Subject: [PATCH] Make ContainerName nullable

---
 .../Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs  | 10 +++++-----
 .../Aliyun/AliyunBlobProviderConfiguration.cs          |  2 +-
 .../BlobStoring/Aws/AwsBlobProviderConfiguration.cs    |  2 +-
 .../Azure/AzureBlobProviderConfiguration.cs            |  2 +-
 .../Minio/MinioBlobProviderConfiguration.cs            |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs
index aa0fecaf09..d6c9303afd 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs
@@ -37,7 +37,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             var blobName = AliyunBlobNameCalculator.Calculate(args);
             var aliyunConfig = args.Configuration.GetAliyunConfiguration();
             var ossClient = GetOssClient(aliyunConfig);
-            if (!args.OverrideExisting && BlobExistsAsync(ossClient, containerName, blobName))
+            if (!args.OverrideExisting && BlobExists(ossClient, containerName, blobName))
             {
                 throw new BlobAlreadyExistsException($"Saving BLOB '{args.BlobName}' does already exists in the container '{containerName}'! Set {nameof(args.OverrideExisting)} if it should be overwritten.");
             }
@@ -57,7 +57,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             var containerName = GetContainerName(args);
             var blobName = AliyunBlobNameCalculator.Calculate(args);
             var ossClient = GetOssClient(args.Configuration);
-            if(!BlobExistsAsync(ossClient, containerName, blobName))
+            if(!BlobExists(ossClient, containerName, blobName))
             {
                 return Task.FromResult(false);
             }
@@ -70,7 +70,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             var containerName = GetContainerName(args);
             var blobName = AliyunBlobNameCalculator.Calculate(args);
             var ossClient = GetOssClient(args.Configuration);
-            return Task.FromResult(BlobExistsAsync(ossClient, containerName, blobName));
+            return Task.FromResult(BlobExists(ossClient, containerName, blobName));
         }
 
         public async override Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
@@ -78,7 +78,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             var containerName = GetContainerName(args);
             var blobName = AliyunBlobNameCalculator.Calculate(args);
             var ossClient = GetOssClient(args.Configuration);
-            if (!BlobExistsAsync(ossClient, containerName, blobName))
+            if (!BlobExists(ossClient, containerName, blobName))
             {
                 return null;
             }
@@ -96,7 +96,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
                 : configuration.ContainerName;
         }
 
-        private bool BlobExistsAsync(IOss ossClient,string containerName, string blobName)
+        private bool BlobExists(IOss ossClient,string containerName, string blobName)
         {
             // Make sure Blob Container exists.
             return ossClient.DoesBucketExist(containerName) &&
diff --git a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProviderConfiguration.cs b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProviderConfiguration.cs
index 757ad4b54c..276cbd8fc7 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProviderConfiguration.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProviderConfiguration.cs
@@ -81,7 +81,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
         /// </summary>
         public string ContainerName
         {
-            get => _containerConfiguration.GetConfiguration<string>(AliyunBlobProviderConfigurationNames.ContainerName);
+            get => _containerConfiguration.GetConfigurationOrDefault<string>(AliyunBlobProviderConfigurationNames.ContainerName);
             set => _containerConfiguration.SetConfiguration(AliyunBlobProviderConfigurationNames.ContainerName, Check.NotNullOrWhiteSpace(value, nameof(value)));
         }
 
diff --git a/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProviderConfiguration.cs b/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProviderConfiguration.cs
index c2d3297f4e..2be373e428 100644
--- a/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProviderConfiguration.cs
+++ b/framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProviderConfiguration.cs
@@ -81,7 +81,7 @@ namespace Volo.Abp.BlobStoring.Aws
         /// </summary>
         public string ContainerName
         {
-            get => _containerConfiguration.GetConfiguration<string>(AwsBlobProviderConfigurationNames.ContainerName);
+            get => _containerConfiguration.GetConfigurationOrDefault<string>(AwsBlobProviderConfigurationNames.ContainerName);
             set => _containerConfiguration.SetConfiguration(AwsBlobProviderConfigurationNames.ContainerName, Check.NotNullOrWhiteSpace(value, nameof(value)));
         }
 
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 7ab338794b..969057d7d6 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
@@ -16,7 +16,7 @@
         /// </summary>
         public string ContainerName
         {
-            get => _containerConfiguration.GetConfiguration<string>(AzureBlobProviderConfigurationNames.ContainerName);
+            get => _containerConfiguration.GetConfigurationOrDefault<string>(AzureBlobProviderConfigurationNames.ContainerName);
             set => _containerConfiguration.SetConfiguration(AzureBlobProviderConfigurationNames.ContainerName, Check.NotNullOrWhiteSpace(value, nameof(value)));
         }
 
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 63b0132d20..395aa76a72 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
@@ -4,7 +4,7 @@
     {
         public string BucketName
         {
-            get => _containerConfiguration.GetConfiguration<string>(MinioBlobProviderConfigurationNames.BucketName);
+            get => _containerConfiguration.GetConfigurationOrDefault<string>(MinioBlobProviderConfigurationNames.BucketName);
             set => _containerConfiguration.SetConfiguration(MinioBlobProviderConfigurationNames.BucketName, Check.NotNullOrWhiteSpace(value, nameof(value)));
         }
 
@@ -42,7 +42,7 @@
         {
             get => _containerConfiguration.GetConfigurationOrDefault(MinioBlobProviderConfigurationNames.WithSSL, false);
             set => _containerConfiguration.SetConfiguration(MinioBlobProviderConfigurationNames.WithSSL, value);
-        } 
+        }
 
         /// <summary>
         ///Default value: false.