update: refactor DefaultCmabService to use Cache interface, enhance cache size and timeout, and remove CacheWithRemove interface

Author: FarhanAnjum-opti

core-api/src/main/java/com/optimizely/ab/cmab/service/DefaultCmabService.java

@@ -30,23 +30,23 @@
 import com.optimizely.ab.config.Attribute;
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.ProjectConfig;
-import com.optimizely.ab.internal.CacheWithRemove;
+import com.optimizely.ab.internal.Cache;
 import com.optimizely.ab.internal.DefaultLRUCache;
 import com.optimizely.ab.optimizelydecision.OptimizelyDecideOption;
 
 public class DefaultCmabService implements CmabService {
-    public static final int DEFAULT_CMAB_CACHE_SIZE = 1000;
-    public static final int DEFAULT_CMAB_CACHE_TIMEOUT_SECS = 300; // 5 minutes
+    public static final int DEFAULT_CMAB_CACHE_SIZE = 10000;
+    public static final int DEFAULT_CMAB_CACHE_TIMEOUT_SECS = 30*60; // 30 minutes
 
-    private final CacheWithRemove<CmabCacheValue> cmabCache;
+    private final Cache<CmabCacheValue> cmabCache;
     private final CmabClient cmabClient;
     private final Logger logger;
 
-    public DefaultCmabService(CmabClient cmabClient, CacheWithRemove<CmabCacheValue> cmabCache) {
+    public DefaultCmabService(CmabClient cmabClient, Cache<CmabCacheValue> cmabCache) {
         this(cmabClient, cmabCache, null);
     }
 
-    public DefaultCmabService(CmabClient cmabClient, CacheWithRemove<CmabCacheValue> cmabCache, Logger logger) {
+    public DefaultCmabService(CmabClient cmabClient, Cache<CmabCacheValue> cmabCache, Logger logger) {
         this.cmabCache = cmabCache;
         this.cmabClient = cmabClient;
         this.logger = logger != null ? logger : LoggerFactory.getLogger(DefaultCmabService.class);
@@ -199,13 +199,13 @@ public static Builder builder() {
     public static class Builder {
         private int cmabCacheSize = DEFAULT_CMAB_CACHE_SIZE;
         private int cmabCacheTimeoutInSecs = DEFAULT_CMAB_CACHE_TIMEOUT_SECS;
-        private CacheWithRemove<CmabCacheValue> customCache;
+        private Cache<CmabCacheValue> customCache;
         private CmabClient client;
 
         /**
          * Set the maximum size of the CMAB cache.
          * 
-         * Default value is 1000 entries.
+         * Default value is 10000 entries.
          *
          * @param cacheSize The maximum number of entries to store in the cache
          * @return Builder instance
@@ -218,7 +218,7 @@ public Builder withCmabCacheSize(int cacheSize) {
         /**
          * Set the timeout duration for cached CMAB decisions.
          * 
-         * Default value is 300 seconds (5 minutes).
+         * Default value is 30 * 60 seconds (30 minutes).
          *
          * @param timeoutInSecs The timeout in seconds before cached entries expire
          * @return Builder instance
@@ -249,7 +249,7 @@ public Builder withClient(CmabClient client) {
          * @param cache The custom cache instance implementing {@link Cache}
          * @return Builder instance
          */
-        public Builder withCustomCache(CacheWithRemove<CmabCacheValue> cache) {
+        public Builder withCustomCache(Cache<CmabCacheValue> cache) {
             this.customCache = cache;
             return this;
         }
@@ -259,7 +259,7 @@ public DefaultCmabService build() {
                 throw new IllegalStateException("CmabClient is required");
             }
 
-            CacheWithRemove<CmabCacheValue> cache = customCache != null ? customCache : 
+            Cache<CmabCacheValue> cache = customCache != null ? customCache : 
                 new DefaultLRUCache<>(cmabCacheSize, cmabCacheTimeoutInSecs);
 
             return new DefaultCmabService(client, cache);

core-api/src/main/java/com/optimizely/ab/internal/Cache.java

@@ -22,4 +22,8 @@ public interface Cache<T> {
     void save(String key, T value);
     T lookup(String key);
     void reset();
+    default void remove(String key) {
+        // Default implementation does nothing
+        // Implementations should override this method to provide actual removal functionality
+    }
 }

core-api/src/main/java/com/optimizely/ab/internal/CacheWithRemove.java

@@ -23,7 +23,7 @@
 
 import com.optimizely.ab.annotations.VisibleForTesting;
 
-public class DefaultLRUCache<T> implements CacheWithRemove<T> {
+public class DefaultLRUCache<T> implements Cache<T> {
 
     private final ReentrantLock lock = new ReentrantLock();
 
@@ -96,6 +96,7 @@ public void reset() {
         }
     }
 
+    @Override
     public void remove(String key) {
         if (maxSize == 0) {
             // Cache is disabled when maxSize = 0

core-api/src/main/java/com/optimizely/ab/internal/DefaultLRUCache.java

@@ -25,7 +25,6 @@
 import com.optimizely.ab.bucketing.UserProfileUtils;
 import com.optimizely.ab.config.*;
 import com.optimizely.ab.config.parser.ConfigParseException;
-import com.optimizely.ab.event.EventHandler;
 import com.optimizely.ab.event.EventProcessor;
 import com.optimizely.ab.event.ForwardingEventProcessor;
 import com.optimizely.ab.event.internal.ImpressionEvent;
@@ -44,8 +43,6 @@
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
@@ -57,9 +54,6 @@
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 public class OptimizelyUserContextTest {