change typedAudiences.conditions to be non-string encoded but still support audience.conditions as a string (#229)

Author: thomaszurkan-optimizely

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

@@ -50,7 +50,10 @@ public Audience deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
  String id = jsonObject.get("id").getAsString();
  String name = jsonObject.get("name").getAsString();
 
- JsonElement conditionsElement = parser.parse(jsonObject.get("conditions").getAsString());
+ JsonElement conditionsElement = jsonObject.get("conditions");
+ if (!conditionsElement.isJsonArray()) {
+ conditionsElement = parser.parse(jsonObject.get("conditions").getAsString());
+ }
  List<Object> rawObjectList = gson.fromJson(conditionsElement, List.class);
  Condition conditions = parseConditions(rawObjectList);
 

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

@@ -48,9 +48,11 @@ public Audience deserialize(JsonParser parser, DeserializationContext context) t
  String id = node.get("id").textValue();
  String name = node.get("name").textValue();
 
- String conditionsJson = node.get("conditions").textValue();
- JsonNode conditionsTree = objectMapper.readTree(conditionsJson);
- Condition conditions = parseConditions(conditionsTree);
+ JsonNode conditionsJson = node.get("conditions");
+ if (conditionsJson.isTextual()) {
+ conditionsJson = objectMapper.readTree(conditionsJson.textValue());
+ }
+ Condition conditions = parseConditions(conditionsJson);
 
  return new Audience(id, name, conditions);
  }

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

@@ -281,9 +281,12 @@ private List<Audience> parseAudiences(JSONArray audienceJson) {
  JSONObject audienceObject = (JSONObject)obj;
  String id = audienceObject.getString("id");
  String key = audienceObject.getString("name");
- String conditionString = audienceObject.getString("conditions");
+ Object conditionsObject = audienceObject.get("conditions");
+ // audience.conditions will still be a string and is parsed here.
+ // typedAudiences.conditions is not a string and is also parsed here.
+ JSONArray conditionJson = (conditionsObject instanceof String) ?
+ new JSONArray((String)conditionsObject) : (JSONArray)conditionsObject;
 
- JSONArray conditionJson = new JSONArray(conditionString);
  Condition conditions = parseConditions(conditionJson);
  audiences.add(new Audience(id, key, conditions));
  }

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

@@ -289,9 +289,11 @@ private List<Audience> parseAudiences(JSONArray audienceJson) throws ParseExcept
  JSONObject audienceObject = (JSONObject)obj;
  String id = (String)audienceObject.get("id");
  String key = (String)audienceObject.get("name");
- String conditionString = (String)audienceObject.get("conditions");
-
- JSONArray conditionJson = (JSONArray)parser.parse(conditionString);
+ Object conditionObject = audienceObject.get("conditions");
+ // typedAudiences.conditions is a array.
+ // audience.conditions is a string.
+ JSONArray conditionJson = conditionObject instanceof String ?
+ (JSONArray)parser.parse((String)conditionObject) : (JSONArray)conditionObject;
  Condition conditions = parseConditions(conditionJson);
  audiences.add(new Audience(id, key, conditions));
  }

core-api/src/test/resources/config/valid-project-config-v4.json

@@ -31,37 +31,37 @@
  {
  "id": "3468206643",
  "name": "BOOL",
- "conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"booleanKey\", \"type\": \"custom_attribute\", \"match\":\"exact\", \"value\":true}]]]"
+ "conditions": ["and", ["or", ["or", {"name": "booleanKey", "type": "custom_attribute", "match":"exact", "value":true}]]]
  },
  {
  "id": "3468206644",
  "name": "INT",
- "conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"integerKey\", \"type\": \"custom_attribute\", \"match\":\"gt\", \"value\":1.0}]]]"
+ "conditions": ["and", ["or", ["or", {"name": "integerKey", "type": "custom_attribute", "match":"gt", "value":1.0}]]]
  },
  {
  "id": "3468206645",
  "name": "DOUBLE",
- "conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"doubleKey\", \"type\": \"custom_attribute\", \"match\":\"lt\", \"value\":100.0}]]]"
+ "conditions": ["and", ["or", ["or", {"name": "doubleKey", "type": "custom_attribute", "match":"lt", "value":100.0}]]]
  },
  {
  "id": "3468206642",
  "name": "Gryffindors",
- "conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"house\", \"type\": \"custom_attribute\", \"match\":\"exact\", \"value\":\"Gryffindor\"}]]]"
+ "conditions": ["and", ["or", ["or", {"name": "house", "type": "custom_attribute", "match":"exact", "value":"Gryffindor"}]]]
  },
  {
  "id": "3988293898",
  "name": "Slytherins",
- "conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"house\", \"type\": \"custom_attribute\", \"match\":\"substring\", \"value\":\"Slytherin\"}]]]"
+ "conditions": ["and", ["or", ["or", {"name": "house", "type": "custom_attribute", "match":"substring", "value":"Slytherin"}]]]
  },
  {
  "id": "4194404272",
  "name": "english_citizens",
- "conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"nationality\", \"type\": \"custom_attribute\", \"match\":\"exact\", \"value\":\"English\"}]]]"
+ "conditions": ["and", ["or", ["or", {"name": "nationality", "type": "custom_attribute", "match":"exact", "value":"English"}]]]
  },
  {
  "id": "2196265320",
  "name": "audience_with_missing_value",
- "conditions": "[\"and\", [\"or\", [\"or\", {\"name\": \"nationality\", \"type\": \"custom_attribute\", \"value\": \"English\"}, {\"name\": \"nationality\", \"type\": \"custom_attribute\"}]]]"
+ "conditions": ["and", ["or", ["or", {"name": "nationality", "type": "custom_attribute", "value": "English"}, {"name": "nationality", "type": "custom_attribute"}]]]
  }
  ],
  "attributes": [