Skip to content

[AI-FSSDK] [FSSDK-12418] Remove experiment type validation from config parsing #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FarhanAnjum-opti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[AI-FSSDK] [FSSDK-12418] Remove experiment type validation from config parsing #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions core-api/src/main/java/com/optimizely/ab/config/parser/DatafileGsonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,28 +126,6 @@ public ProjectConfig deserialize(JsonElement json, Type typeOfT, JsonDeserializa
region = jsonObject.get("region").getAsString();
}

// Validate experiment types
Set<String> validExperimentTypes = new HashSet<>(Arrays.asList(
Experiment.TYPE_AB, Experiment.TYPE_MAB, Experiment.TYPE_CMAB,
Experiment.TYPE_TD, Experiment.TYPE_FR
));
for (Experiment experiment : experiments) {
if (experiment.getType() != null && !validExperimentTypes.contains(experiment.getType())) {
throw new JsonParseException(
String.format("Experiment \"%s\" has invalid type \"%s\". Valid types: %s.",
experiment.getKey(), experiment.getType(), validExperimentTypes));
}
}
for (Group group : groups) {
for (Experiment experiment : group.getExperiments()) {
if (experiment.getType() != null && !validExperimentTypes.contains(experiment.getType())) {
throw new JsonParseException(
String.format("Experiment \"%s\" has invalid type \"%s\". Valid types: %s.",
experiment.getKey(), experiment.getType(), validExperimentTypes));
}
}
}

return new DatafileProjectConfig(
accountId,
anonymizeIP,
Expand Down
22 changes: 0 additions & 22 deletions core-api/src/main/java/com/optimizely/ab/config/parser/DatafileJacksonDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,28 +100,6 @@ public DatafileProjectConfig deserialize(JsonParser parser, DeserializationConte
region = node.get("region").textValue();
}

// Validate experiment types
Set<String> validExperimentTypes = new HashSet<>(Arrays.asList(
Experiment.TYPE_AB, Experiment.TYPE_MAB, Experiment.TYPE_CMAB,
Experiment.TYPE_TD, Experiment.TYPE_FR
));
for (Experiment experiment : experiments) {
if (experiment.getType() != null && !validExperimentTypes.contains(experiment.getType())) {
throw new IOException(
String.format("Experiment \"%s\" has invalid type \"%s\". Valid types: %s.",
experiment.getKey(), experiment.getType(), validExperimentTypes));
}
}
for (Group group : groups) {
for (Experiment experiment : group.getExperiments()) {
if (experiment.getType() != null && !validExperimentTypes.contains(experiment.getType())) {
throw new IOException(
String.format("Experiment \"%s\" has invalid type \"%s\". Valid types: %s.",
experiment.getKey(), experiment.getType(), validExperimentTypes));
}
}
}

return new DatafileProjectConfig(
accountId,
anonymizeIP,
Expand Down
24 changes: 0 additions & 24 deletions core-api/src/main/java/com/optimizely/ab/config/parser/JsonConfigParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,28 +105,6 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
String regionString = rootObject.getString("region");
}

// Validate experiment types
Set<String> validExperimentTypes = new HashSet<>(Arrays.asList(
Experiment.TYPE_AB, Experiment.TYPE_MAB, Experiment.TYPE_CMAB,
Experiment.TYPE_TD, Experiment.TYPE_FR
));
for (Experiment experiment : experiments) {
if (experiment.getType() != null && !validExperimentTypes.contains(experiment.getType())) {
throw new ConfigParseException(
String.format("Experiment \"%s\" has invalid type \"%s\". Valid types: %s.",
experiment.getKey(), experiment.getType(), validExperimentTypes));
}
}
for (Group group : groups) {
for (Experiment experiment : group.getExperiments()) {
if (experiment.getType() != null && !validExperimentTypes.contains(experiment.getType())) {
throw new ConfigParseException(
String.format("Experiment \"%s\" has invalid type \"%s\". Valid types: %s.",
experiment.getKey(), experiment.getType(), validExperimentTypes));
}
}
}

return new DatafileProjectConfig(
accountId,
anonymizeIP,
Expand All @@ -149,8 +127,6 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
rollouts,
integrations
);
} catch (ConfigParseException e) {
throw e;
} catch (RuntimeException e) {
throw new ConfigParseException("Unable to parse datafile: " + json, e);
} catch (Exception e) {
Expand Down
24 changes: 0 additions & 24 deletions core-api/src/main/java/com/optimizely/ab/config/parser/JsonSimpleConfigParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,28 +108,6 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
String regionString = (String) rootObject.get("region");
}

