Skip to content

Create experimentRules array directly instead of from Map Values #444

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

Merged
merged 2 commits into from
Aug 25, 2021
Merged

Create experimentRules array directly instead of from Map Values #444

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aff239a
Create experimentRules array directly rather than from experimentsMap…
The-inside-man Aug 25, 2021
5dd9b4f
Additional cleanup
The-inside-man Aug 25, 2021
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
15 changes: 10 additions & 5 deletions core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfigService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public class OptimizelyConfigService {
private ProjectConfig projectConfig;
private OptimizelyConfig optimizelyConfig;
private List<OptimizelyAudience> audiences;
private List<OptimizelyExperiment> experimentRules;
private Map<String, String> audiencesMap;
private Map<String, List<FeatureVariable>> featureIdToVariablesMap = new HashMap<>();
private Map<String, OptimizelyExperiment> experimentMapByExperimentId = new HashMap<>();
Expand Down Expand Up @@ -221,10 +222,8 @@ Map<String, OptimizelyFeature> getFeaturesMap(Map<String, OptimizelyExperiment>
Map<String, OptimizelyFeature> optimizelyFeatureKeyMap = new HashMap<>();
for (FeatureFlag featureFlag : featureFlags) {
Map<String, OptimizelyExperiment> experimentsMapForFeature =
getExperimentsMapForFeature(featureFlag.getExperimentIds(), allExperimentsMap);
getExperimentsMapForFeature(featureFlag.getExperimentIds());

List<OptimizelyExperiment> experimentRules =
new ArrayList<OptimizelyExperiment>(experimentsMapForFeature.values());
List<OptimizelyExperiment> deliveryRules =
this.getDeliveryRules(featureFlag.getRolloutId(), featureFlag.getId());

Expand Down Expand Up @@ -267,17 +266,23 @@ List<OptimizelyExperiment> getDeliveryRules(String rolloutId, String featureId)
}

@VisibleForTesting
Map<String, OptimizelyExperiment> getExperimentsMapForFeature(List<String> experimentIds, Map<String, OptimizelyExperiment> allExperimentsMap) {
Map<String, OptimizelyExperiment> getExperimentsMapForFeature(List<String> experimentIds) {
if (experimentIds == null) {
return Collections.emptyMap();
}

List<OptimizelyExperiment> experimentRulesList = new ArrayList<>();

Map<String, OptimizelyExperiment> optimizelyExperimentKeyMap = new HashMap<>();
for (String experimentId : experimentIds) {
Experiment experiment = projectConfig.getExperimentIdMapping().get(experimentId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this line can be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed and checking if still passes FSC. I feel this may have been added to get around an ID issue not being present in the experimentId's list but will know after FSC runs.

optimizelyExperimentKeyMap.put(experiment.getKey(), experimentMapByExperimentId.get(experiment.getId()));
OptimizelyExperiment optimizelyExperiment = experimentMapByExperimentId.get(experiment.getId());
optimizelyExperimentKeyMap.put(experiment.getKey(), optimizelyExperiment);
experimentRulesList.add(optimizelyExperiment);
}

this.experimentRules = experimentRulesList;

return optimizelyExperimentKeyMap;
}

Expand Down
2 changes: 1 addition & 1 deletion core-api/src/test/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfigServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void testGetFeatureVariablesMap() {
public void testGetExperimentsMapForFeature() {
List<String> experimentIds = projectConfig.getFeatureFlags().get(1).getExperimentIds();
Map<String, OptimizelyExperiment> optimizelyFeatureExperimentMap =
optimizelyConfigService.getExperimentsMapForFeature(experimentIds, optimizelyConfigService.getExperimentsMap());
optimizelyConfigService.getExperimentsMapForFeature(experimentIds);
assertEquals(expectedConfig.getFeaturesMap().get("multi_variate_feature").getExperimentsMap().size(), optimizelyFeatureExperimentMap.size());
}

Expand Down