zzzprojects#764 - Refactor Naming for SlidingCache;

Author: Travis Whidden

src/System.Linq.Dynamic.Core/Parser/ConstantExpressionHelper.cs

@@ -7,25 +7,16 @@ namespace System.Linq.Dynamic.Core.Parser;
 internal class ConstantExpressionHelper
 {
     // Static shared instance to prevent duplications of the same objects
-    private readonly ThreadSafeSlidingCache<object, Expression> _expressions;
-    private readonly ThreadSafeSlidingCache<Expression, string> _literals;
+    private readonly SlidingCache<object, Expression> _expressions;
+    private readonly SlidingCache<Expression, string> _literals;
 
     public ConstantExpressionHelper(ParsingConfig config)
     {
         var parsingConfig = Check.NotNull(config);
         var cacheConfig = Check.NotNull(parsingConfig.ConstantExpressionCacheConfig);
 
-        _literals = new ThreadSafeSlidingCache<Expression, string>(
-            cacheConfig.TimeToLive,
-            cacheConfig.CleanupFrequency,
-            cacheConfig.MinItemsTrigger
-        );
-
-        _expressions = new ThreadSafeSlidingCache<object, Expression>(
-            cacheConfig.TimeToLive,
-            cacheConfig.CleanupFrequency,
-            cacheConfig.MinItemsTrigger
-        );
+        _literals = new SlidingCache<Expression, string>(cacheConfig);
+        _expressions = new SlidingCache<object, Expression>(cacheConfig);
     }
 
     public bool TryGetText(Expression expression, out string? text)

src/System.Linq.Dynamic.Core/Util/Cache/ThreadSafeSlidingCache.cs src/System.Linq.Dynamic.Core/Util/Cache/SlidingCache.cs

@@ -4,7 +4,7 @@
 
 namespace System.Linq.Dynamic.Core.Util.Cache;
 
-internal class ThreadSafeSlidingCache<TKey, TValue> where TKey : notnull where TValue : notnull
+internal class SlidingCache<TKey, TValue> where TKey : notnull where TValue : notnull
 {
     private readonly ConcurrentDictionary<TKey, CacheContainer<TValue>> _cache;
     private readonly TimeSpan _cleanupFrequency;
@@ -26,7 +26,7 @@ internal class ThreadSafeSlidingCache<TKey, TValue> where TKey : notnull where T
     ///     Provides the Time for the Caching object. Default will be created if not supplied. Used
     ///     for Testing classes
     /// </param>
-    public ThreadSafeSlidingCache(
+    public SlidingCache(
         TimeSpan timeToLive,
         TimeSpan? cleanupFrequency = null,
         long? minCacheItemsBeforeCleanup = null,
@@ -35,7 +35,26 @@ public ThreadSafeSlidingCache(
         _cache = new ConcurrentDictionary<TKey, CacheContainer<TValue>>();
         TimeToLive = timeToLive;
         _minCacheItemsBeforeCleanup = minCacheItemsBeforeCleanup;
-        _cleanupFrequency = cleanupFrequency ?? ThreadSafeSlidingCacheConstants.DefaultCleanupFrequency;
+        _cleanupFrequency = cleanupFrequency ?? SlidingCacheConstants.DefaultCleanupFrequency;
+        _deleteExpiredCachedItemsDelegate = Cleanup;
+        _dateTimeProvider = dateTimeProvider ?? new DateTimeUtils();
+        // To prevent a scan on first call, set the last Cleanup to the current Provider time
+        _lastCleanupTime = _dateTimeProvider.UtcNow;
+    }
+
+    /// <summary>
+    /// Sliding Thread Safe Cache
+    /// </summary>
+    /// <param name="cashConfig"></param>
+    /// <param name="dateTimeProvider"></param>
+    public SlidingCache(
+        CacheConfig cashConfig,
+        IDateTimeUtils? dateTimeProvider = null)
+    {
+        _cache = new ConcurrentDictionary<TKey, CacheContainer<TValue>>();
+        TimeToLive = cashConfig.TimeToLive;
+        _minCacheItemsBeforeCleanup = cashConfig.MinItemsTrigger;
+        _cleanupFrequency = cashConfig.CleanupFrequency;
         _deleteExpiredCachedItemsDelegate = Cleanup;
         _dateTimeProvider = dateTimeProvider ?? new DateTimeUtils();
         // To prevent a scan on first call, set the last Cleanup to the current Provider time

src/System.Linq.Dynamic.Core/Util/Cache/ThreadSafeSlidingCacheConstants.cs src/System.Linq.Dynamic.Core/Util/Cache/SlidingCacheConstants.cs

@@ -1,6 +1,6 @@
 namespace System.Linq.Dynamic.Core.Util.Cache;
 
-internal static class ThreadSafeSlidingCacheConstants
+internal static class SlidingCacheConstants
 {
     // Default cleanup frequency
     public static readonly TimeSpan DefaultCleanupFrequency = TimeSpan.FromMinutes(10);

test/System.Linq.Dynamic.Core.Tests/Util/Cache/ThreadSafeSlidingCacheTests.cs test/System.Linq.Dynamic.Core.Tests/Util/Cache/SlidingCacheTests.cs

@@ -7,7 +7,7 @@
 
 namespace System.Linq.Dynamic.Core.Tests.Util.Cache;
 
-public class ThreadSafeSlidingCacheTests
+public class SlidingCacheTests
 {
     private static readonly DateTime UtcNow = new(2024, 1, 1, 0, 0, 0);
 
@@ -18,7 +18,7 @@ public void ThreadSafeSlidingCache_CacheOperations()
         dateTimeUtilsMock.SetupGet(d => d.UtcNow).Returns(UtcNow);
 
         // Arrange
-        var cache = new ThreadSafeSlidingCache<int, string>(
+        var cache = new SlidingCache<int, string>(
             TimeSpan.FromSeconds(1),
             dateTimeProvider: dateTimeUtilsMock.Object);
 
@@ -48,7 +48,7 @@ public void ThreadSafeSlidingCache_TestExpire()
         var dateTimeUtilsMock = new Mock<IDateTimeUtils>();
         dateTimeUtilsMock.SetupGet(d => d.UtcNow).Returns(UtcNow);
 
-        var cache = new ThreadSafeSlidingCache<int, string>(TimeSpan.FromMinutes(10),
+        var cache = new SlidingCache<int, string>(TimeSpan.FromMinutes(10),
             dateTimeProvider: dateTimeUtilsMock.Object);
 
         // Act
@@ -70,7 +70,7 @@ public void ThreadSafeSlidingCache_TestAutoExpire()
         dateTimeUtilsMock.SetupGet(d => d.UtcNow).Returns(UtcNow);
 
         // Arrange
-        var cache = new ThreadSafeSlidingCache<int, string>(
+        var cache = new SlidingCache<int, string>(
             TimeSpan.FromMinutes(10),
             dateTimeProvider: dateTimeUtilsMock.Object);
 
@@ -99,7 +99,7 @@ public void ThreadSafeSlidingCache_TestAutoExpire()
     public void ThreadSafeSlidingCache_TestNull()
     {
         // Arrange
-        var cache = new ThreadSafeSlidingCache<Expression, string>(TimeSpan.FromMinutes(10));
+        var cache = new SlidingCache<Expression, string>(TimeSpan.FromMinutes(10));
 
         // Expect an ArgumentNullException
         var exception = Assert.Throws<ArgumentNullException>(() => { cache.AddOrUpdate(null, "one"); });
@@ -112,7 +112,7 @@ public void ThreadSafeSlidingCache_TestMinNumberBeforeTests()
         dateTimeUtilsMock.SetupGet(d => d.UtcNow).Returns(UtcNow);
 
         // Arrange
-        var cache = new ThreadSafeSlidingCache<int, string>(
+        var cache = new SlidingCache<int, string>(
             TimeSpan.FromMinutes(10),
             minCacheItemsBeforeCleanup: 2,
             dateTimeProvider: dateTimeUtilsMock.Object);