From 1cf0382bf7f1770b35711caa7e2146074f04a14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 26 May 2020 06:28:11 +0300
Subject: [PATCH] remove name from BlobContainerConfiguration

---
 .../Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs      |  2 +-
 .../Volo/Abp/BlobStoring/BlobContainerConfiguration.cs |  9 ---------
 .../BlobContainerConfigurationDictionary.cs            | 10 ++--------
 .../Volo/Abp/BlobStoring/BlobContainerFactory.cs       | 10 ++++++----
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs
index 5c8fbe4666..09f7ae34f0 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/AbpBlobStoringOptions.cs
@@ -2,7 +2,7 @@
 {
     public class AbpBlobStoringOptions
     {
-        public BlobContainerConfigurationDictionary Containers { get; set; }
+        public BlobContainerConfigurationDictionary Containers { get; }
 
         public AbpBlobStoringOptions()
         {
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
index 3974fe4d98..d5e480c3aa 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs
@@ -1,19 +1,10 @@
 using System;
 using System.Collections.Generic;
-using JetBrains.Annotations;
 
 namespace Volo.Abp.BlobStoring
 {
     public class BlobContainerConfiguration : Dictionary<string, object>
     {
-        [NotNull]
-        public string Name { get; }
-        
         public Type ProviderType { get; set; }
-        
-        public BlobContainerConfiguration([NotNull] string name)
-        {
-            Name = Check.NotNullOrWhiteSpace(name, nameof(name));
-        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs
index 00bb659de4..43ac7dad68 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfigurationDictionary.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.BlobStoring
 
         public BlobContainerConfigurationDictionary()
         {
-            Default = new BlobContainerConfiguration("_default");
+            Default = new BlobContainerConfiguration();
         }
 
         public BlobContainerConfigurationDictionary Configure<TContainer>(
@@ -29,7 +29,7 @@ namespace Volo.Abp.BlobStoring
             Check.NotNullOrWhiteSpace(name, nameof(name));
             Check.NotNull(configureAction, nameof(configureAction));
             
-            configureAction(this.GetOrAdd(name, () => new BlobContainerConfiguration(name)));
+            configureAction(this.GetOrAdd(name, () => new BlobContainerConfiguration()));
             
             return this;
         }
@@ -39,11 +39,5 @@ namespace Volo.Abp.BlobStoring
             configureAction(Default);
             return this;
         }
-
-        public BlobContainerConfiguration GetOrDefaultConfiguration(string name)
-        {
-            return AbpDictionaryExtensions.GetOrDefault(this, name) ??
-                   Default;
-        }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs
index 731012a3b2..b28b1f1ebd 100644
--- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs
+++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs
@@ -26,16 +26,18 @@ namespace Volo.Abp.BlobStoring
         
         public virtual IBlobContainer Create(string name, CancellationToken cancellationToken = default)
         {
-            var configuration = Options.Containers.GetOrDefaultConfiguration(name);
+            var configuration = Options.Containers.GetOrDefault(name);
             return new BlobContainerToProviderAdapter(
                 name,
                 configuration,
-                GetProvider(configuration)
+                GetProvider(name, configuration)
             );
         }
 
         [NotNull]
-        protected virtual IBlobProvider GetProvider(BlobContainerConfiguration configuration)
+        protected virtual IBlobProvider GetProvider(
+            string containerName,
+            BlobContainerConfiguration configuration)
         {
             if (!BlobProviders.Any())
             {
@@ -51,7 +53,7 @@ namespace Volo.Abp.BlobStoring
             }
 
             throw new AbpException(
-                $"Could not find the BLOB Storage provider with the type ({configuration.ProviderType.AssemblyQualifiedName}) configured for the container {configuration.Name}"
+                $"Could not find the BLOB Storage provider with the type ({configuration.ProviderType.AssemblyQualifiedName}) configured for the container {containerName} and no default provider was set."
             );
         }
     }