Rename IBlobNormalizeNamingFactory to IBlobNormalizeNamingService

framework/src/Volo.Abp.BlobStoring.Aliyun/Volo/Abp/BlobStoring/Aliyun/AliyunBlobProvider.cs

@@ -10,16 +10,16 @@ namespace Volo.Abp.BlobStoring.Aliyun
     {
         protected IOssClientFactory OssClientFactory { get; }
         protected IAliyunBlobNameCalculator AliyunBlobNameCalculator { get; }
-        protected IBlobNormalizeNamingFactory BlobNormalizeNamingFactory { get; }
+        protected IBlobNormalizeNamingService BlobNormalizeNamingService { get; }
 
         public AliyunBlobProvider(
             IOssClientFactory ossClientFactory,
             IAliyunBlobNameCalculator aliyunBlobNameCalculator,
-            IBlobNormalizeNamingFactory blobNormalizeNamingFactory)
+            IBlobNormalizeNamingService blobNormalizeNamingService)
         {
             OssClientFactory = ossClientFactory;
             AliyunBlobNameCalculator = aliyunBlobNameCalculator;
-            BlobNormalizeNamingFactory = blobNormalizeNamingFactory;
+            BlobNormalizeNamingService = blobNormalizeNamingService;
         }
 
         protected virtual IOss GetOssClient(BlobContainerConfiguration blobContainerConfiguration)
@@ -96,7 +96,7 @@ namespace Volo.Abp.BlobStoring.Aliyun
             var configuration = args.Configuration.GetAliyunConfiguration();
             return configuration.ContainerName.IsNullOrWhiteSpace()
                 ? args.ContainerName
-                : BlobNormalizeNamingFactory.NormalizeContainerName(args.Configuration, configuration.ContainerName);
+                : BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.ContainerName);
         }
 
         protected  virtual bool BlobExists(IOss ossClient,string containerName, string blobName)

framework/src/Volo.Abp.BlobStoring.Aws/Volo/Abp/BlobStoring/Aws/AwsBlobProvider.cs

@@ -12,16 +12,16 @@ namespace Volo.Abp.BlobStoring.Aws
     {
         protected IAwsBlobNameCalculator AwsBlobNameCalculator { get; }
         protected IAmazonS3ClientFactory AmazonS3ClientFactory { get; }
-        protected IBlobNormalizeNamingFactory BlobNormalizeNamingFactory { get; }
+        protected IBlobNormalizeNamingService BlobNormalizeNamingService { get; }
 
         public AwsBlobProvider(
             IAwsBlobNameCalculator awsBlobNameCalculator,
             IAmazonS3ClientFactory amazonS3ClientFactory,
-            IBlobNormalizeNamingFactory blobNormalizeNamingFactory)
+            IBlobNormalizeNamingService blobNormalizeNamingService)
         {
             AwsBlobNameCalculator = awsBlobNameCalculator;
             AmazonS3ClientFactory = amazonS3ClientFactory;
-            BlobNormalizeNamingFactory = blobNormalizeNamingFactory;
+            BlobNormalizeNamingService = blobNormalizeNamingService;
         }
 
         public async override Task SaveAsync(BlobProviderSaveArgs args)
@@ -156,7 +156,7 @@ namespace Volo.Abp.BlobStoring.Aws
             var configuration = args.Configuration.GetAwsConfiguration();
             return configuration.ContainerName.IsNullOrWhiteSpace()
                 ? args.ContainerName
-                : BlobNormalizeNamingFactory.NormalizeContainerName(args.Configuration, configuration.ContainerName);
+                : BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.ContainerName);
         }
     }
 }

framework/src/Volo.Abp.BlobStoring.Azure/Volo/Abp/BlobStoring/Azure/AzureBlobProvider.cs

