zzzprojects#764 - PR Refactor Feedback

Author: Travis Whidden

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

@@ -6,17 +6,16 @@ namespace System.Linq.Dynamic.Core.Parser;
 
 internal class ConstantExpressionHelper
 {
-    // Static shared instance to prevent duplications of the same objects
     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);
+        var useConfig = parsingConfig.ConstantExpressionCacheConfig ?? new CacheConfig();
 
-        _literals = new SlidingCache<Expression, string>(cacheConfig);
-        _expressions = new SlidingCache<object, Expression>(cacheConfig);
+        _literals = new SlidingCache<Expression, string>(useConfig);
+        _expressions = new SlidingCache<object, Expression>(useConfig);
     }
 
     public bool TryGetText(Expression expression, out string? text)

src/System.Linq.Dynamic.Core/ParsingConfig.cs

@@ -239,5 +239,5 @@ public IQueryableAnalyzer QueryableAnalyzer
     /// <summary>
     /// Caches constant expressions to enhance performance. Periodic cleanup is performed to manage cache size, governed by this configuration.
     /// </summary>
-    public CacheConfig ConstantExpressionCacheConfig { get; set; } = new CacheConfig();
+    public CacheConfig? ConstantExpressionCacheConfig { get; set; }
 }

src/System.Linq.Dynamic.Core/Util/Cache/CacheConfig.cs

@@ -12,14 +12,12 @@ public class CacheConfig
     /// </summary>
     public TimeSpan TimeToLive { get; set; } = TimeSpan.FromMinutes(10);
 
-
     /// <summary>
     /// Configures the minimum number of items required in the constant expression cache before triggering cleanup. 
     /// This prevents frequent cleanups, especially in caches with few items. 
     /// A default value of null implies that cleanup is always allowed to run, helping in timely removal of unused cache items.
     /// </summary>
-    public int? MinItemsTrigger { get; set; } = null;
-
+    public int? MinItemsTrigger { get; set; }
 
     /// <summary>
     /// Sets the frequency for running the cleanup process in the Constant Expression cache. 

src/System.Linq.Dynamic.Core/Util/Cache/CacheContainer.cs src/System.Linq.Dynamic.Core/Util/Cache/CacheEntry.cs

@@ -1,12 +1,12 @@
 namespace System.Linq.Dynamic.Core.Util.Cache;
 
-internal struct CacheContainer<TValue> where TValue : notnull
+internal struct CacheEntry<TValue> where TValue : notnull
 {
     public TValue Value { get; }
 
     public DateTime ExpirationTime { get; }
 
-    public CacheContainer(TValue value, DateTime expirationTime) 
+    public CacheEntry(TValue value, DateTime expirationTime) 
     {
         Value = value;
         ExpirationTime = expirationTime;

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

@@ -6,7 +6,7 @@ namespace System.Linq.Dynamic.Core.Util.Cache;
 
 internal class SlidingCache<TKey, TValue> where TKey : notnull where TValue : notnull
 {
-    private readonly ConcurrentDictionary<TKey, CacheContainer<TValue>> _cache;
+    private readonly ConcurrentDictionary<TKey, CacheEntry<TValue>> _cache;
     private readonly TimeSpan _cleanupFrequency;
     private readonly IDateTimeUtils _dateTimeProvider;
     private readonly Action _deleteExpiredCachedItemsDelegate;
@@ -32,7 +32,7 @@ public SlidingCache(
         long? minCacheItemsBeforeCleanup = null,
         IDateTimeUtils? dateTimeProvider = null)
     {
-        _cache = new ConcurrentDictionary<TKey, CacheContainer<TValue>>();
+        _cache = new ConcurrentDictionary<TKey, CacheEntry<TValue>>();
         TimeToLive = timeToLive;
         _minCacheItemsBeforeCleanup = minCacheItemsBeforeCleanup;
         _cleanupFrequency = cleanupFrequency ?? SlidingCacheConstants.DefaultCleanupFrequency;
@@ -51,7 +51,7 @@ public SlidingCache(
         CacheConfig cashConfig,
         IDateTimeUtils? dateTimeProvider = null)
     {
-        _cache = new ConcurrentDictionary<TKey, CacheContainer<TValue>>();
+        _cache = new ConcurrentDictionary<TKey, CacheEntry<TValue>>();
         TimeToLive = cashConfig.TimeToLive;
         _minCacheItemsBeforeCleanup = cashConfig.MinItemsTrigger;
         _cleanupFrequency = cashConfig.CleanupFrequency;
@@ -82,7 +82,7 @@ public void AddOrUpdate(TKey key, TValue value)
         Check.NotNull(value);
 
         var expirationTime = _dateTimeProvider.UtcNow.Add(TimeToLive);
-        _cache[key] = new CacheContainer<TValue>(value, expirationTime);
+        _cache[key] = new CacheEntry<TValue>(value, expirationTime);
 
         CleanupIfNeeded();
     }
@@ -105,7 +105,7 @@ public bool TryGetValue(TKey key, [NotNullWhen(true)] out TValue? value)
             {
                 value = valueAndExpiration.Value;
                 var newExpire = _dateTimeProvider.UtcNow.Add(TimeToLive);
-                _cache[key] = new CacheContainer<TValue>(value, newExpire);
+                _cache[key] = new CacheEntry<TValue>(value, newExpire);
                 return true;
             }
 

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

@@ -147,5 +147,4 @@ public void ThreadSafeSlidingCache_TestMinNumberBeforeTests()
         // Ensure one item is in the cache
         cache.Count.Should().Be(1, $"Expected 1 items in the cache, had {cache.Count}");
     }
-
-}
+}