Cleanup wrapping of ICache to CacheBase

Author: hazzik

src/NHibernate/Cache/CacheExtensions.cs

@@ -0,0 +1,16 @@
+using System;
+
+namespace NHibernate.Cache
+{
+	//6.0 TODO: Remove
+	internal static class CacheExtensions
+	{
+#pragma warning disable 618
+		public static CacheBase AsCacheBase(this ICache cache)
+#pragma warning restore 618
+		{
+			if (cache == null) throw new ArgumentNullException(nameof(cache));
+			return cache as CacheBase ?? new ObsoleteCacheWrapper(cache);
+		}
+	}
+}

src/NHibernate/Cache/CacheFactory.cs

@@ -41,11 +41,7 @@ public static ICacheConcurrencyStrategy CreateCache(
 		{
 			var cache = CreateCache(
 				usage, name, settings,
-				(r, u) =>
-				{
-					var c = settings.CacheProvider.BuildCache(r, properties);
-					return c as CacheBase ?? new ObsoleteCacheWrapper(c);
-				});
+				(r, u) => settings.CacheProvider.BuildCache(r, properties).AsCacheBase());
 
 			if (cache != null && mutable && usage == ReadOnly)
 				log.Warn("read-only cache configured for mutable: {0}", name);

src/NHibernate/Cache/ICacheConcurrencyStrategy.cs

@@ -206,10 +206,7 @@ internal static CacheBase GetCacheBase(this ICacheConcurrencyStrategy cache)
 		{
 			if (cache is IBatchableCacheConcurrencyStrategy batchableCache)
 				return batchableCache.Cache;
-			var concreteCache = cache.Cache;
-			if (concreteCache == null)
-				return null;
-			return concreteCache as CacheBase ?? new ObsoleteCacheWrapper(concreteCache);
+			return cache.Cache?.AsCacheBase();
 		}
 	}
 }

src/NHibernate/Cache/NonstrictReadWriteCache.cs

@@ -18,7 +18,6 @@ public partial class NonstrictReadWriteCache : IBatchableCacheConcurrencyStrateg
 	{
 		private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(NonstrictReadWriteCache));
 
-		// 6.0 TODO: remove
 		private CacheBase _cache;
 
 		/// <summary>
@@ -35,10 +34,7 @@ public ICache Cache
 #pragma warning restore 618
 		{
 			get { return _cache; }
-			set
-			{
-				_cache = value as CacheBase ?? new ObsoleteCacheWrapper(value);
-			}
+			set { _cache = value.AsCacheBase(); }
 		}
 
 		// 6.0 TODO: make implicit and switch to auto-property

src/NHibernate/Cache/ReadOnlyCache.cs

@@ -13,7 +13,6 @@ public partial class ReadOnlyCache : IBatchableCacheConcurrencyStrategy
 	{
 		private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(ReadOnlyCache));
 
-		// 6.0 TODO: remove
 		private CacheBase _cache;
 
 		/// <summary>
@@ -30,10 +29,7 @@ public ICache Cache
 #pragma warning restore 618
 		{
 			get { return _cache; }
-			set
-			{
-				_cache = value as CacheBase ?? new ObsoleteCacheWrapper(value);
-			}
+			set { _cache = value.AsCacheBase(); }
 		}
 
 		// 6.0 TODO: make implicit and switch to auto-property

src/NHibernate/Cache/ReadWriteCache.cs

@@ -35,7 +35,6 @@ public interface ILockable
 		private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(ReadWriteCache));
 
 		private readonly object _lockObject = new object();
-		// 6.0 TODO: remove
 		private CacheBase _cache;
 		private int _nextLockId;
 
@@ -53,10 +52,7 @@ public ICache Cache
 #pragma warning restore 618
 		{
 			get { return _cache; }
-			set
-			{
-				_cache = value as CacheBase ?? new ObsoleteCacheWrapper(value);
-			}
+			set { _cache = value.AsCacheBase(); }
 		}
 
 		// 6.0 TODO: make implicit and switch to auto-property

src/NHibernate/Cache/StandardQueryCache.cs

@@ -20,11 +20,10 @@ public partial class StandardQueryCache : IQueryCache, IBatchableQueryCache
 		private static readonly INHibernateLogger Log = NHibernateLogger.For(typeof (StandardQueryCache));
 		private readonly string _regionName;
 		private readonly UpdateTimestampsCache _updateTimestampsCache;
-		// 6.0 TODO: remove
 		private readonly CacheBase _cache;
 
 		// Since v5.2
-		[Obsolete("Please use overload with an ICache parameter.")]
+		[Obsolete("Please use overload with an CacheBase parameter.")]
 		public StandardQueryCache(
 			Settings settings,
 			IDictionary<string, string> props,
@@ -41,10 +40,8 @@ public StandardQueryCache(
 
 		// Since v5.2
 		[Obsolete]
-		private StandardQueryCache(
-			UpdateTimestampsCache updateTimestampsCache,
-			ICache cache)
-			: this(updateTimestampsCache, cache as CacheBase ?? new ObsoleteCacheWrapper(cache))
+		private StandardQueryCache(UpdateTimestampsCache updateTimestampsCache, ICache cache)
+			: this(updateTimestampsCache, cache.AsCacheBase())
 		{
 		}
 

src/NHibernate/Cache/UpdateTimestampsCache.cs

@@ -26,7 +26,7 @@ public virtual void Clear()
 		}
 
 		// Since v5.2
-		[Obsolete("Please use overload with an ICache parameter.")]
+		[Obsolete("Please use overload with an CacheBase parameter.")]
 		public UpdateTimestampsCache(Settings settings, IDictionary<string, string> props)
 			: this(
 				settings.CacheProvider.BuildCache(
@@ -37,7 +37,7 @@ public UpdateTimestampsCache(Settings settings, IDictionary<string, string> prop
 		// Since v5.2
 		[Obsolete]
 		private UpdateTimestampsCache(ICache cache)
-			: this(cache as CacheBase ?? new ObsoleteCacheWrapper(cache))
+			: this(cache.AsCacheBase())
 		{
 		}
 

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -1112,7 +1112,7 @@ private CacheBase BuildCache(string cacheRegion, string type)
 				throw new InvalidOperationException($"A cache has already been built for region {cacheRegion} and type {type}.");
 			}
 
-			return cache as CacheBase ?? new ObsoleteCacheWrapper(cache);
+			return cache.AsCacheBase();
 		}
 
 		/// <summary> Statistics SPI</summary>