diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs index 8b912dfb73..4f1c587530 100644 --- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs +++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobContainerConfigurationExtensions.cs @@ -15,7 +15,7 @@ namespace Volo.Abp.BlobStoring.Azure Action azureConfigureAction) { containerConfiguration.ProviderType = typeof(AzureBlobProvider); - containerConfiguration.NamingNormalizerProviders.Add(); + containerConfiguration.NamingNormalizers.Add(); azureConfigureAction(new AzureBlobProviderConfiguration(containerConfiguration)); diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/DefaultAzureBlobNamingNormalizerProvider.cs b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs similarity index 94% rename from framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/DefaultAzureBlobNamingNormalizerProvider.cs rename to framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs index d787553134..43b479e08e 100644 --- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/DefaultAzureBlobNamingNormalizerProvider.cs +++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobNamingNormalizer.cs @@ -3,7 +3,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.BlobStoring.Azure { - public class DefaultAzureBlobNamingNormalizerProvider : IBlobNamingNormalizerProvider, ITransientDependency + public class AzureBlobNamingNormalizer : IBlobNamingNormalizer, ITransientDependency { /// ///https://docs.microsoft.com/en-us/rest/api/storageservices/naming-and-referencing-containers--blobs--and-metadata#container-names diff --git a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs index 92c03580a6..659b5cd2bc 100644 --- a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs +++ b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobContainerConfigurationExtensions.cs @@ -15,7 +15,7 @@ namespace Volo.Abp.BlobStoring.FileSystem Action fileSystemConfigureAction) { containerConfiguration.ProviderType = typeof(FileSystemBlobProvider); - containerConfiguration.NamingNormalizerProviders.Add(); + containerConfiguration.NamingNormalizers.Add(); fileSystemConfigureAction(new FileSystemBlobProviderConfiguration(containerConfiguration)); diff --git a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/DefaultFileSystemBlobNamingNormalizerProvider.cs b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs similarity index 83% rename from framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/DefaultFileSystemBlobNamingNormalizerProvider.cs rename to framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs index bf42e3589a..f7d273dca7 100644 --- a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/DefaultFileSystemBlobNamingNormalizerProvider.cs +++ b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo/Abp/BlobStoring/FileSystem/FileSystemBlobNamingNormalizer.cs @@ -6,11 +6,11 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.BlobStoring.FileSystem { - public class DefaultFileSystemBlobNamingNormalizerProvider : IBlobNamingNormalizerProvider, ITransientDependency + public class FileSystemBlobNamingNormalizer : IBlobNamingNormalizer, ITransientDependency { private readonly IOSPlatformProvider _iosPlatformProvider; - public DefaultFileSystemBlobNamingNormalizerProvider(IOSPlatformProvider iosPlatformProvider) + public FileSystemBlobNamingNormalizer(IOSPlatformProvider iosPlatformProvider) { _iosPlatformProvider = iosPlatformProvider; } diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainer.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainer.cs index 576e287cb0..a665e89e7f 100644 --- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainer.cs +++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Linq; using System.Threading; @@ -106,17 +106,17 @@ namespace Volo.Abp.BlobStoring private (string, string) NormalizeContainerNameAndBlobName(string containerName, string blobName) { - if (!Configuration.NamingNormalizerProviders.Any()) + if (!Configuration.NamingNormalizers.Any()) { return (containerName, blobName); } using (var scope = ServiceProvider.CreateScope()) { - foreach (var provider in Configuration.NamingNormalizerProviders) + foreach (var provider in Configuration.NamingNormalizers) { var blobNamingNormalizerProvider = scope.ServiceProvider.GetRequiredService(provider) - .As(); + .As(); containerName = blobNamingNormalizerProvider.NormalizeContainerName(containerName); blobName = blobNamingNormalizerProvider.NormalizeBlobName(blobName); 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 f5c6a7e50d..7ca94b4b42 100644 --- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs +++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerConfiguration.cs @@ -24,7 +24,7 @@ namespace Volo.Abp.BlobStoring /// public bool IsMultiTenant { get; set; } = true; - public ITypeList NamingNormalizerProviders { get; } + public ITypeList NamingNormalizers { get; } [NotNull] private readonly Dictionary _properties; @@ -32,7 +32,7 @@ namespace Volo.Abp.BlobStoring public BlobContainerConfiguration(BlobContainerConfiguration fallbackConfiguration = null) { - NamingNormalizerProviders = new TypeList(); + NamingNormalizers = new TypeList(); _fallbackConfiguration = fallbackConfiguration; _properties = new Dictionary(); } diff --git a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobNamingNormalizerProvider.cs b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobNamingNormalizer.cs similarity index 76% rename from framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobNamingNormalizerProvider.cs rename to framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobNamingNormalizer.cs index 8c5bff81c4..2bdc03507d 100644 --- a/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobNamingNormalizerProvider.cs +++ b/framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobNamingNormalizer.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.BlobStoring { - public interface IBlobNamingNormalizerProvider + public interface IBlobNamingNormalizer { string NormalizeContainerName(string containerName); diff --git a/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo/Abp/BlobStoring/Azure/DefaultAzureBlobNamingNormalizerProvider_Tests.cs b/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo/Abp/BlobStoring/Azure/DefaultAzureBlobNamingNormalizerProvider_Tests.cs index 50e7e0b7ab..23df740630 100644 --- a/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo/Abp/BlobStoring/Azure/DefaultAzureBlobNamingNormalizerProvider_Tests.cs +++ b/framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo/Abp/BlobStoring/Azure/DefaultAzureBlobNamingNormalizerProvider_Tests.cs @@ -5,18 +5,18 @@ namespace Volo.Abp.BlobStoring.Azure { public class DefaultAzureBlobNamingNormalizerProvider_Tests : AbpBlobStoringAzureTestCommonBase { - private readonly IBlobNamingNormalizerProvider _blobNamingNormalizerProvider; + private readonly IBlobNamingNormalizer _blobNamingNormalizer; public DefaultAzureBlobNamingNormalizerProvider_Tests() { - _blobNamingNormalizerProvider = GetRequiredService(); + _blobNamingNormalizer = GetRequiredService(); } [Fact] public void NormalizeContainerName_Lowercase() { var filename = "ThisIsMyContainerName"; - filename = _blobNamingNormalizerProvider.NormalizeContainerName(filename); + filename = _blobNamingNormalizer.NormalizeContainerName(filename); filename.ShouldBe("thisismycontainername"); } @@ -24,7 +24,7 @@ namespace Volo.Abp.BlobStoring.Azure public void NormalizeContainerName_Only_Letters_Numbers_Dash() { var filename = ",./this-i,./s-my-c,./ont,./ai+*/.=!@#$n^&*er-name.+/"; - filename = _blobNamingNormalizerProvider.NormalizeContainerName(filename); + filename = _blobNamingNormalizer.NormalizeContainerName(filename); filename.ShouldBe("this-is-my-container-name"); } @@ -32,7 +32,7 @@ namespace Volo.Abp.BlobStoring.Azure public void NormalizeContainerName_Dash() { var filename = "-this--is----my-container----name-"; - filename = _blobNamingNormalizerProvider.NormalizeContainerName(filename); + filename = _blobNamingNormalizer.NormalizeContainerName(filename); filename.ShouldBe("this-is-my-container-name"); } @@ -41,7 +41,7 @@ namespace Volo.Abp.BlobStoring.Azure public void NormalizeContainerName_Min_Length() { var filename = "a"; - filename = _blobNamingNormalizerProvider.NormalizeContainerName(filename); + filename = _blobNamingNormalizer.NormalizeContainerName(filename); filename.Length.ShouldBeGreaterThanOrEqualTo(3); } @@ -50,7 +50,7 @@ namespace Volo.Abp.BlobStoring.Azure public void NormalizeContainerName_Max_Length() { var filename = "abpabpabpabpabpabpabpabpabpabpabpabpabpabpabpabpabpabpabpabpabpabpabp"; - filename = _blobNamingNormalizerProvider.NormalizeContainerName(filename); + filename = _blobNamingNormalizer.NormalizeContainerName(filename); filename.Length.ShouldBeLessThanOrEqualTo(63); } } diff --git a/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo/Abp/BlobStoring/FileSystem/DefaultFileSystemBlobNamingNormalizerProvider_Tests.cs b/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo/Abp/BlobStoring/FileSystem/DefaultFileSystemBlobNamingNormalizerProvider_Tests.cs index 7b4282996c..b3f9fcf5d1 100644 --- a/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo/Abp/BlobStoring/FileSystem/DefaultFileSystemBlobNamingNormalizerProvider_Tests.cs +++ b/framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo/Abp/BlobStoring/FileSystem/DefaultFileSystemBlobNamingNormalizerProvider_Tests.cs @@ -9,11 +9,11 @@ namespace Volo.Abp.BlobStoring.FileSystem { public class DefaultFileSystemBlobNamingNormalizerProvider_Tests : AbpBlobStoringFileSystemTestBase { - private readonly IBlobNamingNormalizerProvider _blobNamingNormalizerProvider; + private readonly IBlobNamingNormalizer _blobNamingNormalizer; public DefaultFileSystemBlobNamingNormalizerProvider_Tests() { - _blobNamingNormalizerProvider = GetRequiredService(); + _blobNamingNormalizer = GetRequiredService(); } protected override void AfterAddApplication(IServiceCollection services) @@ -27,7 +27,7 @@ namespace Volo.Abp.BlobStoring.FileSystem public void NormalizeContainerName() { var filename = "thisismy:*?\"<>|foldername"; - filename = _blobNamingNormalizerProvider.NormalizeContainerName(filename); + filename = _blobNamingNormalizer.NormalizeContainerName(filename); filename.ShouldBe("thisismyfoldername"); } @@ -35,7 +35,7 @@ namespace Volo.Abp.BlobStoring.FileSystem public void NormalizeBlobName() { var filename = "thisismy:*?\"<>|filename"; - filename = _blobNamingNormalizerProvider.NormalizeContainerName(filename); + filename = _blobNamingNormalizer.NormalizeContainerName(filename); filename.ShouldBe("thisismyfilename"); } @@ -45,7 +45,7 @@ namespace Volo.Abp.BlobStoring.FileSystem public void NormalizeContainerName_With_Directory(string delimiter) { var filename = $"thisis{delimiter}my:*?\"<>|{delimiter}foldername"; - filename = _blobNamingNormalizerProvider.NormalizeContainerName(filename); + filename = _blobNamingNormalizer.NormalizeContainerName(filename); filename.ShouldBe($"thisis{delimiter}my{delimiter}foldername"); } @@ -55,7 +55,7 @@ namespace Volo.Abp.BlobStoring.FileSystem public void NormalizeBlobName_With_Directory(string delimiter) { var filename = $"thisis{delimiter}my:*?\"<>|{delimiter}filename"; - filename = _blobNamingNormalizerProvider.NormalizeContainerName(filename); + filename = _blobNamingNormalizer.NormalizeContainerName(filename); filename.ShouldBe($"thisis{delimiter}my{delimiter}filename"); } }