Remove dependency on ICacheConfigurationSectionHandler from Configura…

…tionProvider.Current
nhibernate · Apr 13, 2023 · c1b9e0b · c1b9e0b
1 parent 196296f
commit c1b9e0b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/...NHibernate.Caches.CoreDistributedCache.Tests/CoreDistributedCacheSectionHandlerFixture.cs b/...NHibernate.Caches.CoreDistributedCache.Tests/CoreDistributedCacheSectionHandlerFixture.cs
@@ -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()

diff --git a/...moryCache/NHibernate.Caches.CoreMemoryCache.Tests/CoreMemoryCacheSectionHandlerFixture.cs b/...moryCache/NHibernate.Caches.CoreMemoryCache.Tests/CoreMemoryCacheSectionHandlerFixture.cs
@@ -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()

diff --git a/NHibernate.Caches.Common/ConfigurationProviderBase.cs b/NHibernate.Caches.Common/ConfigurationProviderBase.cs
@@ -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()
@@ -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();
@@ -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 />
@@ -83,7 +91,7 @@ public override TConfig GetConfiguration()
 			}
 		}
 
-		private class NullConfigurationProvider : ConfigurationProviderBase<TConfig, TConfigHandler>
+		private class NullConfigurationProvider : ConfigurationProviderBase<TConfig>
 		{
 			/// <inheritdoc />
 			public override TConfig GetConfiguration()

diff --git a/RtMemoryCache/NHibernate.Caches.RtMemoryCache.Tests/RtMemoryCacheSectionHandlerFixture.cs b/RtMemoryCache/NHibernate.Caches.RtMemoryCache.Tests/RtMemoryCacheSectionHandlerFixture.cs
@@ -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()

diff --git a/StackExchangeRedis/NHibernate.Caches.StackExchangeRedis.Tests/RedisSectionHandlerFixture.cs b/StackExchangeRedis/NHibernate.Caches.StackExchangeRedis.Tests/RedisSectionHandlerFixture.cs
@@ -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()