From b638062f221b54a96ef7e48dccc8386560cf6bc2 Mon Sep 17 00:00:00 2001
From: liming <1028139084@qq.com>
Date: Sat, 11 Mar 2023 13:58:06 +0800
Subject: [PATCH 1/2] 
 fix:'DistributedCacheClientFactoryBase,MultilevelCacheClientFactoryBase'
 class name is inappropriate

---
 ...eClientFactoryBase.cs => DistributedCacheClientFactory.cs} | 0
 ...heClientFactoryBase.cs => MultilevelCacheClientFactory.cs} | 0
 .../Extensions/ServiceCollectionExtensions.Core.cs            | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/{DistributedCacheClientFactoryBase.cs => DistributedCacheClientFactory.cs} (100%)
 rename src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/{MultilevelCacheClientFactoryBase.cs => MultilevelCacheClientFactory.cs} (100%)

diff --git a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DistributedCacheClientFactoryBase.cs b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DistributedCacheClientFactory.cs
similarity index 100%
rename from src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DistributedCacheClientFactoryBase.cs
rename to src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DistributedCacheClientFactory.cs
diff --git a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/MultilevelCacheClientFactoryBase.cs b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/MultilevelCacheClientFactory.cs
similarity index 100%
rename from src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/MultilevelCacheClientFactoryBase.cs
rename to src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/MultilevelCacheClientFactory.cs
diff --git a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Extensions/ServiceCollectionExtensions.Core.cs b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Extensions/ServiceCollectionExtensions.Core.cs
index 7f0f04ea8..7283f0404 100644
--- a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Extensions/ServiceCollectionExtensions.Core.cs
+++ b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Extensions/ServiceCollectionExtensions.Core.cs
@@ -13,7 +13,7 @@ public static IServiceCollection TryAddDistributedCacheCore(IServiceCollection s
         MasaApp.TrySetServiceCollection(services);
         services.AddServiceFactory();
 
-        services.TryAddSingleton<IDistributedCacheClientFactory, DistributedCacheClientFactoryBase>();
+        services.TryAddSingleton<IDistributedCacheClientFactory, DistributedCacheClientFactory>();
         services.TryAddSingleton(serviceProvider
             => serviceProvider.GetRequiredService<IDistributedCacheClientFactory>().Create());
         services.TryAddSingleton(typeof(IDistributedCacheClient), serviceProvider
@@ -26,7 +26,7 @@ public static IServiceCollection TryAddDistributedCacheCore(IServiceCollection s
 
     public static IServiceCollection TryAddMultilevelCacheCore(IServiceCollection services, string name)
     {
-        services.TryAddSingleton<IMultilevelCacheClientFactory, MultilevelCacheClientFactoryBase>();
+        services.TryAddSingleton<IMultilevelCacheClientFactory, MultilevelCacheClientFactory>();
         services.TryAddSingleton(serviceProvider
             => serviceProvider.GetRequiredService<IMultilevelCacheClientFactory>().Create());
         services.TryAddSingleton(typeof(IMultilevelCacheClient), serviceProvider

From 845a7823cc76e99a48271ca086b6d7c424c34c6e Mon Sep 17 00:00:00 2001
From: Li Ming <1028139084@qq.com>
Date: Wed, 15 Mar 2023 11:36:34 +0800
Subject: [PATCH 2/2] rename DistributedCacheClientFactory to
 DefaultDistributedCacheClientFactory

---
 ...ientFactory.cs => DefaultDistributedCacheClientFactory.cs} | 4 ++--
 ...lientFactory.cs => DefaultMultilevelCacheClientFactory.cs} | 4 ++--
 .../Extensions/ServiceCollectionExtensions.Core.cs            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/{DistributedCacheClientFactory.cs => DefaultDistributedCacheClientFactory.cs} (77%)
 rename src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/{MultilevelCacheClientFactory.cs => DefaultMultilevelCacheClientFactory.cs} (77%)

diff --git a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DistributedCacheClientFactory.cs b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DefaultDistributedCacheClientFactory.cs
similarity index 77%
rename from src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DistributedCacheClientFactory.cs
rename to src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DefaultDistributedCacheClientFactory.cs
index cb047348b..ce39cdf34 100644
--- a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DistributedCacheClientFactory.cs
+++ b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DefaultDistributedCacheClientFactory.cs
@@ -3,7 +3,7 @@
 
 namespace Masa.BuildingBlocks.Caching;
 
-public class DistributedCacheClientFactoryBase : CacheClientFactoryBase<IManualDistributedCacheClient>, IDistributedCacheClientFactory
+public class DefaultDistributedCacheClientFactory : CacheClientFactoryBase<IManualDistributedCacheClient>, IDistributedCacheClientFactory
 {
     protected override string DefaultServiceNotFoundMessage
         => "Default DistributedCache not found, you need to add it, like services.AddStackExchangeRedisCache()";
@@ -14,7 +14,7 @@ protected override string DefaultServiceNotFoundMessage
 
     private readonly IOptionsMonitor<DistributedCacheFactoryOptions> _optionsMonitor;
 
-    public DistributedCacheClientFactoryBase(IServiceProvider serviceProvider) : base(serviceProvider)
+    public DefaultDistributedCacheClientFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
         _optionsMonitor = serviceProvider.GetRequiredService<IOptionsMonitor<DistributedCacheFactoryOptions>>();
     }
diff --git a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/MultilevelCacheClientFactory.cs b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DefaultMultilevelCacheClientFactory.cs
similarity index 77%
rename from src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/MultilevelCacheClientFactory.cs
rename to src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DefaultMultilevelCacheClientFactory.cs
index 081780c22..1966ceead 100644
--- a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/MultilevelCacheClientFactory.cs
+++ b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Default/DefaultMultilevelCacheClientFactory.cs
@@ -3,7 +3,7 @@
 
 namespace Masa.BuildingBlocks.Caching;
 
-public class MultilevelCacheClientFactoryBase : CacheClientFactoryBase<IManualMultilevelCacheClient>, IMultilevelCacheClientFactory
+public class DefaultMultilevelCacheClientFactory : CacheClientFactoryBase<IManualMultilevelCacheClient>, IMultilevelCacheClientFactory
 {
     protected override string DefaultServiceNotFoundMessage
         => "Default MultilevelCache not found, you need to add it, like services.AddMultilevelCache()";
@@ -14,7 +14,7 @@ protected override string DefaultServiceNotFoundMessage
 
     private readonly IOptionsMonitor<MultilevelCacheFactoryOptions> _optionsMonitor;
 
-    public MultilevelCacheClientFactoryBase(IServiceProvider serviceProvider) : base(serviceProvider)
+    public DefaultMultilevelCacheClientFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
         _optionsMonitor = serviceProvider.GetRequiredService<IOptionsMonitor<MultilevelCacheFactoryOptions>>();
     }
diff --git a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Extensions/ServiceCollectionExtensions.Core.cs b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Extensions/ServiceCollectionExtensions.Core.cs
index 7283f0404..7c83c00a0 100644
--- a/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Extensions/ServiceCollectionExtensions.Core.cs
+++ b/src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/Extensions/ServiceCollectionExtensions.Core.cs
@@ -13,7 +13,7 @@ public static IServiceCollection TryAddDistributedCacheCore(IServiceCollection s
         MasaApp.TrySetServiceCollection(services);
         services.AddServiceFactory();
 
-        services.TryAddSingleton<IDistributedCacheClientFactory, DistributedCacheClientFactory>();
+        services.TryAddSingleton<IDistributedCacheClientFactory, DefaultDistributedCacheClientFactory>();
         services.TryAddSingleton(serviceProvider
             => serviceProvider.GetRequiredService<IDistributedCacheClientFactory>().Create());
         services.TryAddSingleton(typeof(IDistributedCacheClient), serviceProvider
@@ -26,7 +26,7 @@ public static IServiceCollection TryAddDistributedCacheCore(IServiceCollection s
 
     public static IServiceCollection TryAddMultilevelCacheCore(IServiceCollection services, string name)
     {
-        services.TryAddSingleton<IMultilevelCacheClientFactory, MultilevelCacheClientFactory>();
+        services.TryAddSingleton<IMultilevelCacheClientFactory, DefaultMultilevelCacheClientFactory>();
         services.TryAddSingleton(serviceProvider
             => serviceProvider.GetRequiredService<IMultilevelCacheClientFactory>().Create());
         services.TryAddSingleton(typeof(IMultilevelCacheClient), serviceProvider