fix per review

Author: jaeopt

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

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

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

@@ -54,21 +54,21 @@ public class HttpProjectConfigManager extends PollingProjectConfigManager {
 
     private final OptimizelyHttpClient httpClient;
     private final URI uri;
-    private final String authDatafileToken;
+    private final String datafileAuthToken;
     private String datafileLastModified;
 
     private HttpProjectConfigManager(long period,
                                      TimeUnit timeUnit,
                                      OptimizelyHttpClient httpClient,
                                      String url,
-                                     String authDatafileToken,
+                                     String datafileAuthToken,
                                      long blockingTimeoutPeriod,
                                      TimeUnit blockingTimeoutUnit,
                                      NotificationCenter notificationCenter) {
         super(period, timeUnit, blockingTimeoutPeriod, blockingTimeoutUnit, notificationCenter);
         this.httpClient = httpClient;
         this.uri = URI.create(url);
-        this.authDatafileToken = authDatafileToken;
+        this.datafileAuthToken = datafileAuthToken;
     }
 
     public URI getUri() {
@@ -133,8 +133,8 @@ protected ProjectConfig poll() {
     HttpGet createHttpRequest() {
         HttpGet httpGet = new HttpGet(uri);
 
-        if (authDatafileToken != null) {
-            httpGet.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + authDatafileToken);
+        if (datafileAuthToken != null) {
+            httpGet.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + datafileAuthToken);
         }
 
         if (datafileLastModified != null) {
@@ -151,7 +151,7 @@ public static Builder builder() {
     public static class Builder {
         private String datafile;
         private String url;
-        private String authDatafileToken = null;
+        private String datafileAuthToken = null;
         private String format = "https://cdn.optimizely.com/datafiles/%s.json";
         private String authFormat = "https://config.optimizely.com/datafiles/auth/%s.json";
         private OptimizelyHttpClient httpClient;
@@ -174,8 +174,8 @@ public Builder withSdkKey(String sdkKey) {
             return this;
         }
 
-        public Builder withAuthDatafileToken(String token) {
-            this.authDatafileToken = token;
+        public Builder withDatafileAuthToken(String token) {
+            this.datafileAuthToken = token;
             return this;
         }
 
@@ -287,7 +287,7 @@ public HttpProjectConfigManager build(boolean defer) {
                     throw new NullPointerException("sdkKey cannot be null");
                 }
 
-                if (authDatafileToken == null) {
+                if (datafileAuthToken == null) {
                     url = String.format(format, sdkKey);
                 } else {
                     url = String.format(authFormat, sdkKey);
@@ -303,7 +303,7 @@ public HttpProjectConfigManager build(boolean defer) {
                 timeUnit,
                 httpClient,
                 url,
-                authDatafileToken,
+                datafileAuthToken,
                 blockingTimeoutPeriod,
                 blockingTimeoutUnit,
                 notificationCenter);

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

@@ -192,7 +192,7 @@ public void newDefaultInstanceWithFallback() throws Exception {
     }
 
     @Test
-    public void newDefaultInstanceWithAuthDatafileToken() throws Exception {
+    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);
         assertTrue(optimizely.isValid());

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

@@ -128,13 +128,13 @@ public void testHttpGetBySdkKeyForAuthDatafile() throws Exception {
         projectConfigManager = builder()
             .withOptimizelyHttpClient(mockHttpClient)
             .withSdkKey("sdk-key")
-            .withAuthDatafileToken("auth-token")
+            .withDatafileAuthToken("auth-token")
             .build();
 
         URI actual = projectConfigManager.getUri();
-        assertEquals(new URI("https://www.optimizely-cdn.com/datafiles/auth/sdk-key.json"), actual);
+        assertEquals(new URI("https://config.optimizely.com/datafiles/auth/sdk-key.json"), actual);
     }
-    
+
     @Test
     public void testHttpGetByCustomUrlForAuthDatafile() throws Exception {
         String expected = "https://custom.optimizely.com/custom-location.json";
@@ -143,7 +143,7 @@ public void testHttpGetByCustomUrlForAuthDatafile() throws Exception {
             .withOptimizelyHttpClient(mockHttpClient)
             .withUrl(expected)
             .withSdkKey("sdk-key")
-            .withAuthDatafileToken("auth-token")
+            .withDatafileAuthToken("auth-token")
             .build();
 
         URI actual = projectConfigManager.getUri();
@@ -167,11 +167,11 @@ public void testCreateHttpRequestForAuthDatafile() throws Exception {
         projectConfigManager = builder()
             .withOptimizelyHttpClient(mockHttpClient)
             .withSdkKey("sdk-key")
-            .withAuthDatafileToken("auth-token")
+            .withDatafileAuthToken("auth-token")
             .build();
 
         HttpGet request = projectConfigManager.createHttpRequest();
-        assertEquals(request.getURI().toString(), "https://www.optimizely-cdn.com/datafiles/auth/sdk-key.json");
+        assertEquals(request.getURI().toString(), "https://config.optimizely.com/datafiles/auth/sdk-key.json");
         assertEquals(request.getHeaders("Authorization")[0].getValue(), "Bearer auth-token");
     }