Merge branch 'master' into farhan-anjum/FSSDK-11134-cmab-datafile-parsing

Author: FarhanAnjum-opti

.github/workflows/build.yml

@@ -22,13 +22,12 @@ jobs:
   run_build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: set up JDK 8
       uses: actions/setup-java@v2
       with:
         java-version: '8'
         distribution: 'temurin'
-        cache: gradle
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: ${{ inputs.action }}

.github/workflows/integration_test.yml

@@ -13,7 +13,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         # You should create a personal access token and store it in your repository
         token: ${{ secrets.CI_USER_TOKEN }}

.github/workflows/java.yml

@@ -83,8 +83,8 @@ jobs:
       - name: Check on failures
         if: always() && steps.unit_tests.outcome != 'success'
         run: |
-          cat /home/runner/java-sdk/core-api/build/reports/findbugs/main.html
-          cat /home/runner/java-sdk/core-api/build/reports/findbugs/test.html
+          cat /Users/runner/work/java-sdk/core-api/build/reports/spotbugs/main.html
+          cat /Users/runner/work/java-sdk/core-api/build/reports/spotbugs/test.html
       - name: Check on success
         if: always() && steps.unit_tests.outcome == 'success'
         run: |

.gitignore

@@ -25,3 +25,5 @@ classes
 .vagrant
 .DS_Store
 .venv
+
+.vscode/mcp.json

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Optimizely Java X SDK Changelog
 
