Audiences, Attributes and Events implementation

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

@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright 2016-2019, Optimizely and contributors
+ *    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.
@@ -18,8 +18,7 @@
 
 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;
@@ -43,6 +42,10 @@ public class Experiment implements IdKeyMapped {
     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;
@@ -173,6 +176,98 @@ 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/audience/AndCondition.java

@@ -23,13 +23,15 @@
 import javax.annotation.concurrent.Immutable;
 import java.util.List;
 import java.util.Map;
+import java.util.StringJoiner;
 
 /**
  * Represents an 'And' conditions condition operation.
  */
 public class AndCondition<T> implements Condition<T> {
 
     private final List<Condition> conditions;
+    private static final String OPERAND = "AND";
 
     public AndCondition(@Nonnull List<Condition> conditions) {
         this.conditions = conditions;
@@ -67,6 +69,21 @@ public Boolean evaluate(ProjectConfig config, Map<String, ?> attributes) {
         return true; // otherwise, return true
     }
 
+    @Override
+    public String getOperandOrId() {
+        return OPERAND;
+    }
+
+    @Override
+    public String toJson() {
+        StringJoiner s = new StringJoiner(", ", "[", "]");
+        s.add("\"and\"");
+        for (int i = 0; i < conditions.size(); i++) {
+            s.add(conditions.get(i).toJson());
+        }
+        return s.toString();
+    }
+
     @Override
     public String toString() {
         StringBuilder s = new StringBuilder();

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

@@ -64,6 +64,11 @@ public String getAudienceId() {
         return audienceId;
     }
 
+    @Override
+    public String getOperandOrId() {
+        return audienceId;
+    }
+
     @Nullable
     @Override
     public Boolean evaluate(ProjectConfig config, Map<String, ?> attributes) {
@@ -101,4 +106,7 @@ public int hashCode() {
     public String toString() {
         return audienceId;
     }
+
+    @Override
+    public String toJson() { return null; }
 }

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

@@ -28,4 +28,8 @@ public interface Condition<T> {
 
     @Nullable
     Boolean evaluate(ProjectConfig config, Map<String, ?> attributes);
+
+    String toJson();
+
+    String getOperandOrId();
 }

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

@@ -27,4 +27,11 @@ public Boolean evaluate(ProjectConfig config, Map<String, ?> attributes) {
         return true;
     }
 
+    @Override
+    public String toJson() { return null; }
+
+    @Override
+    public String getOperandOrId() {
+        return null;
+    }
 }

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

@@ -23,6 +23,7 @@
 import javax.annotation.Nonnull;
 
 import java.util.Map;
+import java.util.StringJoiner;
 
 /**
  * Represents a 'Not' conditions condition operation.
@@ -31,6 +32,7 @@
 public class NotCondition<T> implements Condition<T> {
 
     private final Condition condition;
+    private static final String OPERAND = "NOT";
 
     public NotCondition(@Nonnull Condition condition) {
         this.condition = condition;
@@ -47,6 +49,19 @@ public Boolean evaluate(ProjectConfig config, Map<String, ?> attributes) {
         return (conditionEval == null ? null : !conditionEval);
     }
 
+    @Override
+    public String getOperandOrId() {
+        return OPERAND;
+    }
+
+    @Override
+    public String toJson() {
+        StringJoiner s = new StringJoiner(", ","[","]");
+        s.add("\"not\"");
+        s.add(condition.toJson());
+        return s.toString();
+    }
+
     @Override
     public String toString() {
         StringBuilder s = new StringBuilder();

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

@@ -26,4 +26,12 @@ public class NullCondition<T> implements Condition<T> {
     public Boolean evaluate(ProjectConfig config, Map<String, ?> attributes) {
         return null;
     }
+
+    @Override
+    public String toJson() { return null; }
+
+    @Override
+    public String getOperandOrId() {
+        return null;
+    }
 }

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

@@ -23,13 +23,15 @@
 import javax.annotation.concurrent.Immutable;
 import java.util.List;
 import java.util.Map;
+import java.util.StringJoiner;
 
 /**
  * Represents an 'Or' conditions condition operation.
  */
 @Immutable
 public class OrCondition<T> implements Condition<T> {
     private final List<Condition> conditions;
+    private static final String OPERAND = "OR";
 
     public OrCondition(@Nonnull List<Condition> conditions) {
         this.conditions = conditions;
@@ -65,6 +67,21 @@ public Boolean evaluate(ProjectConfig config, Map<String, ?> attributes) {
         return false;
     }
 
+    @Override
+    public String getOperandOrId() {
+        return OPERAND;
+    }
+
+    @Override
+    public String toJson() {
+        StringJoiner s = new StringJoiner(", ", "[", "]");
+        s.add("\"or\"");
+        for (int i = 0; i < conditions.size(); i++) {
+            s.add(conditions.get(i).toJson());
+        }
+        return s.toString();
+    }
+
     @Override
     public String toString() {
         StringBuilder s = new StringBuilder();

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

@@ -119,19 +119,39 @@ public Boolean evaluate(ProjectConfig config, Map<String, ?> attributes) {
     }
 
     @Override
-    public String toString() {
+    public String getOperandOrId() {
+        return null;
+    }
+
+    public String getValueStr() {
         final String valueStr;
         if (value == null) {
             valueStr = "null";
         } else if (value instanceof String) {
-            valueStr = String.format("'%s'", value);
+            valueStr = String.format("%s", value);
         } else {
             valueStr = value.toString();
         }
+        return valueStr;
+    }
+
+    @Override
+    public String toJson() {
+        StringBuilder attributes = new StringBuilder();
+        if (name != null) attributes.append("{\"name\":\"" + name + "\"");
+        if (type != null) attributes.append(", \"type\":\"" + type + "\"");
+        if (match != null) attributes.append(", \"match\":\"" + match + "\"");
+        attributes.append(", \"value\":" + ((value instanceof String) ? ("\"" + getValueStr() + "\"") : getValueStr()) + "}");
+
+        return attributes.toString();
+    }
+
+    @Override
+    public String toString() {
         return "{name='" + name + "\'" +
             ", type='" + type + "\'" +
             ", match='" + match + "\'" +
-            ", value=" + valueStr +
+            ", value=" + ((value instanceof String) ? ("'" + getValueStr() + "'") : getValueStr()) +
             "}";
     }
 

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

@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright 2018-2019, Optimizely and contributors
+ *    Copyright 2018-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.
@@ -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;