update: introduce CacheWithRemove interface and refactor DefaultCmabService to utilize it

Author: FarhanAnjum-opti

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

@@ -30,15 +30,15 @@
 import com.optimizely.ab.config.Attribute;
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.ProjectConfig;
-import com.optimizely.ab.internal.Cache;
+import com.optimizely.ab.internal.CacheWithRemove;
 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
 
-    private final Cache<CmabCacheValue> cmabCache;
+    private final CacheWithRemove<CmabCacheValue> cmabCache;
     private final CmabClient cmabClient;
     private final Logger logger;
 
@@ -48,7 +48,7 @@ public class DefaultCmabService implements CmabService {
     //     this.logger = logger;
     // }
 
-    public DefaultCmabService(CmabClient cmabClient, Cache<CmabCacheValue> cmabCache, Logger logger) {
+    public DefaultCmabService(CmabClient cmabClient, CacheWithRemove<CmabCacheValue> cmabCache, Logger logger) {
         this.cmabCache = cmabCache;
         this.cmabClient = cmabClient;
         this.logger = logger;
@@ -200,7 +200,7 @@ public static Builder builder() {
     public static class Builder {
         private int cmabCacheSize = DEFAULT_CMAB_CACHE_SIZE;
         private int cmabCacheTimeoutInSecs = DEFAULT_CMAB_CACHE_TIMEOUT_SECS;
-        private Cache<CmabCacheValue> customCache;
+        private CacheWithRemove<CmabCacheValue> customCache;
         private CmabClient client;
         private Logger logger;
 
@@ -251,7 +251,7 @@ public Builder withClient(CmabClient client) {
          * @param cache The custom cache instance implementing {@link Cache}
          * @return Builder instance
          */
-        public Builder withCustomCache(Cache<CmabCacheValue> cache) {
+        public Builder withCustomCache(CacheWithRemove<CmabCacheValue> cache) {
             this.customCache = cache;
             return this;
         }
@@ -278,7 +278,7 @@ public DefaultCmabService build() {
                 logger = LoggerFactory.getLogger(DefaultCmabService.class);
             }
 
-            Cache<CmabCacheValue> cache = customCache != null ? customCache : 
+            CacheWithRemove<CmabCacheValue> cache = customCache != null ? customCache : 
                 new DefaultLRUCache<>(cmabCacheSize, cmabCacheTimeoutInSecs);
 
 

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

@@ -22,5 +22,4 @@ public interface Cache<T> {
     void save(String key, T value);
     T lookup(String key);
     void reset();
-    void remove(String key);
 }

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

@@ -0,0 +1,21 @@
+/**
+ *
+ *    Copyright 2025, Optimizely
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package com.optimizely.ab.internal;
+
+public interface CacheWithRemove<T> extends Cache<T> {
+    void remove(String key);
+}

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

@@ -16,11 +16,13 @@
  */
 package com.optimizely.ab.internal;
 
-import com.optimizely.ab.annotations.VisibleForTesting;
-
-import java.util.*;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 
+import com.optimizely.ab.annotations.VisibleForTesting;
+
 public class DefaultLRUCache<T> implements Cache<T> {
 
     private final ReentrantLock lock = new ReentrantLock();

core-httpclient-impl/src/main/java/com/optimizely/ab/OptimizelyFactory.java

@@ -32,7 +32,7 @@
 import com.optimizely.ab.event.AsyncEventHandler;
 import com.optimizely.ab.event.BatchEventProcessor;
 import com.optimizely.ab.event.EventHandler;
-import com.optimizely.ab.internal.Cache;
+import com.optimizely.ab.internal.CacheWithRemove;
 import com.optimizely.ab.internal.PropertyUtils;
 import com.optimizely.ab.notification.NotificationCenter;
 import com.optimizely.ab.odp.DefaultODPApiManager;
@@ -60,7 +60,7 @@
 public final class OptimizelyFactory {
     private static final Logger logger = LoggerFactory.getLogger(OptimizelyFactory.class);
 
-    private static Cache<CmabCacheValue> customCmabCache;
+    private static CacheWithRemove<CmabCacheValue> customCmabCache;
 
     /**
      * Convenience method for setting the maximum number of events contained within a batch.
@@ -244,7 +244,7 @@ public static void setCmabCacheTimeoutInSecs(int timeoutInSecs) {
      *
      * @param cache The custom cache implementation
      */
-    public static void setCustomCmabCache(Cache<CmabCacheValue> cache) {
+    public static void setCustomCmabCache(CacheWithRemove<CmabCacheValue> cache) {
         if (cache == null) {
             logger.warn("Custom CMAB cache cannot be null. Reverting to default configuration.");
             return;