perf(Caching): Delete the overloaded part to optimize the user experience (#315)

zhenlei520 · web-flow · commit 5fefce0a1d66 · 2022-10-31T09:38:09.000+08:00
diff --git a/src/Contrib/Authentication/OpenIdConnect/Masa.Contrib.Authentication.OpenIdConnect.Cache/ServiceCollectionExtensions.cs b/src/Contrib/Authentication/OpenIdConnect/Masa.Contrib.Authentication.OpenIdConnect.Cache/ServiceCollectionExtensions.cs
@@ -19,7 +19,6 @@ public static IServiceCollection AddOidcCache(this IServiceCollection services,
         services.AddMultilevelCache(
             Constants.DEFAULT_CLIENT_NAME,
             distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(options),
-            null,
             multilevelCacheOptions =>
             {
                 multilevelCacheOptions.SubscribeKeyType = SubscribeKeyType.SpecificPrefix;
diff --git a/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache.Tests/MultilevelCacheClientTest.cs b/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache.Tests/MultilevelCacheClientTest.cs
@@ -464,10 +464,10 @@ public void TestMultilevelCache()
             distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(_ =>
             {
             }),
-            new MultilevelCacheOptions()
+            multilevelCacheOptions =>
             {
-                SubscribeKeyPrefix = "masa",
-                SubscribeKeyType = SubscribeKeyType.ValueTypeFullNameAndKey
+                multilevelCacheOptions.SubscribeKeyPrefix = "masa";
+                multilevelCacheOptions.SubscribeKeyType = SubscribeKeyType.ValueTypeFullNameAndKey;
             });
         var serviceProvider = services.BuildServiceProvider();
         var multilevelCacheClient = serviceProvider.GetRequiredService<IMultilevelCacheClient>();
diff --git a/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache.Tests/MultilevelCacheTest.cs b/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache.Tests/MultilevelCacheTest.cs
@@ -220,18 +220,18 @@ public void TestFormatCacheKeyByTypeNameAlias()
         var services = new ServiceCollection();
         services.AddMultilevelCache(distributedCacheOptions =>
                 distributedCacheOptions.UseStackExchangeRedisCache(RedisConfigurationOptions),
-            typeAliasOptions =>
+            multilevelCacheOptions =>
             {
-                typeAliasOptions.GetAllTypeAliasFunc = () => new Dictionary<string, string>()
+                multilevelCacheOptions.GlobalCacheOptions = new CacheOptions()
                 {
-                    { "String", "s" }
+                    CacheKeyType = CacheKeyType.TypeAlias
                 };
             },
-            multilevelCacheOptions =>
+            typeAliasOptions =>
             {
-                multilevelCacheOptions.GlobalCacheOptions = new CacheOptions()
+                typeAliasOptions.GetAllTypeAliasFunc = () => new Dictionary<string, string>()
                 {
-                    CacheKeyType = CacheKeyType.TypeAlias
+                    { "String", "s" }
                 };
             }
         );
@@ -251,6 +251,7 @@ public void TestFormatCacheKeyByTypeNameAlias2()
         var builder = WebApplication.CreateBuilder();
         builder.Services.AddMultilevelCache(distributedCacheOptions =>
                 distributedCacheOptions.UseStackExchangeRedisCache(RedisConfigurationOptions),
+            "MultilevelCache",
             typeAliasOptions =>
             {
                 typeAliasOptions.GetAllTypeAliasFunc = () => new Dictionary<string, string>()
diff --git a/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache/Extensions/ServiceCollectionExtensions.cs b/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache/Extensions/ServiceCollectionExtensions.cs
@@ -10,8 +10,8 @@ public static class ServiceCollectionExtensions
     public static IServiceCollection AddMultilevelCache(
         this IServiceCollection services,
         Action<DistributedCacheOptions> distributedCacheAction,
-        Action<TypeAliasOptions>? typeAliasOptionsAction = null,
-        Action<MultilevelCacheOptions>? multilevelCacheOptionsAction = null)
+        Action<MultilevelCacheOptions>? multilevelCacheOptionsAction = null,
+        Action<TypeAliasOptions>? typeAliasOptionsAction = null)
     {
         if (multilevelCacheOptionsAction == null)
         {
@@ -23,14 +23,14 @@ public static IServiceCollection AddMultilevelCache(
         return services.AddMultilevelCache(
             Microsoft.Extensions.Options.Options.DefaultName,
             distributedCacheAction,
-            typeAliasOptionsAction,
-            multilevelCacheOptionsAction);
+            multilevelCacheOptionsAction,
+            typeAliasOptionsAction);
     }
 
     public static IServiceCollection AddMultilevelCache(
         this IServiceCollection services,
         Action<DistributedCacheOptions> distributedCacheAction,
-        string sectionName,
+        string sectionName = Const.DEFAULT_SECTION_NAME,
         Action<TypeAliasOptions>? typeAliasOptionsAction = null)
         => services.AddMultilevelCache(
             distributedCacheAction,
@@ -41,7 +41,7 @@ public static IServiceCollection AddMultilevelCache(
     public static IServiceCollection AddMultilevelCache(
         this IServiceCollection services,
         Action<DistributedCacheOptions> distributedCacheAction,
-        string sectionName,
+        string sectionName = Const.DEFAULT_SECTION_NAME,
         bool isReset = false,
         Action<TypeAliasOptions>? typeAliasOptionsAction = null)
         => services.AddMultilevelCache(
@@ -79,36 +79,12 @@ public static IServiceCollection AddMultilevelCache(
         return services;
     }
 
-    public static IServiceCollection AddMultilevelCache(
-        this IServiceCollection services,
-        Action<DistributedCacheOptions> distributedCacheAction,
-        MultilevelCacheOptions multilevelCacheOptions,
-        Action<TypeAliasOptions>? typeAliasOptionsAction = null)
-        => services.AddMultilevelCache(
-            Microsoft.Extensions.Options.Options.DefaultName,
-            distributedCacheAction,
-            multilevelCacheOptions,
-            typeAliasOptionsAction);
-
     public static IServiceCollection AddMultilevelCache(
         this IServiceCollection services,
         string name,
         Action<DistributedCacheOptions> distributedCacheAction,
-        MultilevelCacheOptions multilevelCacheOptions,
+        Action<MultilevelCacheOptions>? multilevelCacheOptionsAction = null,
         Action<TypeAliasOptions>? typeAliasOptionsAction = null)
-    {
-        services.AddMultilevelCache(name, multilevelCacheOptions, typeAliasOptionsAction);
-        var distributedCacheOptions = new DistributedCacheOptions(services, name);
-        distributedCacheAction.Invoke(distributedCacheOptions);
-        return services;
-    }
-
-    public static IServiceCollection AddMultilevelCache(
-        this IServiceCollection services,
-        string name,
-        Action<DistributedCacheOptions> distributedCacheAction,
-        Action<TypeAliasOptions>? typeAliasOptionsAction,
-        Action<MultilevelCacheOptions>? multilevelCacheOptionsAction = null)
     {
         MultilevelCacheOptions multilevelCacheOptions = new();
         multilevelCacheOptionsAction?.Invoke(multilevelCacheOptions);
diff --git a/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache/README.md b/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache/README.md
@@ -76,10 +76,10 @@ var redisConfigurationOptions = new RedisConfigurationOptions()
 builder.Services
        .AddMultilevelCache(
            distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(redisConfigurationOptions),
-           new MultilevelCacheOptions()
+           multilevelCacheOptions =>
            {
-               SubscribeKeyPrefix = "masa",
-               SubscribeKeyType = SubscribeKeyType.ValueTypeFullNameAndKey
+               multilevelCacheOptions.SubscribeKeyPrefix = "masa";
+               multilevelCacheOptions.SubscribeKeyType = SubscribeKeyType.ValueTypeFullNameAndKey;
            });
 ```
 
diff --git a/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache/README.zh-CN.md b/src/Contrib/Caching/Masa.Contrib.Caching.MultilevelCache/README.zh-CN.md
@@ -76,10 +76,10 @@ var redisConfigurationOptions = new RedisConfigurationOptions()
 builder.Services
        .AddMultilevelCache(
            distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(redisConfigurationOptions),
-           new MultilevelCacheOptions()
+           multilevelCacheOptions =>
            {
-               SubscribeKeyPrefix = "masa",
-               SubscribeKeyType = SubscribeKeyType.ValueTypeFullNameAndKey
+               multilevelCacheOptions.SubscribeKeyPrefix = "masa";
+               multilevelCacheOptions.SubscribeKeyType = SubscribeKeyType.ValueTypeFullNameAndKey;
            });
 ```
 
diff --git a/src/Contrib/Configuration/ConfigurationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/MasaConfigurationExtensions.cs b/src/Contrib/Configuration/ConfigurationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/MasaConfigurationExtensions.cs
@@ -33,7 +33,6 @@ public static IMasaConfigurationBuilder UseDcc(
         services.AddMultilevelCache(
             DEFAULT_CLIENT_NAME,
             distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(dccOptions.RedisOptions),
-            null,
             multilevelCacheOptions =>
             {
                 multilevelCacheOptions.GlobalCacheOptions = new CacheOptions()
diff --git a/src/Contrib/Configuration/ConfigurationApi/Tests/Masa.Contrib.Configuration.ConfigurationApi.Dcc.Tests/DccTest.cs b/src/Contrib/Configuration/ConfigurationApi/Tests/Masa.Contrib.Configuration.ConfigurationApi.Dcc.Tests/DccTest.cs
@@ -282,12 +282,12 @@ public void TestGetSecretRenturnSecretEqualSecret()
                     new("localhost", 6379)
                 }
             }),
-            new MultilevelCacheOptions()
+            multilevelCacheOptions =>
             {
-                GlobalCacheOptions = new CacheOptions()
+                multilevelCacheOptions.GlobalCacheOptions = new CacheOptions()
                 {
                     CacheKeyType = CacheKeyType.None
-                }
+                };
             }
         );
         var serviceProvider = builder.Services.BuildServiceProvider();
diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs
@@ -44,7 +44,6 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services,
         services.AddMultilevelCache(
             DEFAULT_CLIENT_NAME,
             distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(redisOptions),
-            null,
             multilevelCacheOptions =>
             {
                 multilevelCacheOptions.SubscribeKeyType = SubscribeKeyType.SpecificPrefix;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public static IServiceCollection AddOidcCache(this IServiceCollection services,`
`19`	`19`	`services.AddMultilevelCache(`
`20`	`20`	`Constants.DEFAULT_CLIENT_NAME,`
`21`	`21`	`distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(options),`
`22`		`- null,`
`23`	`22`	`multilevelCacheOptions =>`
`24`	`23`	`{`
`25`	`24`	`multilevelCacheOptions.SubscribeKeyType = SubscribeKeyType.SpecificPrefix;`
Original file line number	Diff line number	Diff line change
`@@ -464,10 +464,10 @@ public void TestMultilevelCache()`
`464`	`464`	`distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(_ =>`
`465`	`465`	`{`
`466`	`466`	`}),`
`467`		`- new MultilevelCacheOptions()`
	`467`	`+ multilevelCacheOptions =>`
`468`	`468`	`{`
`469`		`- SubscribeKeyPrefix = "masa",`
`470`		`- SubscribeKeyType = SubscribeKeyType.ValueTypeFullNameAndKey`
	`469`	`+ multilevelCacheOptions.SubscribeKeyPrefix = "masa";`
	`470`	`+ multilevelCacheOptions.SubscribeKeyType = SubscribeKeyType.ValueTypeFullNameAndKey;`
`471`	`471`	`});`
`472`	`472`	`var serviceProvider = services.BuildServiceProvider();`
`473`	`473`	`var multilevelCacheClient = serviceProvider.GetRequiredService<IMultilevelCacheClient>();`
Original file line number	Diff line number	Diff line change
`@@ -220,18 +220,18 @@ public void TestFormatCacheKeyByTypeNameAlias()`
`220`	`220`	`var services = new ServiceCollection();`
`221`	`221`	`services.AddMultilevelCache(distributedCacheOptions =>`
`222`	`222`	`distributedCacheOptions.UseStackExchangeRedisCache(RedisConfigurationOptions),`
`223`		`- typeAliasOptions =>`
	`223`	`+ multilevelCacheOptions =>`
`224`	`224`	`{`
`225`		`- typeAliasOptions.GetAllTypeAliasFunc = () => new Dictionary<string, string>()`
	`225`	`+ multilevelCacheOptions.GlobalCacheOptions = new CacheOptions()`
`226`	`226`	`{`
`227`		`- { "String", "s" }`
	`227`	`+ CacheKeyType = CacheKeyType.TypeAlias`
`228`	`228`	`};`
`229`	`229`	`},`
`230`		`- multilevelCacheOptions =>`
	`230`	`+ typeAliasOptions =>`
`231`	`231`	`{`
`232`		`- multilevelCacheOptions.GlobalCacheOptions = new CacheOptions()`
	`232`	`+ typeAliasOptions.GetAllTypeAliasFunc = () => new Dictionary<string, string>()`
`233`	`233`	`{`
`234`		`- CacheKeyType = CacheKeyType.TypeAlias`
	`234`	`+ { "String", "s" }`
`235`	`235`	`};`
`236`	`236`	`}`
`237`	`237`	`);`
`@@ -251,6 +251,7 @@ public void TestFormatCacheKeyByTypeNameAlias2()`
`251`	`251`	`var builder = WebApplication.CreateBuilder();`
`252`	`252`	`builder.Services.AddMultilevelCache(distributedCacheOptions =>`
`253`	`253`	`distributedCacheOptions.UseStackExchangeRedisCache(RedisConfigurationOptions),`
	`254`	`+ "MultilevelCache",`
`254`	`255`	`typeAliasOptions =>`
`255`	`256`	`{`
`256`	`257`	`typeAliasOptions.GetAllTypeAliasFunc = () => new Dictionary<string, string>()`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public static IMasaConfigurationBuilder UseDcc(`
`33`	`33`	`services.AddMultilevelCache(`
`34`	`34`	`DEFAULT_CLIENT_NAME,`
`35`	`35`	`distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(dccOptions.RedisOptions),`
`36`		`- null,`
`37`	`36`	`multilevelCacheOptions =>`
`38`	`37`	`{`
`39`	`38`	`multilevelCacheOptions.GlobalCacheOptions = new CacheOptions()`
Original file line number	Diff line number	Diff line change
`@@ -282,12 +282,12 @@ public void TestGetSecretRenturnSecretEqualSecret()`
`282`	`282`	`new("localhost", 6379)`
`283`	`283`	`}`
`284`	`284`	`}),`
`285`		`- new MultilevelCacheOptions()`
	`285`	`+ multilevelCacheOptions =>`
`286`	`286`	`{`
`287`		`- GlobalCacheOptions = new CacheOptions()`
	`287`	`+ multilevelCacheOptions.GlobalCacheOptions = new CacheOptions()`
`288`	`288`	`{`
`289`	`289`	`CacheKeyType = CacheKeyType.None`
`290`		`- }`
	`290`	`+ };`
`291`	`291`	`}`
`292`	`292`	`);`
`293`	`293`	`var serviceProvider = builder.Services.BuildServiceProvider();`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services,`
`44`	`44`	`services.AddMultilevelCache(`
`45`	`45`	`DEFAULT_CLIENT_NAME,`
`46`	`46`	`distributedCacheOptions => distributedCacheOptions.UseStackExchangeRedisCache(redisOptions),`
`47`		`- null,`
`48`	`47`	`multilevelCacheOptions =>`
`49`	`48`	`{`
`50`	`49`	`multilevelCacheOptions.SubscribeKeyType = SubscribeKeyType.SpecificPrefix;`