// Validate experiment types
Set<String> validExperimentTypes = new HashSet<>(Arrays.asList(
Experiment.TYPE_AB, Experiment.TYPE_MAB, Experiment.TYPE_CMAB,
Experiment.TYPE_TD, Experiment.TYPE_FR
));
for (Experiment experiment : experiments) {
if (experiment.getType() != null && !validExperimentTypes.contains(experiment.getType())) {
throw new ConfigParseException(
String.format("Experiment \"%s\" has invalid type \"%s\". Valid types: %s.",
experiment.getKey(), experiment.getType(), validExperimentTypes));
}
}
for (Group group : groups) {
for (Experiment experiment : group.getExperiments()) {
if (experiment.getType() != null && !validExperimentTypes.contains(experiment.getType())) {
throw new ConfigParseException(
String.format("Experiment \"%s\" has invalid type \"%s\". Valid types: %s.",
experiment.getKey(), experiment.getType(), validExperimentTypes));
}
}
}

return new DatafileProjectConfig(
accountId,
anonymizeIP,
Expand All @@ -152,8 +130,6 @@ public ProjectConfig parseProjectConfig(@Nonnull String json) throws ConfigParse
rollouts,
integrations
);
} catch (ConfigParseException e) {
throw e;
} catch (RuntimeException ex) {
throw new ConfigParseException("Unable to parse datafile: " + json, ex);
} catch (Exception e) {
Expand Down
17 changes: 16 additions & 1 deletion core-api/src/test/java/com/optimizely/ab/config/FeatureRolloutConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,22 @@ public void featureRolloutWithEmptyRolloutIdDoesNotCrash() {
}

/**
* Test 6: Type field parsed - experiments with type field in the datafile
* Test 6: Unknown type accepted - experiment with type "new_unknown_type"
* does NOT cause error or rejection, and config parsing succeeds.
*/
@Test
public void unknownExperimentTypeAccepted() {
Experiment experiment = projectConfig.getExperimentKeyMapping().get("unknown_type_experiment");
assertNotNull("Experiment with unknown type should be parsed successfully", experiment);
assertEquals("new_unknown_type", experiment.getType());
assertEquals("exp_unknown_type", experiment.getId());
assertEquals("unknown_type_experiment", experiment.getKey());
assertEquals(1, experiment.getVariations().size());
assertEquals("unknown_variation", experiment.getVariations().get(0).getKey());
}

/**
* Test 7: Type field parsed - experiments with type field in the datafile
* have the value correctly preserved after config parsing.
*/
@Test
Expand Down
22 changes: 22 additions & 0 deletions core-api/src/test/resources/config/feature-rollout-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,28 @@
"endOfRange": 5000
}
]
},
{
"id": "exp_unknown_type",
"key": "unknown_type_experiment",
"status": "Running",
"layerId": "layer_5",
"audienceIds": [],
"forcedVariations": {},
"type": "new_unknown_type",
"variations": [
{
"id": "var_unknown_1",
"key": "unknown_variation",
"featureEnabled": true
}
],
"trafficAllocation": [
{
"entityId": "var_unknown_1",
"endOfRange": 10000
}
]
}
],
"featureFlags": [
Expand Down
Loading