Fix missing UER references.

Author: Mike Ng

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

@@ -102,7 +102,7 @@ private Optimizely(@Nonnull ProjectConfig projectConfig,
 
     // Do work here that should be done once per Optimizely lifecycle
     @VisibleForTesting void initialize() {
-        bucketer.cleanUserExperimentRecords();
+        bucketer.cleanUserProfiles();
     }
 
     //======== activate calls ========//
@@ -458,7 +458,7 @@ public Builder withErrorHandler(ErrorHandler errorHandler) {
             return this;
         }
 
-        public Builder withUserExperimentRecord(UserProfile userProfile) {
+        public Builder withUserProfile(UserProfile userProfile) {
             this.userProfile = userProfile;
             return this;
         }

core-api/src/main/java/com/optimizely/ab/bucketing/Bucketer.java

@@ -112,12 +112,12 @@ private Variation bucketToVariation(@Nonnull Experiment experiment,
         String experimentKey = experiment.getKey();
         String combinedBucketId = userId + experimentId;
 
-        // If a user experiment record instance is present then check it for a saved variation
+        // If a user profile instance is present then check it for a saved variation
         if (userProfile != null) {
             String variationKey = userProfile.lookup(userId, experimentKey);
             if (variationKey != null) {
                 logger.info("Returning previously activated variation \"{}\" of experiment \"{}\" "
-                            + "for user \"{}\" from user experiment record.",
+                            + "for user \"{}\" from user profile.",
                             variationKey, experimentKey, userId);
                 // A variation is stored for this combined bucket id
                 return projectConfig
@@ -127,7 +127,7 @@ private Variation bucketToVariation(@Nonnull Experiment experiment,
                     .get(variationKey);
             } else {
                 logger.info("No previously activated variation of experiment \"{}\" "
-                            + "for user \"{}\" found in user experiment record.",
+                            + "for user \"{}\" found in user profile.",
                             experimentKey, userId);
             }
         }
@@ -145,7 +145,7 @@ private Variation bucketToVariation(@Nonnull Experiment experiment,
                 logger.info("User \"{}\" is in variation \"{}\" of experiment \"{}\".", userId, variationKey,
                         experimentKey);
 
-            // If a user experiment record is present give it a variation to store
+            // If a user profile is present give it a variation to store
             if (userProfile != null) {
                 boolean saved = userProfile.save(userId, experiment.getKey(), variationKey);
                 if (saved) {
@@ -232,7 +232,7 @@ public UserProfile getUserProfile() {
      * Gives implementations of {@link UserProfile} a chance to remove records
      * of experiments that are deleted or not running.
      */
-    public void cleanUserExperimentRecords() {
+    public void cleanUserProfiles() {
         if (userProfile != null) {
             Map<String, Map<String,String>> records = userProfile.getAllRecords();
             if (records != null) {

core-api/src/main/java/com/optimizely/ab/bucketing/UserProfile.java

@@ -47,7 +47,7 @@ public interface UserProfile {
     String lookup(String userId, String experimentKey);
 
     /**
-     * Called when user experiment record should be removed
+     * Called when user profile should be removed
      *
      * Records should be removed when an experiment is not running or when an experiment has been
      * deleted.

core-api/src/test/java/com/optimizely/ab/OptimizelyBuilderTest.java

@@ -102,10 +102,10 @@ public void withDefaultErrorHandler() throws Exception {
     }
 
     @Test
-    public void withUserExperimentRecord() throws Exception {
+    public void withUserProfile() throws Exception {
         UserProfile userProfile = mock(UserProfile.class);
         Optimizely optimizelyClient = Optimizely.builder(validConfigJsonV2(), mockEventHandler)
-            .withUserExperimentRecord(userProfile)
+            .withUserProfile(userProfile)
             .build();
 
         assertThat(optimizelyClient.bucketer.getUserProfile(), is(userProfile));

core-api/src/test/java/com/optimizely/ab/OptimizelyTestV1.java

@@ -159,7 +159,7 @@ public void initializationOccursForBucketerWhenBuildingOptly() throws Exception
             .withErrorHandler(mockErrorHandler)
             .build();
 
-        verify(mockBucketer).cleanUserExperimentRecords();
+        verify(mockBucketer).cleanUserProfiles();
     }
 
     /**

core-api/src/test/java/com/optimizely/ab/OptimizelyTestV2.java

@@ -31,10 +31,8 @@
 import com.optimizely.ab.error.RaiseExceptionErrorHandler;
 import com.optimizely.ab.event.EventHandler;
 import com.optimizely.ab.event.LogEvent;
-import com.optimizely.ab.event.internal.BuildVersionInfo;
 import com.optimizely.ab.event.internal.EventBuilder;
 import com.optimizely.ab.event.internal.EventBuilderV2;
-import com.optimizely.ab.event.internal.payload.Event.ClientEngine;
 import com.optimizely.ab.internal.LogbackVerifier;
 import com.optimizely.ab.internal.ProjectValidationUtils;
 
@@ -161,7 +159,7 @@ public void initializationOccursForBucketerWhenBuildingOptly() throws Exception
                 .withErrorHandler(mockErrorHandler)
                 .build();
 
-        verify(mockBucketer).cleanUserExperimentRecords();
+        verify(mockBucketer).cleanUserProfiles();
     }
 
     /**

core-api/src/test/java/com/optimizely/ab/bucketing/BucketerTest.java

@@ -449,10 +449,10 @@ public void bucketUserNotInOverlappingGroupExperiment() throws Exception {
      * Verify that {@link Bucketer#bucket(Experiment,String)} saves a variation of an experiment for a user
      * when a {@link UserProfile} is present.
      */
-    @Test public void bucketUserSaveActivationWithUserExperimentRecord() throws Exception {
+    @Test public void bucketUserSaveActivationWithUserProfile() throws Exception {
         final AtomicInteger bucketValue = new AtomicInteger();
         UserProfile userProfile = mock(UserProfile.class);
-        Bucketer algorithm = mockUserExperimentRecordAlgorithm(bucketValue, userProfile);
+        Bucketer algorithm = mockUserProfileAlgorithm(bucketValue, userProfile);
         bucketValue.set(3000);
 
         ProjectConfig projectConfig = validProjectConfigV2();
@@ -474,10 +474,10 @@ public void bucketUserNotInOverlappingGroupExperiment() throws Exception {
      * Verify that {@link Bucketer#bucket(Experiment,String)} logs correctly
      * when a {@link UserProfile} is present and fails to save an activation.
      */
-    @Test public void bucketUserSaveActivationFailWithUserExperimentRecord() throws Exception {
+    @Test public void bucketUserSaveActivationFailWithUserProfile() throws Exception {
         final AtomicInteger bucketValue = new AtomicInteger();
         UserProfile userProfile = mock(UserProfile.class);
-        Bucketer algorithm = mockUserExperimentRecordAlgorithm(bucketValue, userProfile);
+        Bucketer algorithm = mockUserProfileAlgorithm(bucketValue, userProfile);
         bucketValue.set(3000);
 
         ProjectConfig projectConfig = validProjectConfigV2();
@@ -499,10 +499,10 @@ public void bucketUserNotInOverlappingGroupExperiment() throws Exception {
      * Verify that {@link Bucketer#bucket(Experiment,String)} returns a variation that is
      * stored in the provided {@link UserProfile}.
      */
-    @Test public void bucketUserRestoreActivationWithUserExperimentRecord() throws Exception {
+    @Test public void bucketUserRestoreActivationWithUserProfile() throws Exception {
         final AtomicInteger bucketValue = new AtomicInteger();
         UserProfile userProfile = mock(UserProfile.class);
-        Bucketer algorithm = mockUserExperimentRecordAlgorithm(bucketValue, userProfile);
+        Bucketer algorithm = mockUserProfileAlgorithm(bucketValue, userProfile);
         bucketValue.set(3000);
 
         ProjectConfig projectConfig = validProjectConfigV2();
@@ -516,7 +516,7 @@ public void bucketUserNotInOverlappingGroupExperiment() throws Exception {
 
         logbackVerifier.expectMessage(Level.INFO,
                 "Returning previously activated variation \"e2_vtag1\" of experiment \"group_etag2\""
-                                      + " for user \"blah\" from user experiment record.");
+                                      + " for user \"blah\" from user profile.");
 
         verify(userProfile).lookup("blah", groupExperiment.getKey());
     }
@@ -525,10 +525,10 @@ public void bucketUserNotInOverlappingGroupExperiment() throws Exception {
      * Verify {@link Bucketer#bucket(Experiment,String)} handles a present {@link UserProfile}
      * returning null when looking up a variation.
      */
-    @Test public void bucketUserRestoreActivationNullWithUserExperimentRecord() throws Exception {
+    @Test public void bucketUserRestoreActivationNullWithUserProfile() throws Exception {
         final AtomicInteger bucketValue = new AtomicInteger();
         UserProfile userProfile = mock(UserProfile.class);
-        Bucketer algorithm = mockUserExperimentRecordAlgorithm(bucketValue, userProfile);
+        Bucketer algorithm = mockUserProfileAlgorithm(bucketValue, userProfile);
         bucketValue.set(3000);
 
         ProjectConfig projectConfig = validProjectConfigV2();
@@ -541,53 +541,53 @@ public void bucketUserNotInOverlappingGroupExperiment() throws Exception {
         assertThat(algorithm.bucket(groupExperiment, "blah"),  is(variation));
 
         logbackVerifier.expectMessage(Level.INFO, "No previously activated variation of experiment " +
-                                      "\"group_etag2\" for user \"blah\" found in user experiment record.");
+                                      "\"group_etag2\" for user \"blah\" found in user profile.");
         verify(userProfile).lookup("blah", groupExperiment.getKey());
     }
 
     /**
-     * Verify {@link Bucketer#cleanUserExperimentRecords()} handles a null {@link UserProfile}.
+     * Verify {@link Bucketer#cleanUserProfiles()} handles a null {@link UserProfile}.
      */
     @Test
-    public void nullUserExperimentRecordWhenCleaning() {
+    public void nullUserProfileWhenCleaning() {
         final AtomicInteger bucketValue = new AtomicInteger();
         Bucketer algorithm = mockBucketAlgorithm(bucketValue);
         bucketValue.set(3000);
         try {
-            algorithm.cleanUserExperimentRecords();
+            algorithm.cleanUserProfiles();
         } catch (NullPointerException e) {
             fail();
         }
     }
 
     /**
-     * Verify {@link Bucketer#cleanUserExperimentRecords()} handles a null returned from
+     * Verify {@link Bucketer#cleanUserProfiles()} handles a null returned from
      * {@link UserProfile#getAllRecords()}.
      */
     @Test
-    public void nullUserExperimentRecords() {
+    public void nullUserProfiles() {
         final AtomicInteger bucketValue = new AtomicInteger();
         UserProfile userProfile = mock(UserProfile.class);
-        Bucketer algorithm = mockUserExperimentRecordAlgorithm(bucketValue, userProfile);
+        Bucketer algorithm = mockUserProfileAlgorithm(bucketValue, userProfile);
         bucketValue.set(3000);
 
         when(userProfile.getAllRecords()).thenReturn(null);
         try {
-            algorithm.cleanUserExperimentRecords();
+            algorithm.cleanUserProfiles();
         } catch (NullPointerException e) {
             fail();
         }
     }
 
     /**
-     * Verify {@link Bucketer#cleanUserExperimentRecords()} removes experiments
+     * Verify {@link Bucketer#cleanUserProfiles()} removes experiments
      * that are no longer in the {@link ProjectConfig}.
      */
     @Test
     public void cleanRemovesRecordsOfExperimentsThatNoLongerExist() {
         final AtomicInteger bucketValue = new AtomicInteger();
         UserProfile userProfile = mock(UserProfile.class);
-        Bucketer algorithm = mockUserExperimentRecordAlgorithm(bucketValue, userProfile);
+        Bucketer algorithm = mockUserProfileAlgorithm(bucketValue, userProfile);
         bucketValue.set(3000);
 
         Map<String,Map<String,String>> records = new HashMap<String, Map<String, String>>();
@@ -596,20 +596,20 @@ public void cleanRemovesRecordsOfExperimentsThatNoLongerExist() {
         records.put("blah",  activation);
         when(userProfile.getAllRecords()).thenReturn(records);
 
-        algorithm.cleanUserExperimentRecords();
+        algorithm.cleanUserProfiles();
 
         verify(userProfile).remove("blah", "exp1");
     }
 
     /**
-     * Verify {@link Bucketer#cleanUserExperimentRecords()} removes experiments
+     * Verify {@link Bucketer#cleanUserProfiles()} removes experiments
      * that are paused in the {@link ProjectConfig}.
      */
     @Test
     public void cleanRemovesRecordsOfExperimentsThatAreNotRunning() {
         final AtomicInteger bucketValue = new AtomicInteger();
         UserProfile userProfile = mock(UserProfile.class);
-        Bucketer algorithm = mockUserExperimentRecordAlgorithm(bucketValue, userProfile);
+        Bucketer algorithm = mockUserProfileAlgorithm(bucketValue, userProfile);
         bucketValue.set(3000);
 
         Map<String,Map<String,String>> records = new HashMap<String, Map<String, String>>();
@@ -618,7 +618,7 @@ public void cleanRemovesRecordsOfExperimentsThatAreNotRunning() {
         records.put("blah",  activation);
         when(userProfile.getAllRecords()).thenReturn(records);
 
-        algorithm.cleanUserExperimentRecords();
+        algorithm.cleanUserProfiles();
 
         verify(userProfile).remove("blah", "exp1");
     }
@@ -647,7 +647,7 @@ int generateBucketValue(int hashCode) {
      * @param bucketValue the expected bucket value holder
      * @return the mock bucket algorithm
      */
-    private Bucketer mockUserExperimentRecordAlgorithm(final AtomicInteger bucketValue, final UserProfile userProfile) {
+    private Bucketer mockUserProfileAlgorithm(final AtomicInteger bucketValue, final UserProfile userProfile) {
         return new Bucketer(validProjectConfigV2(), userProfile) {
             @Override
             int generateBucketValue(int hashCode) {