refactor layerId property of FeatureFlag class to rolloutId (#134)

* change JSON parsing to look for "rolloutId" instead of "layerId"

Author: wangjoshuah

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

@@ -31,20 +31,20 @@ public class FeatureFlag implements IdKeyMapped{
 
     private final String id;
     private final String key;
-    private final String layerId;
+    private final String rolloutId;
     private final List<String> experimentIds;
     private final List<LiveVariable> variables;
     private final Map<String, LiveVariable> variableKeyToLiveVariableMap;
 
     @JsonCreator
     public FeatureFlag(@JsonProperty("id") String id,
                        @JsonProperty("key") String key,
-                       @JsonProperty("layerId") String layerId,
+                       @JsonProperty("rolloutId") String rolloutId,
                        @JsonProperty("experimentIds") List<String> experimentIds,
                        @JsonProperty("variables") List<LiveVariable> variables) {
         this.id = id;
         this.key = key;
-        this.layerId = layerId;
+        this.rolloutId = rolloutId;
         this.experimentIds = experimentIds;
         this.variables = variables;
         this.variableKeyToLiveVariableMap = ProjectConfigUtils.generateNameMapping(variables);
@@ -58,8 +58,8 @@ public String getKey() {
         return key;
     }
 
-    public String getLayerId() {
-        return layerId;
+    public String getRolloutId() {
+        return rolloutId;
     }
 
     public List<String> getExperimentIds() {
@@ -79,7 +79,7 @@ public String toString() {
         return "FeatureFlag{" +
                 "id='" + id + '\'' +
                 ", key='" + key + '\'' +
-                ", layerId='" + layerId + '\'' +
+                ", rolloutId='" + rolloutId + '\'' +
                 ", experimentIds=" + experimentIds +
                 ", variables=" + variables +
                 ", variableKeyToLiveVariableMap=" + variableKeyToLiveVariableMap +
@@ -95,7 +95,7 @@ public boolean equals(Object o) {
 
         if (!id.equals(that.id)) return false;
         if (!key.equals(that.key)) return false;
-        if (!layerId.equals(that.layerId)) return false;
+        if (!rolloutId.equals(that.rolloutId)) return false;
         if (!experimentIds.equals(that.experimentIds)) return false;
         if (!variables.equals(that.variables)) return false;
         return variableKeyToLiveVariableMap.equals(that.variableKeyToLiveVariableMap);
@@ -105,7 +105,7 @@ public boolean equals(Object o) {
     public int hashCode() {
         int result = id.hashCode();
         result = 31 * result + key.hashCode();
-        result = 31 * result + layerId.hashCode();
+        result = 31 * result + rolloutId.hashCode();
         result = 31 * result + experimentIds.hashCode();
         result = 31 * result + variables.hashCode();
         result = 31 * result + variableKeyToLiveVariableMap.hashCode();

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

@@ -125,7 +125,7 @@ static Experiment parseExperiment(JsonObject experimentJson, JsonDeserialization
     static FeatureFlag parseFeatureFlag(JsonObject featureFlagJson, JsonDeserializationContext context) {
         String id = featureFlagJson.get("id").getAsString();
         String key = featureFlagJson.get("key").getAsString();
-        String layerId = featureFlagJson.get("layerId").getAsString();
+        String layerId = featureFlagJson.get("rolloutId").getAsString();
 
         JsonArray experimentIdsJson = featureFlagJson.getAsJsonArray("experimentIds");
         List<String> experimentIds = new ArrayList<String>();

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

@@ -157,7 +157,7 @@ private List<FeatureFlag> parseFeatureFlags(JSONArray featureFlagJson) {
             JSONObject featureFlagObject = (JSONObject) obj;
             String id = featureFlagObject.getString("id");
             String key = featureFlagObject.getString("key");
-            String layerId = featureFlagObject.getString("layerId");
+            String layerId = featureFlagObject.getString("rolloutId");
 
             List<String> experimentIds = parseExperimentIds(featureFlagObject.getJSONArray("experimentIds"));
 

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

@@ -161,7 +161,7 @@ private List<FeatureFlag> parseFeatureFlags(JSONArray featureFlagJson) {
             JSONObject featureFlagObject = (JSONObject)obj;
             String id = (String)featureFlagObject.get("id");
             String key = (String)featureFlagObject.get("key");
-            String layerId = (String)featureFlagObject.get("layerId");
+            String layerId = (String)featureFlagObject.get("rolloutId");
 
             JSONArray experimentIdsJsonArray = (JSONArray)featureFlagObject.get("experimentIds");
             List<String> experimentIds = parseExperimentIds(experimentIdsJsonArray);

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

@@ -374,14 +374,14 @@
     {
       "id": "4195505407",
       "key": "boolean_feature",
-      "layerId": "",
+      "rolloutId": "",
       "experimentIds": [],
       "variables": []
     },
     {
       "id": "3926744821",
       "key": "double_single_variable_feature",
-      "layerId": "",
+      "rolloutId": "",
       "experimentIds": [],
       "variables": [
         {
@@ -395,7 +395,7 @@
     {
       "id": "3281420120",
       "key": "integer_single_variable_feature",
-      "layerId": "",
+      "rolloutId": "",
       "experimentIds": [],
       "variables": [
         {
@@ -409,7 +409,7 @@
     {
       "id": "2591051011",
       "key": "boolean_single_variable_feature",
-      "layerId": "",
+      "rolloutId": "",
       "experimentIds": [],
       "variables": [
         {
@@ -423,7 +423,7 @@
     {
       "id": "2079378557",
       "key": "string_single_variable_feature",
-      "layerId": "",
+      "rolloutId": "",
       "experimentIds": [],
       "variables": [
         {
@@ -437,7 +437,7 @@
     {
       "id": "3263342226",
       "key": "multi_variate_feature",
-      "layerId": "",
+      "rolloutId": "",
       "experimentIds": ["3262035800"],
       "variables": [
         {
@@ -457,7 +457,7 @@
     {
       "id": "3263342226",
       "key": "mutex_group_feature",
-      "layerId": "",
+      "rolloutId": "",
       "experimentIds": ["4138322202", "1786133852"],
       "variables": [
         {