add datafileAuthToken set in optimizely.properties

Author: jaeopt

core-httpclient-impl/src/main/java/com/optimizely/ab/OptimizelyFactory.java

@@ -179,31 +179,28 @@ public static Optimizely newDefaultInstance(String sdkKey) {
      * @param fallback Fallback datafile string used by the ProjectConfigManager to be immediately available.
      */
     public static Optimizely newDefaultInstance(String sdkKey, String fallback) {
-        NotificationCenter notificationCenter = new NotificationCenter();
-
-        HttpProjectConfigManager.Builder builder = HttpProjectConfigManager.builder()
-            .withDatafile(fallback)
-            .withNotificationCenter(notificationCenter)
-            .withSdkKey(sdkKey);
-
-        return newDefaultInstance(builder.build(), notificationCenter);
+        String datafileAuthToken = PropertyUtils.get(HttpProjectConfigManager.CONFIG_DATAFILE_AUTH_TOKEN);
+        return newDefaultInstance(sdkKey, fallback, datafileAuthToken);
     }
 
     /**
      * Returns a new Optimizely instance with authenticated datafile support.
      *
      * @param sdkKey   SDK key used to build the ProjectConfigManager.
-     * @param datafileAuthToken  Token for authenticated datafile access.
      * @param fallback Fallback datafile string used by the ProjectConfigManager to be immediately available.
+     * @param datafileAuthToken  Token for authenticated datafile access.
      */
-    public static Optimizely newDefaultInstance(String sdkKey, String datafileAuthToken, String fallback) {
+    public static Optimizely newDefaultInstance(String sdkKey, String fallback, String datafileAuthToken) {
         NotificationCenter notificationCenter = new NotificationCenter();
 
         HttpProjectConfigManager.Builder builder = HttpProjectConfigManager.builder()
             .withDatafile(fallback)
             .withNotificationCenter(notificationCenter)
-            .withSdkKey(sdkKey)
-            .withDatafileAuthToken(datafileAuthToken);
+            .withSdkKey(sdkKey);
+
+        if (datafileAuthToken != null) {
+            builder.withDatafileAuthToken(datafileAuthToken);
+        }
 
         return newDefaultInstance(builder.build(), notificationCenter);
     }

core-httpclient-impl/src/main/java/com/optimizely/ab/config/HttpProjectConfigManager.java

@@ -45,6 +45,7 @@ public class HttpProjectConfigManager extends PollingProjectConfigManager {
     public static final String CONFIG_BLOCKING_DURATION = "http.project.config.manager.blocking.duration";
     public static final String CONFIG_BLOCKING_UNIT     = "http.project.config.manager.blocking.unit";
     public static final String CONFIG_SDK_KEY           = "http.project.config.manager.sdk.key";
+    public static final String CONFIG_DATAFILE_AUTH_TOKEN = "http.project.config.manager.datafile.auth.token";
 
     public static final long DEFAULT_POLLING_DURATION  = 5;
     public static final TimeUnit DEFAULT_POLLING_UNIT  = TimeUnit.MINUTES;

core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyFactoryTest.java

@@ -194,7 +194,7 @@ public void newDefaultInstanceWithFallback() throws Exception {
     @Test
     public void newDefaultInstanceWithDatafileAuthToken() throws Exception {
         String datafileString = Resources.toString(Resources.getResource("valid-project-config-v4.json"), Charsets.UTF_8);
-        optimizely = OptimizelyFactory.newDefaultInstance("sdk-key", "auth-token", datafileString);
+        optimizely = OptimizelyFactory.newDefaultInstance("sdk-key", datafileString, "auth-token");
         assertTrue(optimizely.isValid());
     }