[FSSDK-11177] icache instead of lru

Author: junaed-optimizely

OptimizelySDK.Tests/CmabTests/DefaultCmabServiceTest.cs

@@ -381,7 +381,7 @@ public void UsesExpectedCacheKeyFormat()
         public void ConstructorWithoutConfigUsesDefaultCacheSettings()
         {
             var service = new DefaultCmabService();
-            var cache = GetInternalCache(service);
+            var cache = GetInternalCache(service) as LruCache<CmabCacheEntry>;
 
             Assert.IsNotNull(cache);
             Assert.AreEqual(CmabConstants.DEFAULT_CACHE_SIZE, cache.MaxSizeForTesting);
@@ -393,7 +393,7 @@ public void ConstructorAppliesCustomCacheSize()
         {
             var config = new CmabConfig(42);
             var service = new DefaultCmabService(config, logger: _logger);
-            var cache = GetInternalCache(service);
+            var cache = GetInternalCache(service) as LruCache<CmabCacheEntry>;
 
             Assert.IsNotNull(cache);
             Assert.AreEqual(42, cache.MaxSizeForTesting);
@@ -406,7 +406,7 @@ public void ConstructorAppliesCustomCacheTtl()
             var expectedTtl = TimeSpan.FromMinutes(3);
             var config = new CmabConfig(cacheTtl: expectedTtl);
             var service = new DefaultCmabService(config, logger: _logger);
-            var cache = GetInternalCache(service);
+            var cache = GetInternalCache(service) as LruCache<CmabCacheEntry>;
 
             Assert.IsNotNull(cache);
             Assert.AreEqual(CmabConstants.DEFAULT_CACHE_SIZE, cache.MaxSizeForTesting);
@@ -419,7 +419,7 @@ public void ConstructorAppliesCustomCacheSizeAndTtl()
             var expectedTtl = TimeSpan.FromSeconds(90);
             var config = new CmabConfig(5, expectedTtl);
             var service = new DefaultCmabService(config, logger: _logger);
-            var cache = GetInternalCache(service);
+            var cache = GetInternalCache(service) as LruCache<CmabCacheEntry>;
 
             Assert.IsNotNull(cache);
             Assert.AreEqual(5, cache.MaxSizeForTesting);
@@ -438,15 +438,15 @@ public void ConstructorUsesProvidedCustomCacheInstance()
         }
 
         [Test]
-        public void ConstructorThrowsWhenCustomCacheIsNotLruCache()
+        public void ConstructorAcceptsAnyICacheImplementation()
         {
-            var config = new CmabConfig(new FakeCache());
+            var fakeCache = new FakeCache();
+            var service = new DefaultCmabService(new CmabConfig(fakeCache), logger: _logger);
+            var cache = GetInternalCache(service);
 
-            var exception =
-                Assert.Throws<ArgumentException>(() =>
-                    new DefaultCmabService(config, logger: _logger));
-            Assert.AreEqual("CustomCache must be of type LruCache<CmabCacheEntry>.",
-                exception.Message);
+            Assert.IsNotNull(cache);
+            Assert.AreSame(fakeCache, cache);
+            Assert.IsInstanceOf<ICache<CmabCacheEntry>>(cache);
         }
 
         [Test]
@@ -468,9 +468,9 @@ public void ConstructorUsesProvidedClientInstance()
             Assert.AreSame(mockClient, client);
         }
 
-        private static LruCache<CmabCacheEntry> GetInternalCache(DefaultCmabService service)
+        private static ICache<CmabCacheEntry> GetInternalCache(DefaultCmabService service)
         {
-            return Reflection.GetFieldValue<LruCache<CmabCacheEntry>, DefaultCmabService>(service,
+            return Reflection.GetFieldValue<ICache<CmabCacheEntry>, DefaultCmabService>(service,
                 "_cmabCache");
         }
 
@@ -490,6 +490,8 @@ public CmabCacheEntry Lookup(string key)
             }
 
             public void Reset() { }
+
+            public void Remove(string key) { }
         }
 
         private OptimizelyUserContext CreateUserContext(string userId,

OptimizelySDK.Tests/OptimizelyFactoryTest.cs

@@ -308,7 +308,7 @@ public void NewDefaultInstanceUsesConfiguredCmabCache()
             var cmabService = Reflection.GetFieldValue<ICmabService, DecisionService>(decisionService, "CmabService");
             Assert.IsInstanceOf<DefaultCmabService>(cmabService);
 
-            var cache = Reflection.GetFieldValue<LruCache<CmabCacheEntry>, DefaultCmabService>((DefaultCmabService)cmabService, "_cmabCache");
+            var cache = Reflection.GetFieldValue<ICache<CmabCacheEntry>, DefaultCmabService>((DefaultCmabService)cmabService, "_cmabCache") as LruCache<CmabCacheEntry>;
             Assert.IsNotNull(cache);
             Assert.AreEqual(cacheSize, cache.MaxSizeForTesting);
             Assert.AreEqual(cacheTtl, cache.TimeoutForTesting);

OptimizelySDK/Cmab/DefaultCmabService.cs

@@ -83,17 +83,17 @@ public class CmabCacheEntry
     /// </summary>
     public class DefaultCmabService : ICmabService
     {
-        private readonly LruCache<CmabCacheEntry> _cmabCache;
+        private readonly ICache<CmabCacheEntry> _cmabCache;
         private readonly ICmabClient _cmabClient;
         private readonly ILogger _logger;
 
         /// <summary>
         /// Initializes a new instance of the DefaultCmabService class.
         /// </summary>
-        /// <param name="cmabCache">LRU cache for storing CMAB decisions.</param>
+        /// <param name="cmabCache">Cache for storing CMAB decisions.</param>
         /// <param name="cmabClient">Client for fetching decisions from the CMAB prediction service.</param>
         /// <param name="logger">Optional logger for recording service operations.</param>
-        public DefaultCmabService(LruCache<CmabCacheEntry> cmabCache,
+        public DefaultCmabService(ICache<CmabCacheEntry> cmabCache,
             ICmabClient cmabClient,
             ILogger logger = null)
         {
@@ -119,12 +119,7 @@ public DefaultCmabService(CmabConfig cmabConfig = null,
 
             if (config.CustomCache != null)
             {
-                _cmabCache = config.CustomCache as LruCache<CmabCacheEntry>;
-                if (_cmabCache == null)
-                {
-                    throw new ArgumentException(
-                        "CustomCache must be of type LruCache<CmabCacheEntry>.");
-                }
+                _cmabCache = config.CustomCache;
             }
             else
             {

OptimizelySDK/Odp/ICache.cs

@@ -22,5 +22,6 @@ public interface ICache<T>
         void Save(string key, T value);
         T Lookup(string key);
         void Reset();
+        void Remove(string key);
     }
 }