Added getCachedconfig Function to return ProjectConfig without wait, …

…but the default implementation of it will return null.
optimizely · msohailhussain · Jan 26, 2023 · Jan 11, 2023 · Jan 11, 2023 · Jan 11, 2023
commit 38d735a865abfae89ceac3fd5baf25756dea0858
diff --git a/core-api/src/main/java/com/optimizely/ab/Optimizely.java b/core-api/src/main/java/com/optimizely/ab/Optimizely.java
@@ -125,10 +125,10 @@ private Optimizely(@Nonnull EventHandler eventHandler,
 
         if (odpManager != null) {
             odpManager.getEventManager().start();
-            if (!(projectConfigManager instanceof PollingProjectConfigManager)) {
+            if (projectConfigManager.getCachedConfig() != null) {
                 updateODPSettings();
             }
-            if (projectConfigManager != null && projectConfigManager.getSDKKey() != null) {
+            if (projectConfigManager.getSDKKey() != null) {
                 NotificationRegistry.getInternalNotificationCenter(projectConfigManager.getSDKKey()).
                     addNotificationHandler(UpdateConfigNotification.class,
                         configNotification -> { updateODPSettings(); });
@@ -1485,8 +1485,8 @@ public void identifyUser(@Nonnull String userId) {
     }
 
     private void updateODPSettings() {
-        if (odpManager != null && getProjectConfig() != null) {
-            ProjectConfig projectConfig = getProjectConfig();
+        ProjectConfig projectConfig = projectConfigManager.getCachedConfig();
+        if (odpManager != null && projectConfig != null) {
             odpManager.updateSettings(projectConfig.getHostForODP(), projectConfig.getPublicKeyForODP(), projectConfig.getAllSegments());
         }
     }

diff --git a/core-api/src/main/java/com/optimizely/ab/config/AtomicProjectConfigManager.java b/core-api/src/main/java/com/optimizely/ab/config/AtomicProjectConfigManager.java
@@ -1,6 +1,6 @@
 /**
  *
- *    Copyright 2019, Optimizely and contributors
+ *    Copyright 2019, 2023, 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.
@@ -27,6 +27,16 @@ public ProjectConfig getConfig() {
         return projectConfigReference.get();
     }
 
+    /**
+     * Access to current cached project configuration.
+     *
+     * @return {@link ProjectConfig}
+     */
+    @Override
+    public ProjectConfig getCachedConfig() {
+        return projectConfigReference.get();
+    }
+
     public void setConfig(ProjectConfig projectConfig) {
         projectConfigReference.set(projectConfig);
     }

diff --git a/core-api/src/main/java/com/optimizely/ab/config/PollingProjectConfigManager.java b/core-api/src/main/java/com/optimizely/ab/config/PollingProjectConfigManager.java
@@ -85,6 +85,16 @@ public PollingProjectConfigManager(long period, TimeUnit timeUnit, long blocking
 
     protected abstract ProjectConfig poll();
 
+    /**
+     * Access to current cached project configuration, This is to make sure that config returns without any wait, even if it is null.
+     *
+     * @return {@link ProjectConfig}
+     */
+    @Override
+    public ProjectConfig getCachedConfig() {
+        return currentProjectConfig.get();
+    }
+
     /**
      * Only allow the ProjectConfig to be set to a non-null value, if and only if the value has not already been set.
      * @param projectConfig

diff --git a/core-api/src/main/java/com/optimizely/ab/config/ProjectConfigManager.java b/core-api/src/main/java/com/optimizely/ab/config/ProjectConfigManager.java
@@ -24,6 +24,14 @@ public interface ProjectConfigManager {
      */
     ProjectConfig getConfig();
 
+    /**
+     * Implementations of this method should not block until a datafile is available, instead return current cached project configuration.
+     *
+     * NOTE: To use ODP segments, implementation of this function is required to return current project configuration.
+     * @return ProjectConfig
+     */
+    default ProjectConfig getCachedConfig() { return null; }
+
     default String getSDKKey() {
         return null;
     }