Added caching

Author: Arshadf

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

@@ -29,6 +29,7 @@
 import com.optimizely.ab.event.internal.payload.EventBatch;
 import com.optimizely.ab.notification.*;
 import com.optimizely.ab.optimizelyconfig.OptimizelyConfig;
+import com.optimizely.ab.optimizelyconfig.OptimizelyConfigManager;
 import com.optimizely.ab.optimizelyconfig.OptimizelyConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -87,6 +88,8 @@ public class Optimizely implements AutoCloseable {
 
     private final ProjectConfigManager projectConfigManager;
 
+    private OptimizelyConfigManager optimizelyConfigManager;
+
     // TODO should be private
     public final NotificationCenter notificationCenter;
 
@@ -107,6 +110,9 @@ private Optimizely(@Nonnull EventHandler eventHandler,
         this.decisionService = decisionService;
         this.userProfileService = userProfileService;
         this.projectConfigManager = projectConfigManager;
+        if (projectConfigManager instanceof OptimizelyConfigManager) {
+            this.optimizelyConfigManager = (OptimizelyConfigManager)projectConfigManager;
+        }
         this.notificationCenter = notificationCenter;
     }
 
@@ -884,20 +890,6 @@ public Variation getForcedVariation(@Nonnull String experimentKey,
         return decisionService.getForcedVariation(experiment, userId);
     }
 
-    /**
-     * Get {@link OptimizelyConfig} containing experiments and features map
-     *
-     * @return {@link OptimizelyConfig}
-     */
-    public OptimizelyConfig getOptimizelyConfig() {
-        ProjectConfig projectConfig = getProjectConfig();
-        if (projectConfig == null) {
-            logger.error("Optimizely instance is not valid, failing getOptimizelyConfig call.");
-            return null;
-        }
-        return new OptimizelyConfigService(projectConfig).getConfig();
-    }
-
     /**
      * @return the current {@link ProjectConfig} instance.
      */
@@ -928,6 +920,23 @@ private boolean validateUserId(String userId) {
         return true;
     }
 
+    /**
+     * Get {@link OptimizelyConfig} containing experiments and features map
+     *
+     * @return {@link OptimizelyConfig}
+     */
+    public OptimizelyConfig getOptimizelyConfig() {
+        ProjectConfig projectConfig = getProjectConfig();
+        if (projectConfig == null) {
+            logger.error("Optimizely instance is not valid, failing getOptimizelyConfig call.");
+            return null;
+        }
+        if (optimizelyConfigManager != null) {
+           return optimizelyConfigManager.getOptimizelyConfig();
+        }
+        return new OptimizelyConfigService(projectConfig).getConfig();
+    }
+
     /**
      * Helper method which makes separate copy of attributesMap variable and returns it
      *

core-api/src/main/java/com/optimizely/ab/config/PollingProjectConfigManager.java

@@ -18,6 +18,9 @@
 
 import com.optimizely.ab.notification.NotificationCenter;
 import com.optimizely.ab.notification.UpdateConfigNotification;
+import com.optimizely.ab.optimizelyconfig.OptimizelyConfig;
+import com.optimizely.ab.optimizelyconfig.OptimizelyConfigManager;
+import com.optimizely.ab.optimizelyconfig.OptimizelyConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,12 +40,13 @@
  * is initially set. A default ProjectConfig can be provided to bootstrap the initial ProjectConfig
  * return value and prevent blocking.
  */
-public abstract class PollingProjectConfigManager implements ProjectConfigManager, AutoCloseable {
+public abstract class PollingProjectConfigManager implements ProjectConfigManager, AutoCloseable, OptimizelyConfigManager {
 
     private static final Logger logger = LoggerFactory.getLogger(PollingProjectConfigManager.class);
     private static final UpdateConfigNotification SIGNAL = new UpdateConfigNotification();
 
     private final AtomicReference<ProjectConfig> currentProjectConfig = new AtomicReference<>();
+    private final AtomicReference<OptimizelyConfig> currentOptimizelyConfig = new AtomicReference<>();
     private final ScheduledExecutorService scheduledExecutorService;
     private final long period;
     private final TimeUnit timeUnit;
@@ -99,6 +103,7 @@ void setConfig(ProjectConfig projectConfig) {
         logger.info("New datafile set with revision: {}. Old revision: {}", projectConfig.getRevision(), previousRevision);
 
         currentProjectConfig.set(projectConfig);
+        currentOptimizelyConfig.set(new OptimizelyConfigService(currentProjectConfig.get()).getConfig());
         countDownLatch.countDown();
         notificationCenter.send(SIGNAL);
     }
@@ -132,6 +137,15 @@ public ProjectConfig getConfig() {
         return projectConfig == null ? currentProjectConfig.get() : projectConfig;
     }
 
+    /**
+     * Returns the cached {@link OptimizelyConfig}
+     * @return {@link OptimizelyConfig}
+     */
+    @Override
+    public OptimizelyConfig getOptimizelyConfig() {
+        return currentOptimizelyConfig.get();
+    }
+
     public synchronized void start() {
         if (started) {
             logger.warn("Manager already started.");

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

@@ -0,0 +1,26 @@
+/**
+ *
+ *    Copyright 2019, Optimizely and contributors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package com.optimizely.ab.optimizelyconfig;
+
+public interface OptimizelyConfigManager {
+    /**
+     * Implementations of this method should return {@link OptimizelyConfig}
+     *
+     * @return {@link OptimizelyConfig}
+     */
+    OptimizelyConfig getOptimizelyConfig();
+}