+## [4.2.2]
+May 28th, 2025
+
+### Fixes
+- Added experimentId and variationId to decision notification ([#569](https://github.com/optimizely/java-sdk/pull/569)).
+
 ## [4.2.1]
 Feb 19th, 2025
 

README.md

@@ -70,7 +70,7 @@ You can run all unit tests with:
 
 ### Checking for bugs
 
-We utilize [FindBugs](http://findbugs.sourceforge.net/) to identify possible bugs in the SDK. To run the check:
+We utilize [SpotBugs](https://spotbugs.github.io/) to identify possible bugs in the SDK. To run the check:
 
 ```
 

build.gradle

@@ -2,9 +2,9 @@ plugins {
     id 'com.github.kt3k.coveralls' version '2.12.2'
     id 'jacoco'
     id 'me.champeau.gradle.jmh' version '0.5.3'
-    id 'nebula.optional-base' version '3.2.0'
+    id 'nebula.optional-base' version '3.1.0'
     id 'com.github.hierynomus.license' version '0.16.1'
-    id 'com.github.spotbugs' version "4.5.0"
+    id 'com.github.spotbugs' version "6.0.14"
     id 'maven-publish'
 }
 
@@ -73,6 +73,7 @@ configure(publishedProjects) {
 
     spotbugs {
         spotbugsJmh.enabled = false
+        reportLevel = com.github.spotbugs.snom.Confidence.valueOf('HIGH')
     }
 
     test {
@@ -115,6 +116,7 @@ configure(publishedProjects) {
     configurations.all {
         resolutionStrategy {
             force "junit:junit:${junitVersion}"
+            force 'com.netflix.nebula:nebula-gradle-interop:2.2.2'
         }
     }
 

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

@@ -1303,6 +1303,8 @@ private OptimizelyDecision createOptimizelyDecision(
         ProjectConfig projectConfig
     ) {
         String userId = user.getUserId();
+        String experimentId = null;
+        String variationId = null;
 
         Boolean flagEnabled = false;
         if (flagDecision.variation != null) {
@@ -1336,6 +1338,8 @@ private OptimizelyDecision createOptimizelyDecision(
 
 
         Boolean decisionEventDispatched = false;
+        experimentId = flagDecision.experiment != null ? flagDecision.experiment.getId() : null;
+        variationId = flagDecision.variation != null ? flagDecision.variation.getId() : null;
 
         Map<String, Object> attributes = user.getAttributes();
         Map<String, ?> copiedAttributes = new HashMap<>(attributes);
@@ -1362,6 +1366,8 @@ private OptimizelyDecision createOptimizelyDecision(
             .withRuleKey(ruleKey)
             .withReasons(reasonsToReport)
             .withDecisionEventDispatched(decisionEventDispatched)
+            .withExperimentId(experimentId)
+            .withVariationId(variationId)
             .build();
         notificationCenter.send(decisionNotification);
 

core-api/src/main/java/com/optimizely/ab/config/DatafileProjectConfig.java

@@ -63,6 +63,7 @@ public class DatafileProjectConfig implements ProjectConfig {
     private final boolean anonymizeIP;
     private final boolean sendFlagDecisions;
     private final Boolean botFiltering;
+    private final String region;
     private final String hostForODP;
     private final String publicKeyForODP;
     private final List<Attribute> attributes;
@@ -95,6 +96,8 @@ public class DatafileProjectConfig implements ProjectConfig {
     // other mappings
     private final Map<String, Experiment> variationIdToExperimentMapping;
 
+    private final HoldoutConfig holdoutConfig;
+
     private String datafile;
 
     // v2 constructor
@@ -113,6 +116,7 @@ public DatafileProjectConfig(String accountId, String projectId, String version,
             anonymizeIP,
             false,
             null,
+            null,
             projectId,
             revision,
             null,
@@ -124,6 +128,7 @@ public DatafileProjectConfig(String accountId, String projectId, String version,
             eventType,
             experiments,
             null,
+            null,
             groups,
             null,
             null
@@ -135,6 +140,7 @@ public DatafileProjectConfig(String accountId,
                                  boolean anonymizeIP,
                                  boolean sendFlagDecisions,
                                  Boolean botFiltering,
+                                 String region,
                                  String projectId,
                                  String revision,
                                  String sdkKey,
@@ -145,6 +151,7 @@ public DatafileProjectConfig(String accountId,
                                  List<Audience> typedAudiences,
                                  List<EventType> events,
                                  List<Experiment> experiments,
+                                 List<Holdout> holdouts,
                                  List<FeatureFlag> featureFlags,
                                  List<Group> groups,
                                  List<Rollout> rollouts,
@@ -158,6 +165,7 @@ public DatafileProjectConfig(String accountId,
         this.anonymizeIP = anonymizeIP;
         this.sendFlagDecisions = sendFlagDecisions;
         this.botFiltering = botFiltering;
+        this.region = region != null ? region : "US";
 
         this.attributes = Collections.unmodifiableList(attributes);
         this.audiences = Collections.unmodifiableList(audiences);
@@ -187,6 +195,12 @@ public DatafileProjectConfig(String accountId,
         allExperiments.addAll(aggregateGroupExperiments(groups));
         this.experiments = Collections.unmodifiableList(allExperiments);
 
+        if (holdouts == null) {
+            this.holdoutConfig = new HoldoutConfig();
+        }  else {
+            this.holdoutConfig = new HoldoutConfig(holdouts);
+        }
+
         String publicKeyForODP = "";
         String hostForODP = "";
         if (integrations == null) {
@@ -424,6 +438,11 @@ public Boolean getBotFiltering() {
         return botFiltering;
     }
 
+    @Override
+    public String getRegion() {
+        return region;
+    }
+
     @Override
     public List<Group> getGroups() {
         return groups;
@@ -434,6 +453,21 @@ public List<Experiment> getExperiments() {
         return experiments;
     }
 
+    @Override
+    public List<Holdout> getHoldouts() { 
+        return holdoutConfig.getAllHoldouts(); 
+    }
+
+    @Override
+    public List<Holdout> getHoldoutForFlag(@Nonnull String id) {
+        return holdoutConfig.getHoldoutForFlag(id);
+    }
+
+    @Override   
+    public Holdout getHoldout(@Nonnull String id) {
+        return holdoutConfig.getHoldout(id);
+    }
+
     @Override
     public Set<String> getAllSegments() {
         return this.allSegments;
@@ -587,6 +621,7 @@ public String toString() {
             ", version='" + version + '\'' +
             ", anonymizeIP=" + anonymizeIP +
             ", botFiltering=" + botFiltering +
+            ", region=" + region +
             ", attributes=" + attributes +
             ", audiences=" + audiences +
             ", typedAudiences=" + typedAudiences +

core-api/src/main/java/com/optimizely/ab/config/Experiment.java

@@ -34,7 +34,7 @@
  */
 @Immutable
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Experiment implements IdKeyMapped {
+public class Experiment implements ExperimentCore {
 
     private final String id;
     private final String key;
@@ -43,10 +43,6 @@ public class Experiment implements IdKeyMapped {
     private final String groupId;
     private final Cmab cmab;
 
-    private final String AND = "AND";
-    private final String OR = "OR";
-    private final String NOT = "NOT";
-
     private final List<String> audienceIds;
     private final Condition<AudienceIdCondition> audienceConditions;
     private final List<Variation> variations;
@@ -202,98 +198,6 @@ public boolean isLaunched() {
         return status.equals(ExperimentStatus.LAUNCHED.toString());
     }
 
-    public String serializeConditions(Map<String, String> audiencesMap) {
-        Condition condition = this.audienceConditions;
-        return condition instanceof EmptyCondition ? "" : this.serialize(condition, audiencesMap);
-    }
-
-    private String getNameFromAudienceId(String audienceId, Map<String, String> audiencesMap) {
-        StringBuilder audienceName = new StringBuilder();
-        if (audiencesMap != null && audiencesMap.get(audienceId) != null) {
-            audienceName.append("\"" + audiencesMap.get(audienceId) + "\"");
-        } else {
-            audienceName.append("\"" + audienceId + "\"");
-        }
-        return audienceName.toString();
-    }
-
-    private String getOperandOrAudienceId(Condition condition, Map<String, String> audiencesMap) {
-        if (condition != null) {
-            if (condition instanceof AudienceIdCondition) {
-                return this.getNameFromAudienceId(condition.getOperandOrId(), audiencesMap);
-            } else {
-                return condition.getOperandOrId();
-            }
-        } else {
-            return "";
-        }
-    }
-
-    public String serialize(Condition condition, Map<String, String> audiencesMap) {
-        StringBuilder stringBuilder = new StringBuilder();
-        List<Condition> conditions;
-
-        String operand = this.getOperandOrAudienceId(condition, audiencesMap);
-        switch (operand){
-            case (AND):
-                conditions = ((AndCondition<?>) condition).getConditions();
-                stringBuilder.append(this.getNameOrNextCondition(operand, conditions, audiencesMap));
-                break;
-            case (OR):
-                conditions = ((OrCondition<?>) condition).getConditions();
-                stringBuilder.append(this.getNameOrNextCondition(operand, conditions, audiencesMap));
-                break;
-            case (NOT):
-                stringBuilder.append(operand + " ");
-                Condition notCondition = ((NotCondition<?>) condition).getCondition();
-                if (notCondition instanceof AudienceIdCondition) {
-                    stringBuilder.append(serialize(notCondition, audiencesMap));
-                } else {
-                    stringBuilder.append("(" + serialize(notCondition, audiencesMap) + ")");
-                }
-                break;
-            default:
-                stringBuilder.append(operand);
-                break;
-        }
-
-        return stringBuilder.toString();
-    }
-
-    public String getNameOrNextCondition(String operand, List<Condition> conditions, Map<String, String> audiencesMap) {
-        StringBuilder stringBuilder = new StringBuilder();
-        int index = 0;
-        if (conditions.isEmpty()) {
-            return "";
-        } else if (conditions.size() == 1) {
-            return serialize(conditions.get(0), audiencesMap);
-        } else {
-            for (Condition con : conditions) {
-                index++;
-                if (index + 1 <= conditions.size()) {
-                    if (con instanceof AudienceIdCondition) {
-                        String audienceName = this.getNameFromAudienceId(((AudienceIdCondition<?>) con).getAudienceId(),
-                            audiencesMap);
-                        stringBuilder.append( audienceName + " ");
-                    } else {
-                        stringBuilder.append("(" + serialize(con, audiencesMap) + ") ");
-                    }
-                    stringBuilder.append(operand);
-                    stringBuilder.append(" ");
-                } else {
-                    if (con instanceof AudienceIdCondition) {
-                        String audienceName = this.getNameFromAudienceId(((AudienceIdCondition<?>) con).getAudienceId(),
-                            audiencesMap);
-                        stringBuilder.append(audienceName);
-                    } else {
-                        stringBuilder.append("(" + serialize(con, audiencesMap) + ")");
-                    }
-                }
-            }
-        }
-        return stringBuilder.toString();
-    }
-
     @Override
     public String toString() {
         return "Experiment{" +