update: refactor DefaultCmabService to remove CmabServiceOptions dependency and adjust related tests

Author: FarhanAnjum-opti

core-api/src/main/java/com/optimizely/ab/Optimizely.java

@@ -19,7 +19,6 @@
 import com.optimizely.ab.bucketing.*;
 import com.optimizely.ab.cmab.service.CmabCacheValue;
 import com.optimizely.ab.cmab.service.CmabService;
-import com.optimizely.ab.cmab.service.CmabServiceOptions;
 import com.optimizely.ab.cmab.service.DefaultCmabService;
 import com.optimizely.ab.config.AtomicProjectConfigManager;
 import com.optimizely.ab.config.DatafileProjectConfig;
@@ -1993,8 +1992,7 @@ public Builder withCmabClient(CmabClient cmabClient) {
             int DEFAULT_MAX_SIZE = 1000;
             int DEFAULT_CMAB_CACHE_TIMEOUT = 30 * 60;
             DefaultLRUCache<CmabCacheValue> cmabCache = new DefaultLRUCache<>(DEFAULT_MAX_SIZE, DEFAULT_CMAB_CACHE_TIMEOUT);
-            CmabServiceOptions cmabServiceOptions = new CmabServiceOptions(logger, cmabCache, cmabClient);
-            DefaultCmabService defaultCmabService = new DefaultCmabService(cmabServiceOptions);
+            DefaultCmabService defaultCmabService = new DefaultCmabService(cmabClient, cmabCache, logger);
             this.cmabService = defaultCmabService;
             return this;
         }

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

@@ -38,10 +38,10 @@ public class DefaultCmabService implements CmabService {
     private final CmabClient cmabClient;
     private final Logger logger;
 
-    public DefaultCmabService(CmabServiceOptions options) {
-        this.cmabCache = options.getCmabCache();
-        this.cmabClient = options.getCmabClient();
-        this.logger = options.getLogger();
+    public DefaultCmabService(CmabClient cmabClient, DefaultLRUCache<CmabCacheValue> cmabCache, Logger logger) {
+        this.cmabCache = cmabCache;
+        this.cmabClient = cmabClient;
+        this.logger = logger;
     }
 
     @Override

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

@@ -43,7 +43,6 @@
 import com.optimizely.ab.cmab.client.CmabClient;
 import com.optimizely.ab.cmab.service.CmabCacheValue;
 import com.optimizely.ab.cmab.service.CmabDecision;
-import com.optimizely.ab.cmab.service.CmabServiceOptions;
 import com.optimizely.ab.cmab.service.DefaultCmabService;
 import com.optimizely.ab.config.Attribute;
 import com.optimizely.ab.config.Cmab;
@@ -83,9 +82,7 @@ public DefaultCmabServiceTest() {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        
-        CmabServiceOptions options = new CmabServiceOptions(mockLogger, mockCmabCache, mockCmabClient);
-        cmabService = new DefaultCmabService(options);
+        cmabService = new DefaultCmabService(mockCmabClient, mockCmabCache, mockLogger);
 
         // Setup mock user context
         when(mockUserContext.getUserId()).thenReturn("user123");