Skip to content

Commit 079b0d7

Browse files
committed
get rid of magic numbers
1 parent ff3e25e commit 079b0d7

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
7272

7373
boolean anonymizeIP = false;
7474
List<LiveVariable> liveVariables = null;
75-
if (datafileVersion >= 3) {
75+
if (datafileVersion >= Integer.parseInt(ProjectConfig.Version.V3.toString())) {
7676
liveVariables = parseLiveVariables(rootObject.getJSONArray("variables"));
7777

7878
anonymizeIP = rootObject.getBoolean("anonymizeIP");
7979
}
8080

8181
List<FeatureFlag> featureFlags = null;
82-
if (datafileVersion >= 4) {
82+
if (datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString())) {
8383
featureFlags = parseFeatureFlags(rootObject.getJSONArray("featureFlags"));
8484
}
8585

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
7474

7575
boolean anonymizeIP = false;
7676
List<LiveVariable> liveVariables = null;
77-
if (datafileVersion >= 3) {
77+
if (datafileVersion >= Integer.parseInt(ProjectConfig.Version.V3.toString())) {
7878
liveVariables = parseLiveVariables((JSONArray)rootObject.get("variables"));
7979

8080
anonymizeIP = (Boolean)rootObject.get("anonymizeIP");
8181
}
8282

8383
List<FeatureFlag> featureFlags = null;
84-
if (datafileVersion >= 4) {
84+
if (datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString())) {
8585
featureFlags = parseFeatureFlags((JSONArray) rootObject.get("featureFlags"));
8686
}
8787

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
7272
boolean anonymizeIP = false;
7373
// live variables should be null if using V2
7474
List<LiveVariable> liveVariables = null;
75-
if (datafileVersion >= 3) {
75+
if (datafileVersion >= Integer.parseInt(ProjectConfig.Version.V3.toString())) {
7676
Type liveVariablesType = new TypeToken<List<LiveVariable>>() {}.getType();
7777
liveVariables = context.deserialize(jsonObject.getAsJsonArray("variables"), liveVariablesType);
7878

7979
anonymizeIP = jsonObject.get("anonymizeIP").getAsBoolean();
8080
}
8181

8282
List<FeatureFlag> featureFlags = null;
83-
if (datafileVersion >= 4) {
83+
if (datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString())) {
8484
Type featureFlagsType = new TypeToken<List<FeatureFlag>>() {}.getType();
8585
featureFlags = context.deserialize(jsonObject.getAsJsonArray("featureFlags"), featureFlagsType);
8686
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,14 @@ public ProjectConfig deserialize(JsonParser parser, DeserializationContext conte
6767

6868
boolean anonymizeIP = false;
6969
List<LiveVariable> liveVariables = null;
70-
if (datafileVersion >= 3) {
70+
if (datafileVersion >= Integer.parseInt(ProjectConfig.Version.V3.toString())) {
7171
liveVariables = mapper.readValue(node.get("variables").toString(),
7272
new TypeReference<List<LiveVariable>>() {});
7373
anonymizeIP = node.get("anonymizeIP").asBoolean();
7474
}
7575

7676
List<FeatureFlag> featureFlags = null;
77-
if (datafileVersion >= 4) {
77+
if (datafileVersion >= Integer.parseInt(ProjectConfig.Version.V4.toString())) {
7878
featureFlags = mapper.readValue(node.get("featureFlags").toString(),
7979
new TypeReference<List<FeatureFlag>>() {});
8080
}

0 commit comments

Comments
 (0)