fixup! Replace ICache interface by a CacheBase class

Remove a field in UpdateTimestampsCache too

Author: fredericDelaporte

src/NHibernate/Async/Cache/UpdateTimestampsCache.cs

@@ -31,7 +31,7 @@ public virtual Task ClearAsync(CancellationToken cancellationToken)
 			{
 				return Task.FromCanceled<object>(cancellationToken);
 			}
-			return updateTimestamps.ClearAsync(cancellationToken);
+			return _updateTimestamps.ClearAsync(cancellationToken);
 		}
 
 		//Since v5.1
@@ -60,10 +60,10 @@ public virtual async Task PreInvalidateAsync(IReadOnlyCollection<string> spaces,
 			using (await _preInvalidate.LockAsync())
 			{
 				//TODO: to handle concurrent writes correctly, this should return a Lock to the client
-				long ts = updateTimestamps.NextTimestamp() + updateTimestamps.Timeout;
+				long ts = _updateTimestamps.NextTimestamp() + _updateTimestamps.Timeout;
 				foreach (var space in spaces)
 				{
-					await (updateTimestamps.PutAsync(space, ts, cancellationToken)).ConfigureAwait(false);
+					await (_updateTimestamps.PutAsync(space, ts, cancellationToken)).ConfigureAwait(false);
 				}
 
 				//TODO: return new Lock(ts);
@@ -98,12 +98,12 @@ public virtual async Task InvalidateAsync(IReadOnlyCollection<string> spaces, Ca
 			using (await _invalidate.LockAsync())
 			{
 				//TODO: to handle concurrent writes correctly, the client should pass in a Lock
-				long ts = updateTimestamps.NextTimestamp();
+				long ts = _updateTimestamps.NextTimestamp();
 				//TODO: if lock.getTimestamp().equals(ts)
 				foreach (var space in spaces)
 				{
 					log.Debug("Invalidating space [{0}]", space);
-					await (updateTimestamps.PutAsync(space, ts, cancellationToken)).ConfigureAwait(false);
+					await (_updateTimestamps.PutAsync(space, ts, cancellationToken)).ConfigureAwait(false);
 				}
 			}
 		}
@@ -120,7 +120,7 @@ public virtual async Task<bool> IsUpToDateAsync(ISet<string> spaces, long timest
 				{
 					keys[index++] = space;
 				}
-				var lastUpdates = await (_batchUpdateTimestamps.GetManyAsync(keys, cancellationToken)).ConfigureAwait(false);
+				var lastUpdates = await (_updateTimestamps.GetManyAsync(keys, cancellationToken)).ConfigureAwait(false);
 				foreach (var lastUpdate in lastUpdates)
 				{
 					if (IsOutdated(lastUpdate, timestamp))

src/NHibernate/Cache/UpdateTimestampsCache.cs

@@ -17,27 +17,22 @@ namespace NHibernate.Cache
 	public partial class UpdateTimestampsCache
 	{
 		private static readonly INHibernateLogger log = NHibernateLogger.For(typeof(UpdateTimestampsCache));
-		// 6.0 TODO: type as CacheBase instead
-#pragma warning disable 618
-		private readonly ICache updateTimestamps;
-#pragma warning restore 618
-		private readonly CacheBase _batchUpdateTimestamps;
+		private readonly CacheBase _updateTimestamps;
 
 		private readonly string regionName = typeof(UpdateTimestampsCache).Name;
 
 		public virtual void Clear()
 		{
-			updateTimestamps.Clear();
+			_updateTimestamps.Clear();
 		}
 
 		public UpdateTimestampsCache(Settings settings, IDictionary<string, string> props)
 		{
 			string prefix = settings.CacheRegionPrefix;
 			regionName = prefix == null ? regionName : prefix + '.' + regionName;
 			log.Info("starting update timestamps cache at region: {0}", regionName);
-			updateTimestamps = settings.CacheProvider.BuildCache(regionName, props);
-			// ReSharper disable once SuspiciousTypeConversion.Global
-			_batchUpdateTimestamps = updateTimestamps as CacheBase ?? new ObsoleteCacheWrapper(updateTimestamps);
+			var updateTimestamps = settings.CacheProvider.BuildCache(regionName, props);
+			_updateTimestamps = updateTimestamps as CacheBase ?? new ObsoleteCacheWrapper(updateTimestamps);
 		}
 
 		//Since v5.1
@@ -52,10 +47,10 @@ public void PreInvalidate(object[] spaces)
 		public virtual void PreInvalidate(IReadOnlyCollection<string> spaces)
 		{
 			//TODO: to handle concurrent writes correctly, this should return a Lock to the client
-			long ts = updateTimestamps.NextTimestamp() + updateTimestamps.Timeout;
+			long ts = _updateTimestamps.NextTimestamp() + _updateTimestamps.Timeout;
 			foreach (var space in spaces)
 			{
-				updateTimestamps.Put(space, ts);
+				_updateTimestamps.Put(space, ts);
 			}
 
 			//TODO: return new Lock(ts);
@@ -73,12 +68,12 @@ public void Invalidate(object[] spaces)
 		public virtual void Invalidate(IReadOnlyCollection<string> spaces)
 		{
 			//TODO: to handle concurrent writes correctly, the client should pass in a Lock
-			long ts = updateTimestamps.NextTimestamp();
+			long ts = _updateTimestamps.NextTimestamp();
 			//TODO: if lock.getTimestamp().equals(ts)
 			foreach (var space in spaces)
 			{
 				log.Debug("Invalidating space [{0}]", space);
-				updateTimestamps.Put(space, ts);
+				_updateTimestamps.Put(space, ts);
 			}
 		}
 
@@ -91,7 +86,7 @@ public virtual bool IsUpToDate(ISet<string> spaces, long timestamp /* H2.1 has L
 			{
 				keys[index++] = space;
 			}
-			var lastUpdates = _batchUpdateTimestamps.GetMany(keys);
+			var lastUpdates = _updateTimestamps.GetMany(keys);
 			foreach (var lastUpdate in lastUpdates)
 			{
 				if (IsOutdated(lastUpdate, timestamp))
@@ -106,7 +101,7 @@ public virtual void Destroy()
 		{
 			try
 			{
-				updateTimestamps.Destroy();
+				_updateTimestamps.Destroy();
 			}
 			catch (Exception e)
 			{