Skip to content
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

Jump to bottom

Remove dependency on ICacheConfigurationSectionHandler from ConfigurationProvider.Current #121

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove dependency on ICacheConfigurationSectionHandler from ConfigurationProvider.Current #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1b9e0b
Remove dependency on ICacheConfigurationSectionHandler from Configura…
bahusoid Apr 13, 2023
24293d7
Merge branch 'master' into ConfigProviderNoXmlDep
hazzik May 24, 2024
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
2 changes: 1 addition & 1 deletion ...NHibernate.Caches.CoreDistributedCache.Tests/CoreDistributedCacheSectionHandlerFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void TestGetConfigFromProvidedConfiguration()
Assert.That(fooRegion.Properties["expiration"], Is.EqualTo("500"));
}

private ConfigurationProviderBase<CacheConfig, CoreDistributedCacheSectionHandler> _configurationProviderBackup;
private ConfigurationProviderBase<CacheConfig> _configurationProviderBackup;

[SetUp]
public void OnSetup()
Expand Down
2 changes: 1 addition & 1 deletion ...moryCache/NHibernate.Caches.CoreMemoryCache.Tests/CoreMemoryCacheSectionHandlerFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void TestGetConfigFromProvidedConfiguration()
Assert.That(config.Regions[0].Properties["expiration"], Is.EqualTo("500"));
}

private ConfigurationProviderBase<CacheConfig, CoreMemoryCacheSectionHandler> _configurationProviderBackup;
private ConfigurationProviderBase<CacheConfig> _configurationProviderBackup;

[SetUp]
public void OnSetup()
Expand Down
28 changes: 18 additions & 10 deletions NHibernate.Caches.Common/ConfigurationProviderBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,30 @@

namespace NHibernate.Caches.Common
{
/// <summary>
/// Base generic class for the cache configuration settings.
/// </summary>
/// <typeparam name="TConfig">The configuration class.</typeparam>
public abstract class ConfigurationProviderBase<TConfig>
where TConfig : class
{
/// <summary>
/// Get the cache configuration.
/// </summary>
/// <returns>The cache configuration.</returns>
public abstract TConfig GetConfiguration();
}

/// <summary>
/// Base generic class for the cache configuration settings.
/// </summary>
/// <typeparam name="TConfig">The configuration class.</typeparam>
/// <typeparam name="TConfigHandler">The configuration class section handler.</typeparam>
public abstract class ConfigurationProviderBase<TConfig, TConfigHandler>
public abstract class ConfigurationProviderBase<TConfig, TConfigHandler> : ConfigurationProviderBase<TConfig>
where TConfig : class
where TConfigHandler : ICacheConfigurationSectionHandler, new()
{
private static ConfigurationProviderBase<TConfig, TConfigHandler> _current;
private static ConfigurationProviderBase<TConfig> _current;
private static readonly string ConfigurationSectionName;

static ConfigurationProviderBase()
Expand All @@ -25,7 +39,7 @@ static ConfigurationProviderBase()
/// Provides ability to override default <see cref="System.Configuration.ConfigurationManager"/> with custom implementation.
/// Can be set to null if all configuration is specified by code.
/// </summary>
public static ConfigurationProviderBase<TConfig, TConfigHandler> Current
public static ConfigurationProviderBase<TConfig> Current
{
get => _current ?? (_current = new StaticConfigurationManagerProvider());
set => _current = value ?? new NullConfigurationProvider();
Expand All @@ -41,12 +55,6 @@ public static void SetConfiguration(Configuration configuration)
_current = configuration == null ? null : new SystemConfigurationProvider(configuration);
}

/// <summary>
/// Get the cache configuration.
/// </summary>
/// <returns>The cache configuration.</returns>
public abstract TConfig GetConfiguration();

private class StaticConfigurationManagerProvider : ConfigurationProviderBase<TConfig, TConfigHandler>
{
/// <inheritdoc />
Expand Down Expand Up @@ -83,7 +91,7 @@ public override TConfig GetConfiguration()
}
}

private class NullConfigurationProvider : ConfigurationProviderBase<TConfig, TConfigHandler>
private class NullConfigurationProvider : ConfigurationProviderBase<TConfig>
{
/// <inheritdoc />
public override TConfig GetConfiguration()
Expand Down
2 changes: 1 addition & 1 deletion RtMemoryCache/NHibernate.Caches.RtMemoryCache.Tests/RtMemoryCacheSectionHandlerFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void TestGetConfigFromProvidedConfiguration()
Assert.That(config[0].Properties["expiration"], Is.EqualTo("500"));
}

private ConfigurationProviderBase<CacheConfig[], RtMemoryCacheSectionHandler> _configurationProviderBackup;
private ConfigurationProviderBase<CacheConfig[]> _configurationProviderBackup;

[SetUp]
public void OnSetup()
Expand Down
2 changes: 1 addition & 1 deletion StackExchangeRedis/NHibernate.Caches.StackExchangeRedis.Tests/RedisSectionHandlerFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void TestGetConfigFromProvidedConfiguration()
Assert.That(config.Regions[0].Expiration, Is.EqualTo(TimeSpan.FromSeconds(500)));
}

private ConfigurationProviderBase<CacheConfig, RedisSectionHandler> _configurationProviderBackup;
private ConfigurationProviderBase<CacheConfig> _configurationProviderBackup;

[SetUp]
public void OnSetup()
Expand Down