[FSSDK-11520] parse holdout section and update project config

.gitignore

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

build.gradle

@@ -2,7 +2,7 @@ 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 "6.0.14"
     id 'maven-publish'
@@ -116,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/config/DatafileProjectConfig.java

@@ -95,6 +95,8 @@ public class DatafileProjectConfig implements ProjectConfig {
     // other mappings
     private final Map<String, Experiment> variationIdToExperimentMapping;
 
+    private final HoldoutConfig holdoutConfig;
+
     private String datafile;
 
     // v2 constructor
@@ -124,6 +126,7 @@ public DatafileProjectConfig(String accountId, String projectId, String version,
             eventType,
             experiments,
             null,
+            null,
             groups,
             null,
             null
@@ -145,6 +148,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,
@@ -187,6 +191,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) {
@@ -434,6 +444,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;

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

@@ -34,18 +34,14 @@
  */
 @Immutable
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class Experiment implements IdKeyMapped {
+public class Experiment implements ExperimentCore {
 
     private final String id;
     private final String key;
     private final String status;
     private final String layerId;
     private final String groupId;
 
-    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;
@@ -176,98 +172,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{" +

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

@@ -0,0 +1,134 @@
+/**
+ *
+ *    Copyright 2016-2019, 2021, Optimizely 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.config;
+
+import com.optimizely.ab.config.audience.AndCondition;
+import com.optimizely.ab.config.audience.AudienceIdCondition;
+import com.optimizely.ab.config.audience.Condition;
+import com.optimizely.ab.config.audience.EmptyCondition;
+import com.optimizely.ab.config.audience.NotCondition;
+import com.optimizely.ab.config.audience.OrCondition;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ExperimentCore extends IdKeyMapped {
+    String AND = "AND";
+    String OR = "OR";
+    String NOT = "NOT";
+
+    String getLayerId();
+    String getGroupId();
+    List<String> getAudienceIds();
+    Condition<AudienceIdCondition> getAudienceConditions();
+    List<Variation> getVariations();
+    List<TrafficAllocation> getTrafficAllocation();
+    Map<String, Variation> getVariationKeyToVariationMap();
+    Map<String, Variation> getVariationIdToVariationMap();
+
+    default String serializeConditions(Map<String, String> audiencesMap) {
+        Condition condition = this.getAudienceConditions();
+        return condition instanceof EmptyCondition ? "" : this.serialize(condition, audiencesMap);
+    }
+
+    default 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();
+    }
+
+    default 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 "";
+        }
+    }
+
+    default 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();
+    }
+
+    default 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();
+    }
+}