Updated code after suggested breakdown of PR's

Author: Arshadf

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

@@ -908,7 +908,7 @@ public OptimizelyConfig getOptimizelyConfig() {
             logger.error("Optimizely instance is not valid, failing getOptimizelyConfig call.");
             return null;
         }
-        return OptimizelyConfigService.getConfig(projectConfig);
+        return new OptimizelyConfigService(projectConfig).getConfig();
     }
 
     //======== Helper methods ========//

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

@@ -26,12 +26,11 @@ public class OptimizelyConfigService {
 
     private ProjectConfig projectConfig;
     private OptimizelyConfig optimizelyConfig;
-    private static OptimizelyConfigService serviceInstance;
 
     // Map containing variables list for every feature key used for merging variation and feature variables.
     private Map<String, List<FeatureVariable>> featureKeyToVariablesMap;
 
-    private OptimizelyConfigService(ProjectConfig projectConfig) {
+    public OptimizelyConfigService(ProjectConfig projectConfig) {
         this.projectConfig = projectConfig;
         this.featureKeyToVariablesMap = generateFeatureKeyToVariablesMap();
 
@@ -44,29 +43,11 @@ private OptimizelyConfigService(ProjectConfig projectConfig) {
     }
 
     /**
-     * creates new instance if the revision is updated
-     *
-     * @param projectConfig project config provided
-     * @return singleton object of {@link OptimizelyConfigService}
-     */
-    @VisibleForTesting
-    static OptimizelyConfigService getInstance(ProjectConfig projectConfig) {
-        if (serviceInstance == null || !projectConfig.getRevision().equals(serviceInstance.getOptimizelyConfig().getRevision())) {
-            serviceInstance = new OptimizelyConfigService(projectConfig);
-        }
-        return serviceInstance;
-    }
-
-    public static OptimizelyConfig getConfig(ProjectConfig projectConfig) {
-        return getInstance(projectConfig).getOptimizelyConfig();
-    }
-
-    /**
-     * create maps for experiment and features to be returned as one object
+     * returns maps for experiment and features to be returned as one object
      *
      * @return {@link OptimizelyConfig} containing experiments and features
      */
-    public OptimizelyConfig getOptimizelyConfig() {
+    public OptimizelyConfig getConfig() {
         return optimizelyConfig;
     }
 

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

@@ -40,7 +40,7 @@ public class OptimizelyConfigServiceTest {
     @Before
     public void initialize() throws Exception {
         projectConfig = new DatafileProjectConfig.Builder().withDatafile(validConfigJsonV4()).build();
-        optimizelyConfigService = OptimizelyConfigService.getInstance(projectConfig);
+        optimizelyConfigService = new OptimizelyConfigService(projectConfig);
     }
 
     @Test
@@ -96,7 +96,7 @@ public void testGetExperimentsMap() {
 
     @Test
     public void testRevision() {
-        String revision = optimizelyConfigService.getOptimizelyConfig().getRevision();
+        String revision = optimizelyConfigService.getConfig().getRevision();
         assertEquals(revision, projectConfig.getRevision());
     }
 
@@ -223,14 +223,6 @@ public void testGenerateFeatureKeyToVariablesMap() {
         });
     }
 
-    @Test
-    public void testCachingOfOptimizelyConfig() throws Exception {
-        OptimizelyConfigService mocked = mock(OptimizelyConfigService.class);
-        when(mocked.getExperimentsMap()).thenReturn(optimizelyConfigService.getExperimentsMap());
-        optimizelyConfigService = OptimizelyConfigService.getInstance(projectConfig);
-        verify(mocked, times(0)).getExperimentsMap();
-    }
-
     private List<Experiment> getAllExperimentsFromDatafile() {
         List<Experiment> experiments = new ArrayList<>();
         projectConfig.getGroups().forEach(group ->