update: modify OptimizelyUserContext to change optimizely field to package-private and add copyright notice to DecisionPath

Author: FarhanAnjum-opti

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

@@ -1949,7 +1949,7 @@ public Builder withODPManager(ODPManager odpManager) {
 
         public Builder withCmabClient(CmabClient cmabClient) {
             int DEFAULT_MAX_SIZE = 1000;
-            int DEFAULT_CMAB_CACHE_TIMEOUT = 30 * 60 * 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);

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

@@ -50,7 +50,7 @@ public class OptimizelyUserContext {
     private List<String> qualifiedSegments;
 
     @Nonnull
-    private final Optimizely optimizely;
+    final Optimizely optimizely;
 
     private static final Logger logger = LoggerFactory.getLogger(OptimizelyUserContext.class);
 
@@ -205,42 +205,6 @@ public Map<String, OptimizelyDecision> decideAll() {
         return decideAll(Collections.emptyList());
     }
 
-    /**
-     * Returns a decision result ({@link OptimizelyDecision}) for a given flag key and a user context, 
-     * which contains all data required to deliver the flag. This method skips CMAB logic.
-     * backward compatibility support for android sync decisions
-     * @param key A flag key for which a decision will be made.
-     * @param options A list of options for decision-making.
-     * @return A decision result.
-     */
-    public OptimizelyDecision decideSync(@Nonnull String key,
-                                                @Nonnull List<OptimizelyDecideOption> options) {
-        return optimizely.decideSync(copy(), key, options);
-    }
-
-    /**
-     * Returns a key-map of decision results ({@link OptimizelyDecision}) for multiple flag keys and a user context.
-     * This method skips CMAB logic.
-     * backward compatibility support for android sync decisions
-     * @param keys A list of flag keys for which decisions will be made.
-     * @param options A list of options for decision-making.
-     * @return All decision results mapped by flag keys.
-     */
-    public Map<String, OptimizelyDecision> decideForKeysSync(@Nonnull List<String> keys,
-                                                                    @Nonnull List<OptimizelyDecideOption> options) {
-        return optimizely.decideForKeysSync(copy(), keys, options);
-    }
-
-    /**
-     * Returns a key-map of decision results ({@link OptimizelyDecision}) for all active flag keys.
-     * This method skips CMAB logic.
-     * backward compatibility support for android sync decisions
-     * @param options A list of options for decision-making.
-     * @return All decision results mapped by flag keys.
-     */
-    public Map<String, OptimizelyDecision> decideAllSync(@Nonnull List<OptimizelyDecideOption> options) {
-        return optimizely.decideAllSync(copy(), options);
-    }
 
     /**
      * Returns a decision result asynchronously for a given flag key and a user context.

core-api/src/main/java/com/optimizely/ab/bucketing/DecisionPath.java

@@ -1,3 +1,18 @@
+/****************************************************************************
+ * Copyright 2025 Optimizely, Inc. and contributors                        *
+ *                                                                          *
+ * 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.bucketing;
 
 public enum DecisionPath {

core-api/src/test/java/com/optimizely/ab/OptimizelyUserContextTest.java

@@ -2271,275 +2271,6 @@ public void decide_all_with_holdout() throws Exception {
         logbackVerifier.expectMessage(Level.INFO, expectedReason);
     }
 
-    @Test
-    public void decideSync_featureTest() {
-        optimizely = new Optimizely.Builder()
-            .withDatafile(datafile)
-            .withEventProcessor(new ForwardingEventProcessor(eventHandler, null))
-            .build();
-
-        String flagKey = "feature_2";
-        String experimentKey = "exp_no_audience";
-        String variationKey = "variation_with_traffic";
-        String experimentId = "10420810910";
-        String variationId = "10418551353";
-        OptimizelyJSON variablesExpected = optimizely.getAllFeatureVariables(flagKey, userId);
-
-        OptimizelyUserContext user = optimizely.createUserContext(userId);
-        OptimizelyDecision decision = user.decideSync(flagKey, Collections.emptyList());
-
-        assertEquals(decision.getVariationKey(), variationKey);
-        assertTrue(decision.getEnabled());
-        assertEquals(decision.getVariables().toMap(), variablesExpected.toMap());
-        assertEquals(decision.getRuleKey(), experimentKey);
-        assertEquals(decision.getFlagKey(), flagKey);
-        assertEquals(decision.getUserContext(), user);
-        assertTrue(decision.getReasons().isEmpty());
-
-        DecisionMetadata metadata = new DecisionMetadata.Builder()
-            .setFlagKey(flagKey)
-            .setRuleKey(experimentKey)
-            .setRuleType(FeatureDecision.DecisionSource.FEATURE_TEST.toString())
-            .setVariationKey(variationKey)
-            .setEnabled(true)
-            .build();
-        eventHandler.expectImpression(experimentId, variationId, userId, Collections.emptyMap(), metadata);
-    }
-
-    @Test
-    public void decideForKeysSync_multipleFlags() {
-        String flagKey1 = "feature_1";
-        String flagKey2 = "feature_2";
-
-        List<String> flagKeys = Arrays.asList(flagKey1, flagKey2);
-        OptimizelyJSON variablesExpected1 = optimizely.getAllFeatureVariables(flagKey1, userId);
-        OptimizelyJSON variablesExpected2 = optimizely.getAllFeatureVariables(flagKey2, userId);
-
-        OptimizelyUserContext user = optimizely.createUserContext(userId, Collections.singletonMap("gender", "f"));
-        Map<String, OptimizelyDecision> decisions = user.decideForKeysSync(flagKeys, Collections.emptyList());
-
-        assertEquals(decisions.size(), 2);
-
-        assertEquals(
-            decisions.get(flagKey1),
-            new OptimizelyDecision("a",
-                true,
-                variablesExpected1,
-                "exp_with_audience",
-                flagKey1,
-                user,
-                Collections.emptyList()));
-        assertEquals(
-            decisions.get(flagKey2),
-            new OptimizelyDecision("variation_with_traffic",
-                true,
-                variablesExpected2,
-                "exp_no_audience",
-                flagKey2,
-                user,
-                Collections.emptyList()));
-    }
-
-    @Test
-    public void decideForKeysSync_withOptions() {
-        String flagKey1 = "feature_1";
-        String flagKey2 = "feature_2";
-
-        List<String> flagKeys = Arrays.asList(flagKey1, flagKey2);
-        List<OptimizelyDecideOption> options = Arrays.asList(OptimizelyDecideOption.EXCLUDE_VARIABLES);
-
-        OptimizelyUserContext user = optimizely.createUserContext(userId, Collections.singletonMap("gender", "f"));
-        Map<String, OptimizelyDecision> decisions = user.decideForKeysSync(flagKeys, options);
-
-        assertEquals(decisions.size(), 2);
-
-        // Both decisions should have empty variables due to EXCLUDE_VARIABLES option
-        OptimizelyDecision decision1 = decisions.get(flagKey1);
-        OptimizelyDecision decision2 = decisions.get(flagKey2);
-
-        assertTrue(decision1.getVariables().toMap().isEmpty());
-        assertTrue(decision2.getVariables().toMap().isEmpty());
-        assertEquals(decision1.getVariationKey(), "a");
-        assertEquals(decision2.getVariationKey(), "variation_with_traffic");
-    }
-
-    @Test
-    public void decideAllSync_allFlags() {
-        EventProcessor mockEventProcessor = mock(EventProcessor.class);
-
-        optimizely = new Optimizely.Builder()
-            .withDatafile(datafile)
-            .withEventProcessor(mockEventProcessor)
-            .build();
-
-        String flagKey1 = "feature_1";
-        String flagKey2 = "feature_2";
-        String flagKey3 = "feature_3";
-        Map<String, Object> attributes = Collections.singletonMap("gender", "f");
-
-        OptimizelyJSON variablesExpected1 = optimizely.getAllFeatureVariables(flagKey1, userId);
-        OptimizelyJSON variablesExpected2 = optimizely.getAllFeatureVariables(flagKey2, userId);
-        OptimizelyJSON variablesExpected3 = new OptimizelyJSON(Collections.emptyMap());
-
-        OptimizelyUserContext user = optimizely.createUserContext(userId, attributes);
-        Map<String, OptimizelyDecision> decisions = user.decideAllSync(Collections.emptyList());
-        assertEquals(decisions.size(), 3);
-
-        assertEquals(
-            decisions.get(flagKey1),
-            new OptimizelyDecision(
-                "a",
-                true,
-                variablesExpected1,
-                "exp_with_audience",
-                flagKey1,
-                user,
-                Collections.emptyList()));
-        assertEquals(
-            decisions.get(flagKey2),
-            new OptimizelyDecision(
-                "variation_with_traffic",
-                true,
-                variablesExpected2,
-                "exp_no_audience",
-                flagKey2,
-                user,
-                Collections.emptyList()));
-                assertEquals(
-            decisions.get(flagKey3),
-            new OptimizelyDecision(
-                null,
-                false,
-                variablesExpected3,
-                null,
-                flagKey3,
-                user,
-                Collections.emptyList()));
-
-        ArgumentCaptor<ImpressionEvent> argumentCaptor = ArgumentCaptor.forClass(ImpressionEvent.class);
-        verify(mockEventProcessor, times(3)).process(argumentCaptor.capture());
-
-        List<ImpressionEvent> sentEvents = argumentCaptor.getAllValues();
-        assertEquals(sentEvents.size(), 3);
-
-        assertEquals(sentEvents.get(0).getExperimentKey(), "exp_with_audience");
-        assertEquals(sentEvents.get(0).getVariationKey(), "a");
-        assertEquals(sentEvents.get(0).getUserContext().getUserId(), userId);
-
-        assertEquals(sentEvents.get(1).getExperimentKey(), "exp_no_audience");
-        assertEquals(sentEvents.get(1).getVariationKey(), "variation_with_traffic");
-        assertEquals(sentEvents.get(1).getUserContext().getUserId(), userId);
-
-        assertEquals(sentEvents.get(2).getExperimentKey(), "");
-        assertEquals(sentEvents.get(2).getUserContext().getUserId(), userId);
-    }
-
-    @Test
-    public void decideAllSync_withOptions() {
-        String flagKey1 = "feature_1";
-        OptimizelyJSON variablesExpected1 = optimizely.getAllFeatureVariables(flagKey1, userId);
-
-        OptimizelyUserContext user = optimizely.createUserContext(userId, Collections.singletonMap("gender", "f"));
-        Map<String, OptimizelyDecision> decisions = user.decideAllSync(Arrays.asList(OptimizelyDecideOption.ENABLED_FLAGS_ONLY));
-
-        assertEquals(decisions.size(), 2); // Only enabled flags
-
-        assertEquals(
-            decisions.get(flagKey1),
-            new OptimizelyDecision(
-                "a",
-                true,
-                variablesExpected1,
-                "exp_with_audience",
-                flagKey1,
-                user,
-                Collections.emptyList()));
-    }
-
-    @Test
-    public void decideAllSync_ups_batching() throws Exception {
-        UserProfileService ups = mock(UserProfileService.class);
-
-        optimizely = new Optimizely.Builder()
-            .withDatafile(datafile)
-            .withUserProfileService(ups)
-            .build();
-
-        Map<String, Object> attributes = Collections.singletonMap("gender", "f");
-
-        OptimizelyUserContext user = optimizely.createUserContext(userId, attributes);
-        Map<String, OptimizelyDecision> decisions = user.decideAllSync(Collections.emptyList());
-
-        assertEquals(decisions.size(), 3);
-
-        ArgumentCaptor<Map> argumentCaptor = ArgumentCaptor.forClass(Map.class);
-
-        verify(ups, times(1)).lookup(userId);
-        verify(ups, times(1)).save(argumentCaptor.capture());
-
-        Map<String, Object> savedUps = argumentCaptor.getValue();
-        UserProfile savedProfile = UserProfileUtils.convertMapToUserProfile(savedUps);
-
-        assertEquals(savedProfile.userId, userId);
-    }
-
-    @Test
-    public void decideSync_sdkNotReady() {
-        String flagKey = "feature_1";
-
-        Optimizely optimizely = new Optimizely.Builder().build();
-        OptimizelyUserContext user = optimizely.createUserContext(userId);
-        OptimizelyDecision decision = user.decideSync(flagKey, Collections.emptyList());
-
-        assertNull(decision.getVariationKey());
-        assertFalse(decision.getEnabled());
-        assertTrue(decision.getVariables().isEmpty());
-        assertEquals(decision.getFlagKey(), flagKey);
-        assertEquals(decision.getUserContext(), user);
-
-        assertEquals(decision.getReasons().size(), 1);
-        assertEquals(decision.getReasons().get(0), DecisionMessage.SDK_NOT_READY.reason());
-    }
-
-    @Test
-    public void decideForKeysSync_sdkNotReady() {
-        List<String> flagKeys = Arrays.asList("feature_1");
-
-        Optimizely optimizely = new Optimizely.Builder().build();
-        OptimizelyUserContext user = optimizely.createUserContext(userId);
-        Map<String, OptimizelyDecision> decisions = user.decideForKeysSync(flagKeys, Collections.emptyList());
-
-        assertEquals(decisions.size(), 0);
-    }
-    @Test
-    public void decideSync_bypassUPS() throws Exception {
-        String flagKey = "feature_2";        // embedding experiment: "exp_no_audience"
-        String experimentId = "10420810910";    // "exp_no_audience"
-        String variationId1 = "10418551353";
-        String variationId2 = "10418510624";
-        String variationKey1 = "variation_with_traffic";
-        String variationKey2 = "variation_no_traffic";
-
-        UserProfileService ups = mock(UserProfileService.class);
-        when(ups.lookup(userId)).thenReturn(createUserProfileMap(experimentId, variationId2));
-
-        optimizely = new Optimizely.Builder()
-            .withDatafile(datafile)
-            .withUserProfileService(ups)
-            .build();
-
-        OptimizelyUserContext user = optimizely.createUserContext(userId);
-        OptimizelyDecision decision = user.decideSync(flagKey, Collections.emptyList());
-        // should return variationId2 set by UPS
-        assertEquals(decision.getVariationKey(), variationKey2);
-
-        decision = user.decideSync(flagKey, Arrays.asList(OptimizelyDecideOption.IGNORE_USER_PROFILE_SERVICE));
-        // should ignore variationId2 set by UPS and return variationId1
-        assertEquals(decision.getVariationKey(), variationKey1);
-        // also should not save either
-        verify(ups, never()).save(anyObject());
-    }
-
     @Test
     public void decideAsync_featureTest() throws InterruptedException {
         optimizely = new Optimizely.Builder()

core-api/src/test/java/com/optimizely/ab/internal/DefaultLRUCacheTest.java

@@ -16,12 +16,12 @@
  */
 package com.optimizely.ab.internal;
 
-import org.junit.Test;
-
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import org.junit.Test;
 
 public class DefaultLRUCacheTest {