@@ -9,14 +9,14 @@ namespace Volo.Abp.BlobStoring.Azure
     public class AzureBlobProvider : BlobProviderBase, ITransientDependency
     {
         protected IAzureBlobNameCalculator AzureBlobNameCalculator { get; }
-        protected IBlobNormalizeNamingFactory BlobNormalizeNamingFactory { get; }
+        protected IBlobNormalizeNamingService BlobNormalizeNamingService { get; }
 
         public AzureBlobProvider(
             IAzureBlobNameCalculator azureBlobNameCalculator,
-            IBlobNormalizeNamingFactory blobNormalizeNamingFactory)
+            IBlobNormalizeNamingService blobNormalizeNamingService)
         {
             AzureBlobNameCalculator = azureBlobNameCalculator;
-            BlobNormalizeNamingFactory = blobNormalizeNamingFactory;
+            BlobNormalizeNamingService = blobNormalizeNamingService;
         }
 
         public async override Task SaveAsync(BlobProviderSaveArgs args)
@@ -103,7 +103,7 @@ namespace Volo.Abp.BlobStoring.Azure
             var configuration = args.Configuration.GetAzureConfiguration();
             return configuration.ContainerName.IsNullOrWhiteSpace()
                 ? args.ContainerName
-                : BlobNormalizeNamingFactory.NormalizeContainerName(args.Configuration, configuration.ContainerName);
+                : BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.ContainerName);
         }
 
         protected virtual async Task<bool> ContainerExistsAsync(BlobContainerClient blobContainerClient)

framework/src/Volo.Abp.BlobStoring.Minio/Volo/Abp/BlobStoring/Minio/MinioBlobProvider.cs

@@ -10,14 +10,14 @@ namespace Volo.Abp.BlobStoring.Minio
     public class MinioBlobProvider : BlobProviderBase, ITransientDependency
     {
         protected IMinioBlobNameCalculator MinioBlobNameCalculator { get; }
-        protected IBlobNormalizeNamingFactory BlobNormalizeNamingFactory { get; }
+        protected IBlobNormalizeNamingService BlobNormalizeNamingService { get; }
 
         public MinioBlobProvider(
             IMinioBlobNameCalculator minioBlobNameCalculator,
-            IBlobNormalizeNamingFactory blobNormalizeNamingFactory)
+            IBlobNormalizeNamingService blobNormalizeNamingService)
         {
             MinioBlobNameCalculator = minioBlobNameCalculator;
-            BlobNormalizeNamingFactory = blobNormalizeNamingFactory;
+            BlobNormalizeNamingService = blobNormalizeNamingService;
         }
 
         public async override Task SaveAsync(BlobProviderSaveArgs args)
@@ -143,7 +143,7 @@ namespace Volo.Abp.BlobStoring.Minio
 
             return configuration.BucketName.IsNullOrWhiteSpace()
                 ? args.ContainerName
-                : BlobNormalizeNamingFactory.NormalizeContainerName(args.Configuration, configuration.BucketName);
+                : BlobNormalizeNamingService.NormalizeContainerName(args.Configuration, configuration.BucketName);
         }
     }
 }

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainer.cs

@@ -86,7 +86,7 @@ namespace Volo.Abp.BlobStoring
 
         protected IServiceProvider ServiceProvider { get; }
 
-        protected IBlobNormalizeNamingFactory BlobNormalizeNamingFactory { get; }
+        protected IBlobNormalizeNamingService BlobNormalizeNamingService { get; }
 
         public BlobContainer(
             string containerName,
@@ -94,7 +94,7 @@ namespace Volo.Abp.BlobStoring
             IBlobProvider provider,
             ICurrentTenant currentTenant,
             ICancellationTokenProvider cancellationTokenProvider,
-            IBlobNormalizeNamingFactory blobNormalizeNamingFactory,
+            IBlobNormalizeNamingService blobNormalizeNamingService,
             IServiceProvider serviceProvider)
         {
             ContainerName = containerName;
@@ -102,7 +102,7 @@ namespace Volo.Abp.BlobStoring
             Provider = provider;
             CurrentTenant = currentTenant;
             CancellationTokenProvider = cancellationTokenProvider;
-            BlobNormalizeNamingFactory = blobNormalizeNamingFactory;
+            BlobNormalizeNamingService = blobNormalizeNamingService;
             ServiceProvider = serviceProvider;
         }
 
