Updated unit tests and added logs

Author: Arshadf

core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfigService.java

@@ -17,13 +17,15 @@
 
 import com.optimizely.ab.annotations.VisibleForTesting;
 import com.optimizely.ab.config.*;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class OptimizelyConfigService {
 
+    private static final Logger logger = LoggerFactory.getLogger(OptimizelyConfigService.class);
     private ProjectConfig projectConfig;
     private OptimizelyConfig optimizelyConfig;
 
@@ -34,7 +36,9 @@ public OptimizelyConfigService(ProjectConfig projectConfig) {
         this.projectConfig = projectConfig;
         this.featureKeyToVariablesMap = generateFeatureKeyToVariablesMap();
 
+        logger.info("Getting experiment map for project config");
         Map<String, OptimizelyExperiment> experimentsMap = getExperimentsMap();
+        logger.info("Creating the complete optimizely config");
         optimizelyConfig = new OptimizelyConfig(
             experimentsMap,
             getFeaturesMap(experimentsMap),
@@ -59,6 +63,7 @@ public OptimizelyConfig getConfig() {
     Map<String, List<FeatureVariable>> generateFeatureKeyToVariablesMap() {
         List<FeatureFlag> featureFlags = projectConfig.getFeatureFlags();
         if (featureFlags == null) {
+            logger.warn("Returning empty map because there are no feature flags in project config");
             return Collections.emptyMap();
         }
         return featureFlags.stream().collect(Collectors.toMap(FeatureFlag::getKey, featureFlag -> featureFlag.getVariables()));
@@ -67,13 +72,15 @@ Map<String, List<FeatureVariable>> generateFeatureKeyToVariablesMap() {
     @VisibleForTesting
     String getExperimentFeatureKey(String experimentId) {
         List<String> featureKeys = projectConfig.getExperimentFeatureKeyMapping().get(experimentId);
+        logger.info("Keys for feature experiment is null {}", featureKeys == null);
         return featureKeys != null ? featureKeys.get(0) : null;
     }
 
     @VisibleForTesting
     Map<String, OptimizelyExperiment> getExperimentsMap() {
         List<Experiment> experiments = projectConfig.getExperiments();
         if(experiments == null) {
+            logger.warn("Returning empty map because there are no experiments in project config");
             return Collections.emptyMap();
         }
         return experiments.stream().collect(Collectors.toMap(Experiment::getKey, experiment -> new OptimizelyExperiment(
@@ -86,9 +93,11 @@ Map<String, OptimizelyExperiment> getExperimentsMap() {
     @VisibleForTesting
     Map<String, OptimizelyVariation> getVariationsMap(List<Variation> variations, String experimentId) {
         if(variations == null) {
+            logger.warn("Returning empty map because there variations provided are null");
             return Collections.emptyMap();
         }
         Boolean isFeatureExperiment = this.getExperimentFeatureKey(experimentId) != null;
+        logger.debug("Experiment id {} is a feature experiment: {}", experimentId, isFeatureExperiment);
         return variations.stream().collect(Collectors.toMap(Variation::getKey, variation -> new OptimizelyVariation(
             variation.getId(),
             variation.getKey(),
@@ -106,15 +115,16 @@ Map<String, OptimizelyVariation> getVariationsMap(List<Variation> variations, St
     @VisibleForTesting
     Map<String, OptimizelyVariable> getMergedVariablesMap(Variation variation, String experimentId) {
         String featureKey = this.getExperimentFeatureKey(experimentId);
-
         if (featureKey != null) {
+            logger.info("Merging the variables as feature key is available");
             // Generate temp map of all the available variable values from variation.
             Map<String, OptimizelyVariable> tempVariableIdMap = getFeatureVariableUsageInstanceMap(variation.getFeatureVariableUsageInstances());
 
             // Iterate over all the variables available in associated feature.
             // Use value from variation variable if variable is available in variation and feature is enabled, otherwise use defaultValue from feature variable.
             List<FeatureVariable> featureVariables = featureKeyToVariablesMap.get(featureKey);
             if (featureVariables == null) {
+                logger.warn("Returning empty map as featureKeyToVariablesMap is null");
                 return Collections.emptyMap();
             }
 
@@ -133,6 +143,7 @@ Map<String, OptimizelyVariable> getMergedVariablesMap(Variation variation, Strin
     @VisibleForTesting
     Map<String, OptimizelyVariable> getFeatureVariableUsageInstanceMap(List<FeatureVariableUsageInstance> featureVariableUsageInstances) {
         if(featureVariableUsageInstances == null) {
+            logger.warn("Returning empty map because there FeatureVariableUsageInstance provided are null");
             return Collections.emptyMap();
         }
         return featureVariableUsageInstances.stream().collect(Collectors.toMap(FeatureVariableUsageInstance::getId, variable -> new OptimizelyVariable(
@@ -147,6 +158,7 @@ Map<String, OptimizelyVariable> getFeatureVariableUsageInstanceMap(List<FeatureV
     Map<String, OptimizelyFeature> getFeaturesMap(Map<String, OptimizelyExperiment> allExperimentsMap) {
         List<FeatureFlag> featureFlags = projectConfig.getFeatureFlags();
         if(featureFlags == null) {
+            logger.warn("Returning empty map because there are no feature flags in project config");
             return Collections.emptyMap();
         }
         return featureFlags.stream().collect(Collectors.toMap(FeatureFlag::getKey, featureFlag -> new OptimizelyFeature(
@@ -160,6 +172,7 @@ Map<String, OptimizelyFeature> getFeaturesMap(Map<String, OptimizelyExperiment>
     @VisibleForTesting
     Map<String, OptimizelyExperiment> getExperimentsMapForFeature(List<String> experimentIds, Map<String, OptimizelyExperiment> allExperimentsMap) {
         if (experimentIds == null) {
+            logger.warn("Returning empty map because the experiment id list is null");
             return Collections.emptyMap();
         }
 
@@ -173,6 +186,7 @@ Map<String, OptimizelyExperiment> getExperimentsMapForFeature(List<String> exper
     @VisibleForTesting
     Map<String, OptimizelyVariable> getFeatureVariablesMap(List<FeatureVariable> featureVariables) {
         if (featureVariables == null) {
+            logger.warn("Returning empty map because the feature variables list is null");
             return Collections.emptyMap();
         }
         return featureVariables.stream().collect(Collectors.toMap(FeatureVariable::getKey, featureVariable -> new OptimizelyVariable(

core-api/src/test/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfigServiceTest.java

@@ -150,14 +150,15 @@ public void testGetVariationsMap() {
             OptimizelyVariation optimizelyVariation = optimizelyVariationMap.get(variation.getKey());
             assertEquals(optimizelyVariation.getId(), variation.getId());
             assertEquals(optimizelyVariation.getKey(), variation.getKey());
-            Map<String, OptimizelyVariable> optimizelyVariableMap =
-                optimizelyConfigService.getMergedVariablesMap(variation, experiment.getId());
-            optimizelyVariableMap.forEach((variableKey, variable) -> {
-                OptimizelyVariable optimizelyVariable = optimizelyVariableMap.get(variableKey);
-                assertEquals(variable.getValue(), optimizelyVariable.getValue());
-                assertEquals(variable.getType(), optimizelyVariable.getType());
-                assertEquals(variable.getId(), optimizelyVariable.getId());
-                assertEquals(variable.getKey(), optimizelyVariable.getKey());
+            List<FeatureVariableUsageInstance> featureVariableUsageInstances = variation.getFeatureVariableUsageInstances();
+            optimizelyVariation.getVariablesMap().forEach((variableKey, variable) -> {
+                if(featureVariableUsageInstances != null) {
+                    featureVariableUsageInstances.forEach(featureVariableUsageInstance -> {
+                        if (variable.getId().equals(featureVariableUsageInstance.getId())) {
+                            assertEquals(variable.getValue(), featureVariableUsageInstance.getValue());
+                        }
+                    });
+                }
             });
         });
     }