Skip to content

fix:'DistributedCacheClientFactoryBase,MultilevelCacheClientFactoryBase' class name is inappropriate #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2023
+6 −6
Merged

fix:'DistributedCacheClientFactoryBase,MultilevelCacheClientFactoryBase' class name is inappropriate #499

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b638062
fix:'DistributedCacheClientFactoryBase,MultilevelCacheClientFactoryBa…
MapleWithoutWords Mar 11, 2023
845a782
rename DistributedCacheClientFactory to DefaultDistributedCacheClient…
MapleWithoutWords Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ault/DistributedCacheClientFactoryBase.cs → ...t/DefaultDistributedCacheClientFactory.cs
View file
Original file line number Diff line number Diff line change
@@ -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>>();
}
4 changes: 2 additions & 2 deletions ...fault/MultilevelCacheClientFactoryBase.cs → ...lt/DefaultMultilevelCacheClientFactory.cs
View file
Original file line number Diff line number Diff line change
@@ -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>>();
}
4 changes: 2 additions & 2 deletions ...Blocks/Caching/Masa.BuildingBlocks.Caching/Extensions/ServiceCollectionExtensions.Core.cs
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ public static IServiceCollection TryAddDistributedCacheCore(IServiceCollection s
MasaApp.TrySetServiceCollection(services);
services.AddServiceFactory();

services.TryAddSingleton<IDistributedCacheClientFactory, DistributedCacheClientFactoryBase>();
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, MultilevelCacheClientFactoryBase>();
services.TryAddSingleton<IMultilevelCacheClientFactory, DefaultMultilevelCacheClientFactory>();
services.TryAddSingleton(serviceProvider
=> serviceProvider.GetRequiredService<IMultilevelCacheClientFactory>().Create());
services.TryAddSingleton(typeof(IMultilevelCacheClient), serviceProvider