Skip to content

Refact: Removed usage of stream from optimizelyConfig service to support android api 21 and 22 #357

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
Jan 30, 2020
Merged

Refact: Removed usage of stream from optimizelyConfig service to support android api 21 and 22 #357

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85884f8
removed lambda expressions to support android api 21 and 22
mnoman09 Jan 29, 2020
385dbb7
Merge branch 'master' into mnoman/refact-OptlyConfig
mnoman09 Jan 29, 2020
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
129 changes: 81 additions & 48 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 @@ -18,8 +18,6 @@
import com.optimizely.ab.annotations.VisibleForTesting;
import com.optimizely.ab.config.*;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;

public class OptimizelyConfigService {

Expand Down Expand Up @@ -56,7 +54,11 @@ Map<String, List<FeatureVariable>> generateFeatureKeyToVariablesMap() {
if (featureFlags == null) {
return Collections.emptyMap();
}
return featureFlags.stream().collect(Collectors.toMap(FeatureFlag::getKey, featureFlag -> featureFlag.getVariables()));
Map<String, List<FeatureVariable>> featureVariableIdMap = new HashMap<>();
for (FeatureFlag featureFlag : featureFlags) {
featureVariableIdMap.put(featureFlag.getKey(), featureFlag.getVariables());
}
return featureVariableIdMap;
}

@VisibleForTesting
Expand All @@ -68,28 +70,36 @@ String getExperimentFeatureKey(String experimentId) {
@VisibleForTesting
Map<String, OptimizelyExperiment> getExperimentsMap() {
List<Experiment> experiments = projectConfig.getExperiments();
if(experiments == null) {
if (experiments == null) {
return Collections.emptyMap();
}
return experiments.stream().collect(Collectors.toMap(Experiment::getKey, experiment -> new OptimizelyExperiment(
experiment.getId(),
experiment.getKey(),
getVariationsMap(experiment.getVariations(), experiment.getId())
)));
Map<String, OptimizelyExperiment> featureExperimentMap = new HashMap<>();
for (Experiment experiment : experiments) {
featureExperimentMap.put(experiment.getKey(), new OptimizelyExperiment(
experiment.getId(),
experiment.getKey(),
getVariationsMap(experiment.getVariations(), experiment.getId())
));
}
return featureExperimentMap;
Copy link
Contributor

Choose a reason for hiding this comment

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

"featureExperimentMap" can mislead. Change it to "experimentsMap" or "experimentKeyMap"

}

@VisibleForTesting
Map<String, OptimizelyVariation> getVariationsMap(List<Variation> variations, String experimentId) {
if(variations == null) {
if (variations == null) {
return Collections.emptyMap();
}
Boolean isFeatureExperiment = this.getExperimentFeatureKey(experimentId) != null;
return variations.stream().collect(Collectors.toMap(Variation::getKey, variation -> new OptimizelyVariation(
variation.getId(),
variation.getKey(),
isFeatureExperiment ? variation.getFeatureEnabled() : null,
getMergedVariablesMap(variation, experimentId)
)));
Map<String, OptimizelyVariation> variationKeyMap = new HashMap<>();
for (Variation variation : variations) {
variationKeyMap.put(variation.getKey(), new OptimizelyVariation(
variation.getId(),
variation.getKey(),
isFeatureExperiment ? variation.getFeatureEnabled() : null,
getMergedVariablesMap(variation, experimentId)
));
}
return variationKeyMap;
}

/**
Expand All @@ -115,43 +125,58 @@ Map<String, OptimizelyVariable> getMergedVariablesMap(Variation variation, Strin
return Collections.emptyMap();
}

return featureVariables.stream().collect(Collectors.toMap(FeatureVariable::getKey, featureVariable -> new OptimizelyVariable(
featureVariable.getId(),
featureVariable.getKey(),
featureVariable.getType().getVariableType().toLowerCase(),
variation.getFeatureEnabled() && tempVariableIdMap.get(featureVariable.getId()) != null
? tempVariableIdMap.get(featureVariable.getId()).getValue()
: featureVariable.getDefaultValue()
)));
Map<String, OptimizelyVariable> featureVariableKeyMap = new HashMap<>();
for (FeatureVariable featureVariable : featureVariables) {
featureVariableKeyMap.put(featureVariable.getKey(), new OptimizelyVariable(
featureVariable.getId(),
featureVariable.getKey(),
featureVariable.getType().getVariableType().toLowerCase(),
variation.getFeatureEnabled() && tempVariableIdMap.get(featureVariable.getId()) != null
? tempVariableIdMap.get(featureVariable.getId()).getValue()
: featureVariable.getDefaultValue()
));
}
return featureVariableKeyMap;
}
return Collections.emptyMap();
}

@VisibleForTesting
Map<String, OptimizelyVariable> getFeatureVariableUsageInstanceMap(List<FeatureVariableUsageInstance> featureVariableUsageInstances) {
if(featureVariableUsageInstances == null) {
if (featureVariableUsageInstances == null) {
return Collections.emptyMap();
}
return featureVariableUsageInstances.stream().collect(Collectors.toMap(FeatureVariableUsageInstance::getId, variable -> new OptimizelyVariable(
variable.getId(),
null,
null,
variable.getValue()
)));

Map<String, OptimizelyVariable> featureVariableIdMap = new HashMap<>();
for (FeatureVariableUsageInstance featureVariableUsageInstance : featureVariableUsageInstances) {
featureVariableIdMap.put(featureVariableUsageInstance.getId(), new OptimizelyVariable(
featureVariableUsageInstance.getId(),
null,
null,
featureVariableUsageInstance.getValue()
));
}

return featureVariableIdMap;
}

@VisibleForTesting
Map<String, OptimizelyFeature> getFeaturesMap(Map<String, OptimizelyExperiment> allExperimentsMap) {
List<FeatureFlag> featureFlags = projectConfig.getFeatureFlags();
if(featureFlags == null) {
if (featureFlags == null) {
return Collections.emptyMap();
}
return featureFlags.stream().collect(Collectors.toMap(FeatureFlag::getKey, featureFlag -> new OptimizelyFeature(
featureFlag.getId(),
featureFlag.getKey(),
getExperimentsMapForFeature(featureFlag.getExperimentIds(), allExperimentsMap),
getFeatureVariablesMap(featureFlag.getVariables())
)));

Map<String, OptimizelyFeature> optimizelyFeatureKeyMap = new HashMap<>();
for (FeatureFlag featureFlag : featureFlags) {
optimizelyFeatureKeyMap.put(featureFlag.getKey(), new OptimizelyFeature(
featureFlag.getId(),
featureFlag.getKey(),
getExperimentsMapForFeature(featureFlag.getExperimentIds(), allExperimentsMap),
getFeatureVariablesMap(featureFlag.getVariables())
));
}
return optimizelyFeatureKeyMap;
}

@VisibleForTesting
Expand All @@ -160,23 +185,31 @@ Map<String, OptimizelyExperiment> getExperimentsMapForFeature(List<String> exper
return Collections.emptyMap();
}

List<String> experimentKeys = experimentIds.stream()
.map(experimentId -> projectConfig.getExperimentIdMapping().get(experimentId).getKey())
.collect(Collectors.toList());
Map<String, OptimizelyExperiment> optimizelyExperimentKeyMap = new HashMap<>();
for (String experimentId : experimentIds) {
String experimentKey = projectConfig.getExperimentIdMapping().get(experimentId).getKey();
optimizelyExperimentKeyMap.put(experimentKey, allExperimentsMap.get(experimentKey));
}

return experimentKeys.stream().collect(Collectors.toMap(Function.identity(), key -> allExperimentsMap.get(key)));
return optimizelyExperimentKeyMap;
}

@VisibleForTesting
Map<String, OptimizelyVariable> getFeatureVariablesMap(List<FeatureVariable> featureVariables) {
if (featureVariables == null) {
return Collections.emptyMap();
}
return featureVariables.stream().collect(Collectors.toMap(FeatureVariable::getKey, featureVariable -> new OptimizelyVariable(
featureVariable.getId(),
featureVariable.getKey(),
featureVariable.getType().getVariableType().toLowerCase(),
featureVariable.getDefaultValue()
)));

Map<String, OptimizelyVariable> featureVariableKeyMap = new HashMap<>();
for (FeatureVariable featureVariable : featureVariables) {
featureVariableKeyMap.put(featureVariable.getKey(), new OptimizelyVariable(
featureVariable.getId(),
featureVariable.getKey(),
featureVariable.getType().getVariableType().toLowerCase(),
featureVariable.getDefaultValue()
));
}

return featureVariableKeyMap;
}
}