@@ -114,13 +114,13 @@ namespace Volo.Abp.BlobStoring
         {
             using (CurrentTenant.Change(GetTenantIdOrNull()))
             {
-                var (normalizedContainerName, normalizedBlobName) = BlobNormalizeNamingFactory.NormalizeNaming(Configuration, ContainerName, name);
+                var blobNormalizeNaming = BlobNormalizeNamingService.NormalizeNaming(Configuration, ContainerName, name);
 
                 await Provider.SaveAsync(
                     new BlobProviderSaveArgs(
-                        normalizedContainerName,
+                        blobNormalizeNaming.ContainerName,
                         Configuration,
-                        normalizedBlobName,
+                        blobNormalizeNaming.BlobName,
                         stream,
                         overrideExisting,
                         CancellationTokenProvider.FallbackToProvider(cancellationToken)
@@ -135,14 +135,14 @@ namespace Volo.Abp.BlobStoring
         {
             using (CurrentTenant.Change(GetTenantIdOrNull()))
             {
-                var (normalizedContainerName, normalizedBlobName) =
-                    BlobNormalizeNamingFactory.NormalizeNaming(Configuration, ContainerName, name);
+                var blobNormalizeNaming =
+                    BlobNormalizeNamingService.NormalizeNaming(Configuration, ContainerName, name);
 
                 return await Provider.DeleteAsync(
                     new BlobProviderDeleteArgs(
-                        normalizedContainerName,
+                        blobNormalizeNaming.ContainerName,
                         Configuration,
-                        normalizedBlobName,
+                        blobNormalizeNaming.BlobName,
                         CancellationTokenProvider.FallbackToProvider(cancellationToken)
                     )
                 );
@@ -155,14 +155,14 @@ namespace Volo.Abp.BlobStoring
         {
             using (CurrentTenant.Change(GetTenantIdOrNull()))
             {
-                var (normalizedContainerName, normalizedBlobName) =
-                    BlobNormalizeNamingFactory.NormalizeNaming(Configuration, ContainerName, name);
+                var blobNormalizeNaming =
+                    BlobNormalizeNamingService.NormalizeNaming(Configuration, ContainerName, name);
 
                 return await Provider.ExistsAsync(
                     new BlobProviderExistsArgs(
-                        normalizedContainerName,
+                        blobNormalizeNaming.ContainerName,
                         Configuration,
-                        normalizedBlobName,
+                        blobNormalizeNaming.BlobName,
                         CancellationTokenProvider.FallbackToProvider(cancellationToken)
                     )
                 );
@@ -191,14 +191,14 @@ namespace Volo.Abp.BlobStoring
         {
             using (CurrentTenant.Change(GetTenantIdOrNull()))
             {
-                var (normalizedContainerName, normalizedBlobName) =
-                    BlobNormalizeNamingFactory.NormalizeNaming(Configuration, ContainerName, name);
+                var blobNormalizeNaming =
+                    BlobNormalizeNamingService.NormalizeNaming(Configuration, ContainerName, name);
 
                 return await Provider.GetOrNullAsync(
                     new BlobProviderGetArgs(
-                        normalizedContainerName,
+                        blobNormalizeNaming.ContainerName,
                         Configuration,
-                        normalizedBlobName,
+                        blobNormalizeNaming.BlobName,
                         CancellationTokenProvider.FallbackToProvider(cancellationToken)
                     )
                 );

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobContainerFactory.cs

@@ -17,7 +17,7 @@ namespace Volo.Abp.BlobStoring
 
         protected IServiceProvider ServiceProvider { get; }
 
-        protected IBlobNormalizeNamingFactory BlobNormalizeNamingFactory { get; }
+        protected IBlobNormalizeNamingService BlobNormalizeNamingService { get; }
 
         public BlobContainerFactory(
             IBlobContainerConfigurationProvider configurationProvider,
@@ -25,14 +25,14 @@ namespace Volo.Abp.BlobStoring
             ICancellationTokenProvider cancellationTokenProvider,
             IBlobProviderSelector providerSelector,
             IServiceProvider serviceProvider,
-            IBlobNormalizeNamingFactory blobNormalizeNamingFactory)
+            IBlobNormalizeNamingService blobNormalizeNamingService)
         {
             ConfigurationProvider = configurationProvider;
             CurrentTenant = currentTenant;
             CancellationTokenProvider = cancellationTokenProvider;
             ProviderSelector = providerSelector;
             ServiceProvider = serviceProvider;
-            BlobNormalizeNamingFactory = blobNormalizeNamingFactory;
+            BlobNormalizeNamingService = blobNormalizeNamingService;
         }
 
         public virtual IBlobContainer Create(string name)
@@ -45,7 +45,7 @@ namespace Volo.Abp.BlobStoring
                 ProviderSelector.Get(name),
                 CurrentTenant,
                 CancellationTokenProvider,
-                BlobNormalizeNamingFactory,
+                BlobNormalizeNamingService,
                 ServiceProvider
             );
         }

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobNormalizeNaming.cs

@@ -0,0 +1,15 @@
+namespace Volo.Abp.BlobStoring
+{
+    public class BlobNormalizeNaming
+    {
+        public string ContainerName { get; }
+
+        public string BlobName { get; }
+
+        public BlobNormalizeNaming(string containerName, string blobName)
+        {
+            ContainerName = containerName;
+            BlobName = blobName;
+        }
+    }
+}

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobNormalizeNamingFactory.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/BlobNormalizeNamingService.cs

@@ -5,16 +5,16 @@ using Volo.Abp.DependencyInjection;
 
 namespace Volo.Abp.BlobStoring
 {
-    public class BlobNormalizeNamingFactory : IBlobNormalizeNamingFactory, ITransientDependency
+    public class BlobNormalizeNamingService : IBlobNormalizeNamingService, ITransientDependency
     {
         protected IServiceProvider ServiceProvider { get; }
 
-        public BlobNormalizeNamingFactory(IServiceProvider serviceProvider)
+        public BlobNormalizeNamingService(IServiceProvider serviceProvider)
         {
             ServiceProvider = serviceProvider;
         }
 
-        public (string containerName, string blobName) NormalizeNaming(
+        public BlobNormalizeNaming NormalizeNaming(
             BlobContainerConfiguration configuration,
             string containerName,
             string blobName)
@@ -22,7 +22,7 @@ namespace Volo.Abp.BlobStoring
 
             if (!configuration.NamingNormalizers.Any())
             {
-                return (containerName, blobName);
+                return new BlobNormalizeNaming(containerName, blobName);
             }
 
             using (var scope = ServiceProvider.CreateScope())
@@ -37,7 +37,7 @@ namespace Volo.Abp.BlobStoring
                     blobName = blobName.IsNullOrWhiteSpace()? blobName: normalizer.NormalizeBlobName(blobName);
                 }
 
-                return (containerName, blobName);
+                return new BlobNormalizeNaming(containerName, blobName);
             }
         }
 
@@ -48,7 +48,7 @@ namespace Volo.Abp.BlobStoring
                 return containerName;
             }
 
-            return NormalizeNaming(configuration, containerName, null).containerName;
+            return NormalizeNaming(configuration, containerName, null).ContainerName;
         }
 
         public string NormalizeBlobName(BlobContainerConfiguration configuration, string blobName)
@@ -58,7 +58,7 @@ namespace Volo.Abp.BlobStoring
                 return blobName;
             }
 
-            return NormalizeNaming(configuration, null, blobName).blobName;
+            return NormalizeNaming(configuration, null, blobName).BlobName;
         }
     }
 }

framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobNormalizeNamingFactory.cs → framework/src/Volo.Abp.BlobStoring/Volo/Abp/BlobStoring/IBlobNormalizeNamingService.cs

@@ -1,8 +1,8 @@
 namespace Volo.Abp.BlobStoring
 {
-    public interface IBlobNormalizeNamingFactory
+    public interface IBlobNormalizeNamingService
     {
-        (string containerName, string blobName) NormalizeNaming(BlobContainerConfiguration configuration, string containerName, string blobName);
+        BlobNormalizeNaming NormalizeNaming(BlobContainerConfiguration configuration, string containerName, string blobName);
 
         string NormalizeContainerName(BlobContainerConfiguration configuration, string containerName);