[JAVA] Replace LiveVariables with Features in Project Config

wangjoshuah · wangjoshuah · commit 2e97b6cfd19c · 2017-06-14T14:21:33.000-07:00
Summary: revise ProjectConfig.java to retain features at project level instead of LiveVariables Test Plan: none this is just a conceptual diff that will be part of a larger diff D16323 Reviewers: #oasis_team_review, ali, mike.ng JIRA Issues: OASIS-1382 Differential Revision: https://phabricator.optimizely.com/D16340
diff --git a/core-api/src/main/java/com/optimizely/ab/config/ProjectConfig.java b/core-api/src/main/java/com/optimizely/ab/config/ProjectConfig.java
@@ -62,17 +62,16 @@ public String toString() {
     private final List<Attribute> attributes;
     private final List<EventType> events;
     private final List<Audience> audiences;
-    private final List<LiveVariable> liveVariables;
+    private final List<Feature> features;
 
     // convenience mappings for efficient lookup
     private final Map<String, Experiment> experimentKeyMapping;
     private final Map<String, Attribute> attributeKeyMapping;
-    private final Map<String, LiveVariable> liveVariableKeyMapping;
+    private final Map<String, Feature> featureKeyMapping;
     private final Map<String, EventType> eventNameMapping;
     private final Map<String, Audience> audienceIdMapping;
     private final Map<String, Experiment> experimentIdMapping;
     private final Map<String, Group> groupIdMapping;
-    private final Map<String, List<Experiment>> liveVariableIdToExperimentsMapping;
     private final Map<String, Map<String, LiveVariableUsageInstance>> variationToLiveVariableUsageInstanceMapping;
 
     public ProjectConfig(String accountId, String projectId, String version, String revision, List<Group> groups,
@@ -84,7 +83,7 @@ public ProjectConfig(String accountId, String projectId, String version, String
 
     public ProjectConfig(String accountId, String projectId, String version, String revision, List<Group> groups,
                          List<Experiment> experiments, List<Attribute> attributes, List<EventType> eventType,
-                         List<Audience> audiences, boolean anonymizeIP, List<LiveVariable> liveVariables) {
+                         List<Audience> audiences, boolean anonymizeIP, List<Feature> features) {
 
         this.accountId = accountId;
         this.projectId = projectId;
@@ -111,16 +110,13 @@ public ProjectConfig(String accountId, String projectId, String version, String
         this.experimentIdMapping = ProjectConfigUtils.generateIdMapping(this.experiments);
         this.groupIdMapping = ProjectConfigUtils.generateIdMapping(groups);
 
-        if (liveVariables == null) {
-            this.liveVariables = null;
-            this.liveVariableKeyMapping = Collections.emptyMap();
-            this.liveVariableIdToExperimentsMapping = Collections.emptyMap();
+        if (features == null) {
+            this.features = null;
+            this.featureKeyMapping = Collections.emptyMap();
             this.variationToLiveVariableUsageInstanceMapping = Collections.emptyMap();
         } else {
-            this.liveVariables = Collections.unmodifiableList(liveVariables);
-            this.liveVariableKeyMapping = ProjectConfigUtils.generateNameMapping(this.liveVariables);
-            this.liveVariableIdToExperimentsMapping =
-                    ProjectConfigUtils.generateLiveVariableIdToExperimentsMapping(this.experiments);
+            this.features = Collections.unmodifiableList(features);
+            this.featureKeyMapping = ProjectConfigUtils.generateNameMapping(this.features);
             this.variationToLiveVariableUsageInstanceMapping =
                     ProjectConfigUtils.generateVariationToLiveVariableUsageInstancesMap(this.experiments);
         }
@@ -196,8 +192,8 @@ public Condition getAudienceConditionsFromId(String audienceId) {
         return audience != null ? audience.getConditions() : null;
     }
 
-    public List<LiveVariable> getLiveVariables() {
-        return liveVariables;
+    public List<Feature> getFeatures() {
+        return features;
     }
 
     public Map<String, Experiment> getExperimentKeyMapping() {
@@ -224,12 +220,8 @@ public Map<String, Group> getGroupIdMapping() {
         return groupIdMapping;
     }
 
-    public Map<String, LiveVariable> getLiveVariableKeyMapping() {
-        return liveVariableKeyMapping;
-    }
-
-    public Map<String, List<Experiment>> getLiveVariableIdToExperimentsMapping() {
-        return liveVariableIdToExperimentsMapping;
+    public Map<String, Feature> getFeatureKeyMapping() {
+        return featureKeyMapping;
     }
 
     public Map<String, Map<String, LiveVariableUsageInstance>> getVariationToLiveVariableUsageInstanceMapping() {
@@ -243,21 +235,20 @@ public String toString() {
                 ", projectId='" + projectId + '\'' +
                 ", revision='" + revision + '\'' +
                 ", version='" + version + '\'' +
-                ", anonymizeIP='" + anonymizeIP + '\'' +
+                ", anonymizeIP=" + anonymizeIP +
                 ", groups=" + groups +
                 ", experiments=" + experiments +
                 ", attributes=" + attributes +
                 ", events=" + events +
                 ", audiences=" + audiences +
-                ", liveVariables=" + liveVariables +
+                ", features=" + features +
                 ", experimentKeyMapping=" + experimentKeyMapping +
                 ", attributeKeyMapping=" + attributeKeyMapping +
-                ", liveVariableKeyMapping=" + liveVariableKeyMapping +
+                ", featureKeyMapping=" + featureKeyMapping +
                 ", eventNameMapping=" + eventNameMapping +
                 ", audienceIdMapping=" + audienceIdMapping +
                 ", experimentIdMapping=" + experimentIdMapping +
                 ", groupIdMapping=" + groupIdMapping +
-                ", liveVariableIdToExperimentsMapping=" + liveVariableIdToExperimentsMapping +
                 ", variationToLiveVariableUsageInstanceMapping=" + variationToLiveVariableUsageInstanceMapping +
                 '}';
     }
diff --git a/core-api/src/main/java/com/optimizely/ab/config/ProjectConfigUtils.java b/core-api/src/main/java/com/optimizely/ab/config/ProjectConfigUtils.java
@@ -48,36 +48,6 @@ public static <T extends IdMapped> Map<String, T> generateIdMapping(List<T> name
         return Collections.unmodifiableMap(nameMapping);
     }
 
-    /**
-     * Helper method to create a map from a live variable to all the experiments using it
-     */
-    public static Map<String, List<Experiment>> generateLiveVariableIdToExperimentsMapping(
-            List<Experiment> experiments) {
-
-        Map<String, List<Experiment>> variableIdToExperiments =
-                new HashMap<String, List<Experiment>>();
-        for (Experiment experiment : experiments) {
-            if (!experiment.getVariations().isEmpty()) {
-                // if a live variable is used by an experiment, it will have instances in all variations so we can
-                // short-circuit after getting the live variables for the first variation
-                Variation variation = experiment.getVariations().get(0);
-                if (variation.getLiveVariableUsageInstances() != null) {
-                    for (LiveVariableUsageInstance usageInstance : variation.getLiveVariableUsageInstances()) {
-                        List<Experiment> experimentsUsingVariable = variableIdToExperiments.get(usageInstance.getId());
-                        if (experimentsUsingVariable == null) {
-                            experimentsUsingVariable = new ArrayList<Experiment>();
-                        }
-
-                        experimentsUsingVariable.add(experiment);
-                        variableIdToExperiments.put(usageInstance.getId(), experimentsUsingVariable);
-                    }
-                }
-            }
-        }
-
-        return variableIdToExperiments;
-    }
-
     /**
      * Helper method to create a map from variation ID to variable ID to {@link LiveVariableUsageInstance}
      */
