Audiences, Attributes and Events implementation

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

@@ -18,12 +18,12 @@
 
 import com.fasterxml.jackson.annotation.*;
 import com.optimizely.ab.annotations.VisibleForTesting;
-import com.optimizely.ab.config.audience.AudienceIdCondition;
-import com.optimizely.ab.config.audience.Condition;
+import com.optimizely.ab.config.audience.*;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -44,7 +44,7 @@ public class Experiment implements IdKeyMapped {
     private final String groupId;
 
     private final List<String> audienceIds;
-    private final Condition<AudienceIdCondition> audienceConditions;
+    private final Condition audienceConditions;
     private final List<Variation> variations;
     private final List<TrafficAllocation> trafficAllocation;
 
@@ -173,6 +173,103 @@ public boolean isLaunched() {
         return status.equals(ExperimentStatus.LAUNCHED.toString());
     }
 
+    public String serializeConditions(Map<String, String> audiencesMap) {
+
+        Condition condition = this.audienceConditions;
+
+        return this.serialize(condition, audiencesMap);
+    }
+
+    private String getNameFromAudienceId(String audienceId, Map<String, String> audiencesMap) {
+        String audienceName = audiencesMap.get(audienceId);
+        return !audienceName.isEmpty() ? "\"" + audienceName + "\"" : "\"" + audienceId + "\"";
+    }
+
+    private String getOperandOrAudienceId(Condition condition, Map<String, String> audiencesMap){
+        String operand = "";
+        if(condition != null) {
+            if (condition instanceof AndCondition) {
+                operand = "AND";
+            } else if (condition instanceof NotCondition) {
+                operand = "NOT";
+            } else if (condition instanceof OrCondition) {
+                operand = "OR";
+            } else if (condition instanceof AudienceIdCondition) {
+                String audienceName = this.getNameFromAudienceId(((AudienceIdCondition<?>) condition).getAudienceId(),
+                    audiencesMap);
+                operand = audienceName;
+            }
+        }
+        return operand;
+    }
+
+    public String serialize(Condition condition, Map<String, String> audiencesMap) {
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("");
+        List<Condition> conditions;
+
+        String operand = this.getOperandOrAudienceId(condition, audiencesMap);
+        switch(operand){
+            case("AND"):
+                conditions = ((AndCondition<?>) condition).getConditions();
+                stringBuilder.append(this.helper(operand, conditions, audiencesMap));
+                break;
+            case("OR"):
+                conditions = ((OrCondition<?>) condition).getConditions();
+                stringBuilder.append(this.helper(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 helper(String operand, List<Condition> conditions, Map<String, String> audiencesMap) {
+        StringBuilder stringBuilder = new StringBuilder();
+        int ctr = 0;
+        if(conditions.isEmpty()) {
+            return "";
+        }else if(conditions.size() == 1) {
+            return serialize(conditions.get(0), audiencesMap);
+        }
+        if(conditions.size() > 1) {
+            for (Condition con : conditions) {
+                ctr++;
+                if(ctr + 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/parser/ConditionJacksonDeserializer.java

@@ -121,9 +121,6 @@ protected static <T> Condition parseConditions(Class<T> clazz, ObjectMapper obje
             case "and":
                 condition = new AndCondition(conditions);
                 break;
-            case "or":
-                condition = new OrCondition(conditions);
-                break;
             case "not":
                 condition = new NotCondition(conditions.isEmpty() ? new NullCondition() : conditions.get(0));
                 break;

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

@@ -142,6 +142,7 @@ private List<Experiment> parseExperiments(JSONArray experimentJson, String group
             }
 
             Condition conditions = null;
+
             if (experimentObject.has("audienceConditions")) {
                 Object jsonCondition = experimentObject.get("audienceConditions");
                 conditions = ConditionUtils.<AudienceIdCondition>parseConditions(AudienceIdCondition.class, jsonCondition);

core-api/src/main/java/com/optimizely/ab/internal/ConditionUtils.java

@@ -147,23 +147,7 @@ static public <T> Condition parseConditions(Class<T> clazz, List<Object> rawObje
             conditions.add(parseConditions(clazz, obj));
         }
 
-        Condition condition;
-        switch (operand) {
-            case "and":
-                condition = new AndCondition(conditions);
-                break;
-            case "or":
-                condition = new OrCondition(conditions);
-                break;
-            case "not":
-                condition = new NotCondition(conditions.isEmpty() ? new NullCondition() : conditions.get(0));
-                break;
-            default:
-                condition = new OrCondition(conditions);
-                break;
-        }
-
-        return condition;
+        return buildCondition(operand, conditions);
     }
 
     static public String operand(Object object) {
@@ -210,14 +194,15 @@ static public <T> Condition parseConditions(Class<T> clazz, org.json.JSONArray c
             conditions.add(parseConditions(clazz, obj));
         }
 
+        return buildCondition(operand, conditions);
+    }
+
+    private static Condition buildCondition(String operand, List<Condition> conditions) {
         Condition condition;
         switch (operand) {
             case "and":
                 condition = new AndCondition(conditions);
                 break;
-            case "or":
-                condition = new OrCondition(conditions);
-                break;
             case "not":
                 condition = new NotCondition(conditions.isEmpty() ? new NullCondition() : conditions.get(0));
                 break;

core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyAttribute.java

@@ -0,0 +1,53 @@
+/****************************************************************************
+ * Copyright 2021, 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.optimizelyconfig;
+
+import com.optimizely.ab.config.IdKeyMapped;
+
+/**
+ * Represents the Attribute's map {@link OptimizelyConfig}
+ */
+public class OptimizelyAttribute  implements IdKeyMapped {
+
+    private String id;
+    private String key;
+
+    public OptimizelyAttribute(String id,
+                               String key) {
+        this.id = id;
+        this.key = key;
+    }
+
+    public String getId() { return id; }
+
+    public String getKey() { return key; }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null || getClass() != obj.getClass()) return false;
+        if (obj == this) return true;
+        OptimizelyAttribute optimizelyAttribute = (OptimizelyAttribute) obj;
+        return id.equals(optimizelyAttribute.getId()) &&
+            key.equals(optimizelyAttribute.getKey());
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = id.hashCode();
+        hash = 31 * hash + key.hashCode();
+        return hash;
+    }
+}

core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyAudience.java

@@ -0,0 +1,65 @@
+/****************************************************************************
+ * Copyright 2021, 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.optimizelyconfig;
+
+import com.optimizely.ab.config.IdKeyMapped;
+import com.optimizely.ab.config.audience.Condition;
+
+import java.util.List;
+
+/**
+ * Represents the Audiences list {@link OptimizelyConfig}
+ */
+public class OptimizelyAudience implements IdKeyMapped{
+
+    private String id;
+    private String name;
+    private String conditions;
+
+    public OptimizelyAudience(String id,
+                              String name,
+                              String conditions) {
+        this.id = id;
+        this.name = name;
+        this.conditions = conditions;
+    }
+
+    public String getId() { return id; }
+
+    public String getName() { return name; }
+
+    public String getKey() { return name; }
+
+    public String getConditions() { return conditions; }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null || getClass() != obj.getClass()) return false;
+        if (obj == this) return true;
+        OptimizelyAudience optimizelyAudience = (OptimizelyAudience) obj;
+        return id.equals(optimizelyAudience.getId()) &&
+            name.equals(optimizelyAudience.getKey()) &&
+            conditions.equals(optimizelyAudience.getConditions());
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = id.hashCode();
+        hash = 31 * hash + conditions.hashCode();
+        return hash;
+    }
+
+}

core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfig.java

@@ -17,6 +17,8 @@
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.optimizely.ab.config.Attribute;
+import com.optimizely.ab.config.EventType;
 
 import java.util.*;
 
@@ -28,6 +30,9 @@ public class OptimizelyConfig {
 
     private Map<String, OptimizelyExperiment> experimentsMap;
     private Map<String, OptimizelyFeature> featuresMap;
+    private List<OptimizelyAttribute> attributes;
+    private List<OptimizelyEvent> events;
+    private List<OptimizelyAudience> audiences;
     private String revision;
     private String sdkKey;
     private String environmentKey;
@@ -53,6 +58,35 @@ public OptimizelyConfig(Map<String, OptimizelyExperiment> experimentsMap,
         this.datafile = datafile;
     }
 
+    public OptimizelyConfig(Map<String, OptimizelyExperiment> experimentsMap,
+                            Map<String, OptimizelyFeature> featuresMap,
+                            String revision, String sdkKey, String environmentKey,
+                            List<OptimizelyAttribute> attributes,
+                            List<OptimizelyEvent> events,
+                            List<OptimizelyAudience> audiences) {
+        this(experimentsMap, featuresMap, revision, sdkKey, environmentKey, attributes, events, audiences, null);
+    }
+
+    public OptimizelyConfig(Map<String, OptimizelyExperiment> experimentsMap,
+                            Map<String, OptimizelyFeature> featuresMap,
+                            String revision,
+                            String sdkKey,
+                            String environmentKey,
+                            List<OptimizelyAttribute> attributes,
+                            List<OptimizelyEvent> events,
+                            List<OptimizelyAudience> audiences,
+                            String datafile) {
+        this.experimentsMap = experimentsMap;
+        this.featuresMap = featuresMap;
+        this.revision = revision;
+        this.sdkKey = sdkKey;
+        this.environmentKey = environmentKey;
+        this.attributes = attributes;
+        this.events = events;
+        this.audiences = audiences;
+        this.datafile = datafile;
+    }
+
     public Map<String, OptimizelyExperiment> getExperimentsMap() {
         return experimentsMap;
     }
@@ -61,6 +95,12 @@ public Map<String, OptimizelyFeature> getFeaturesMap() {
         return featuresMap;
     }
 
+    public List<OptimizelyAttribute> getAttributes() { return attributes; }
+
+    public List<OptimizelyEvent> getEvents() { return events; }
+
+    public List<OptimizelyAudience> getAudiences() { return audiences; }
+
     public String getRevision() {
         return revision;
     }