removed unused imports

Author: zashraf1985

core-api/src/main/java/com/optimizely/ab/Optimizely.java

@@ -21,8 +21,6 @@
 import com.optimizely.ab.bucketing.FeatureDecision;
 import com.optimizely.ab.bucketing.UserProfileService;
 import com.optimizely.ab.config.*;
-import com.optimizely.ab.optimizelyconfig.OptimizelyConfig;
-import com.optimizely.ab.optimizelyconfig.OptimizelyConfigService;
 import com.optimizely.ab.config.parser.ConfigParseException;
 import com.optimizely.ab.error.ErrorHandler;
 import com.optimizely.ab.error.NoOpErrorHandler;

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

@@ -43,37 +43,6 @@ public void initialize() throws Exception {
         optimizelyConfigService = new OptimizelyConfigService(projectConfig);
     }
 
-    @Test
-    public void testGetMergedVariablesMap() {
-        List<Experiment> experiments = projectConfig.getExperiments();
-        experiments.forEach(experiment ->
-            experiment.getVariations().forEach(variation -> {
-                // creating temporary variable map to get values while merging
-                Map<String, OptimizelyVariable> tempVariableIdMap =
-                    optimizelyConfigService.getFeatureVariableUsageInstanceMap(variation.getFeatureVariableUsageInstances());
-                String featureKey = optimizelyConfigService.getExperimentFeatureKey(experiment.getId());
-                if (featureKey != null) {
-                    // keeping all the feature variables for asserting
-                    List<FeatureVariable> featureVariables =
-                        optimizelyConfigService.generateFeatureKeyToVariablesMap().get(featureKey);
-                    Map<String, OptimizelyVariable> optimizelyVariableMap =
-                        optimizelyConfigService.getMergedVariablesMap(variation, experiment.getId());
-                    featureVariables.forEach(featureVariable -> {
-                        OptimizelyVariable optimizelyVariable = optimizelyVariableMap.get(featureVariable.getKey());
-                        assertEquals(optimizelyVariable.getKey(), featureVariable.getKey());
-                        assertEquals(optimizelyVariable.getId(), featureVariable.getId());
-                        assertEquals(optimizelyVariable.getType(), featureVariable.getType().getVariableType().toLowerCase());
-                        // getting the expected value to assert after merging
-                        String expectedValue = variation.getFeatureEnabled() && tempVariableIdMap.get(featureVariable.getId()) != null
-                            ? tempVariableIdMap.get(featureVariable.getId()).getValue()
-                            : featureVariable.getDefaultValue();
-                        assertEquals(optimizelyVariable.getValue(), expectedValue);
-                    });
-                }
-            })
-        );
-    }
-
     @Test
     public void testGetExperimentsMap() {
         Map<String, OptimizelyExperiment> optimizelyExperimentMap = optimizelyConfigService.getExperimentsMap();
@@ -223,6 +192,35 @@ public void testGenerateFeatureKeyToVariablesMap() {
         });
     }
 
+    @Test
+    public void testGetMergedVariablesMap() {
+        List<Experiment> experiments = projectConfig.getExperiments();
+        experiments.forEach(experiment ->
+            experiment.getVariations().forEach(variation -> {
+                // creating temporary variable map to get values while merging
+                Map<String, OptimizelyVariable> tempVariableIdMap = optimizelyConfigService.getFeatureVariableUsageInstanceMap(variation.getFeatureVariableUsageInstances());
+                String featureKey = optimizelyConfigService.getExperimentFeatureKey(experiment.getId());
+                if (featureKey != null) {
+                    // keeping all the feature variables for asserting
+                    List<FeatureVariable> featureVariables = optimizelyConfigService.generateFeatureKeyToVariablesMap().get(featureKey);
+                    Map<String, OptimizelyVariable> optimizelyVariableMap = optimizelyConfigService.getMergedVariablesMap(variation, experiment.getId());
+                    featureVariables.forEach(featureVariable -> {
+                        OptimizelyVariable optimizelyVariable = optimizelyVariableMap.get(featureVariable.getKey());
+                        assertEquals(optimizelyVariable.getKey(), featureVariable.getKey());
+                        assertEquals(optimizelyVariable.getId(), featureVariable.getId());
+                        assertEquals(optimizelyVariable.getType(), featureVariable.getType().getVariableType().toLowerCase());
+                        // getting the expected value to assert after merging
+                        // if feature is enabled, then value should be taken from varition variable otherwise default value from feature variable is used.
+                        String expectedValue = variation.getFeatureEnabled() && tempVariableIdMap.get(featureVariable.getId()) != null
+                            ? tempVariableIdMap.get(featureVariable.getId()).getValue()
+                            : featureVariable.getDefaultValue();
+                        assertEquals(optimizelyVariable.getValue(), expectedValue);
+                    });
+                }
+            })
+        );
+    }
+
     private List<Experiment> getAllExperimentsFromDatafile() {
         List<Experiment> experiments = new ArrayList<>();
         projectConfig.getGroups().forEach(group ->