- Updated Java sdk version from 1.8 to 2.0.0-beta2 and removed Live variables (#168)

* - Updated Java sdk version from 1.8 to 2.0.0-beta2 (#9)

* - Updated Java sdk version from 1.8 to 2.0.0-beta2
- Removed
   getVariableString
   getVariableBoolean
   getVariableInteger
   getVariableDouble
-Remove track with revenue as a parameter. Pass the revenue value as an event tag instead
   track(String, String, long)
   track(String, String, Map<String, String>, long)

* added multidex enabled support

* make common Constant of $multidex_ver to use in all gradle

* Upgraded Java sdk (#13)

* Excluded  group: 'com.google.code.findbugs' from dependency of com.optimizely.ab:core-api
removed Multidex enabling from sdk and test app

* Updated Test unit tests

* included Collection library which was removed due to merging of master

* undo comment space

Author: mnoman09

android-sdk/build.gradle

@@ -32,7 +32,7 @@ android {
         versionName version_name
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "CLIENT_VERSION", "\"$version_name\""
-	consumerProguardFiles '../proguard-rules.txt'
+        consumerProguardFiles '../proguard-rules.txt'
     }
     testOptions {
         unitTests.returnDefaultValues = true
@@ -62,7 +62,9 @@ dependencies {
     compile project(':datafile-handler')
     compile project(':event-handler')
     compile project(':user-profile')
-    compile "com.optimizely.ab:core-api:$java_core_ver"
+    compile ("com.optimizely.ab:core-api:$java_core_ver") {
+        exclude group: 'com.google.code.findbugs'
+    }
     provided "com.android.support:support-annotations:$support_annotations_ver"
 
     testCompile "junit:junit:$junit_ver"

android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java

@@ -774,74 +774,6 @@ public void testIsInvalid() {
         assertFalse(optimizelyClient.isValid());
     }
 
-    @Test
-    public void testGoodGetVariableString() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
-        String v = optimizelyClient.getVariableString("test_variable", "userId",
-                Collections.<String, String>emptyMap(), true);
-        assertEquals(v, "true");
-    }
-
-    @Test
-    public void testBadGetVariableString() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
-        optimizelyClient.getVariableString("test_key", "userId",
-                Collections.<String, String>emptyMap(), true);
-        verify(logger).warn("Optimizely is not initialized, could not get live variable {} " +
-                "for user {}", "test_key", "userId");
-    }
-
-    @Test
-    public void testGoodGetVariableBoolean() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
-        Boolean b = optimizelyClient.getVariableBoolean("test_variable", "userId",
-                Collections.<String, String>emptyMap(), true);
-        assertNotNull(b);
-    }
-
-    @Test
-    public void testBadGetVariableBoolean() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
-        optimizelyClient.getVariableBoolean("test_key", "userId",
-                Collections.<String, String>emptyMap(), true);
-        verify(logger).warn("Optimizely is not initialized, could not get live variable {} " +
-                "for user {}", "test_key", "userId");
-    }
-
-    @Test
-    public void testGoodGetVariableInteger() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
-        Integer i = optimizelyClient.getVariableInteger("test_variable", "userId",
-                Collections.<String, String>emptyMap(), true);
-        assertNull(i);
-    }
-
-    @Test
-    public void testBadGetVariableInteger() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
-        optimizelyClient.getVariableInteger("test_key", "userId",
-                Collections.<String, String>emptyMap(), true);
-        verify(logger).warn("Optimizely is not initialized, could not get live variable {} " +
-                "for user {}", "test_key", "userId");
-    }
-
-    @Test
-    public void testGoodGetVariableDouble() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
-        Double v = optimizelyClient.getVariableDouble("test_variable", "userId",
-                Collections.<String, String>emptyMap(), true);
-        assertNull(v);
-    }
-
-    @Test
-    public void testBadGetVariableDouble() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
-        optimizelyClient.getVariableDouble("test_key", "userId",
-                Collections.<String, String>emptyMap(), true);
-        verify(logger).warn("Optimizely is not initialized, could not get live variable {} " +
-                "for user {}", "test_key", "userId");
-    }
-
     @Test
     public void testDefaultAttributes() {
         Context context = mock(Context.class);

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyClient.java

@@ -25,10 +25,12 @@
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.ProjectConfig;
 import com.optimizely.ab.config.Variation;
+import com.optimizely.ab.internal.ReservedEventKey;
 import com.optimizely.ab.notification.NotificationListener;
 
 import org.slf4j.Logger;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -219,7 +221,7 @@ public void track(@NonNull String eventName,
                       @NonNull String userId,
                       long eventValue) throws UnknownEventTypeException {
         if (isValid()) {
-            optimizely.track(eventName, userId, getDefaultAttributes(), eventValue);
+            optimizely.track(eventName, userId, getDefaultAttributes(), Collections.singletonMap(ReservedEventKey.REVENUE.toString(), eventValue));
         } else {
             logger.warn("Optimizely is not initialized, could not track event {} for user {}" +
                     " with value {}", eventName, userId, eventValue);
@@ -228,7 +230,7 @@ public void track(@NonNull String eventName,
 
     /**
      * Track an event for a user with attributes and a value
-     * @see Optimizely#track(String, String, Map, long)
+     * @see Optimizely#track(String, String, Map, Map)
      * @deprecated see {@link Optimizely#track(String, String, Map, Map)} and pass in revenue values as event tags instead.
      * @param eventName the String name of the event
      * @param userId the String user id
@@ -240,157 +242,13 @@ public void track(@NonNull String eventName,
                       @NonNull Map<String, String> attributes,
                       long eventValue) {
         if (isValid()) {
-            optimizely.track(eventName, userId, getAllAttributes(attributes), eventValue);
+            optimizely.track(eventName, userId, getAllAttributes(attributes), Collections.singletonMap(ReservedEventKey.REVENUE.toString(), eventValue));
         } else {
             logger.warn("Optimizely is not initialized, could not track event {} for user {}" +
                     " with value {} and attributes", eventName, userId, eventValue);
         }
     }
 
-    /**
-     * Get the value of a String live variable
-     * @param variableKey the String key for the variable
-     * @param userId the user ID
-     * @param activateExperiment the flag denoting whether to activate an experiment or not
-     * @return String value of the live variable
-     */
-    public @Nullable String getVariableString(@NonNull String variableKey,
-                                              @NonNull String userId,
-                                              boolean activateExperiment) {
-        return getVariableString(variableKey, userId, getDefaultAttributes(),
-                                 activateExperiment);
-    }
-
-    /**
-     * Get the value of a String live variable
-     * @param variableKey the String key for the variable
-     * @param userId the user ID
-     * @param attributes a map of attributes about the user
-     * @param activateExperiment the flag denoting whether to activate an experiment or not
-     * @return String value of the live variable
-     */
-    public @Nullable String getVariableString(@NonNull String variableKey,
-                                              @NonNull String userId,
-                                              @NonNull Map<String, String> attributes,
-                                              boolean activateExperiment) {
-        if (isValid()) {
-            return optimizely.getVariableString(variableKey, userId, getAllAttributes(attributes),
-                                                activateExperiment);
-        } else {
-            logger.warn("Optimizely is not initialized, could not get live variable {} " +
-                    "for user {}", variableKey, userId);
-            return null;
-        }
-    }
-
-    /**
-     * Get the value of a Boolean live variable
-     * @param variableKey the String key for the variable
-     * @param userId the user ID
-     * @param activateExperiment the flag denoting whether to activate an experiment or not
-     * @return Boolean value of the live variable
-     */
-    public @Nullable Boolean getVariableBoolean(@NonNull String variableKey,
-                                                @NonNull String userId,
-                                                boolean activateExperiment) {
-        return getVariableBoolean(variableKey, userId, getDefaultAttributes(),
-                                  activateExperiment);
-    }
-
-    /**
-     * Get the value of a Boolean live variable
-     * @param variableKey the String key for the variable
-     * @param userId the user ID
-     * @param attributes a map of attributes about the user
-     * @param activateExperiment the flag denoting whether to activate an experiment or not
-     * @return Boolean value of the live variable
-     */
-    public @Nullable Boolean getVariableBoolean(@NonNull String variableKey,
-                                                @NonNull String userId,
-                                                @NonNull Map<String, String> attributes,
-                                                boolean activateExperiment) {
-        if (isValid()) {
-            return optimizely.getVariableBoolean(variableKey, userId, getAllAttributes(attributes),
-                                                 activateExperiment);
-        } else {
-            logger.warn("Optimizely is not initialized, could not get live variable {} " +
-                    "for user {}", variableKey, userId);
-            return null;
-        }
-    }
-
-    /**
-     * Get the value of a Integer live variable
-     * @param variableKey the String key for the variable
-     * @param userId the user ID
-     * @param activateExperiment the flag denoting whether to activate an experiment or not
-     * @return Integer value of the live variable
-     */
-    public @Nullable Integer getVariableInteger(@NonNull String variableKey,
-                                                @NonNull String userId,
-                                                boolean activateExperiment) {
-        return getVariableInteger(variableKey, userId, getDefaultAttributes(),
-                                  activateExperiment);
-    }
-
-    /**
-     * Get the value of a Integer live variable
-     * @param variableKey the String key for the variable
-     * @param userId the user ID
-     * @param attributes a map of attributes about the user
-     * @param activateExperiment the flag denoting whether to activate an experiment or not
-     * @return Integer value of the live variable
-     */
-    public @Nullable Integer getVariableInteger(@NonNull String variableKey,
-                                                @NonNull String userId,
-                                                @NonNull Map<String, String> attributes,
-                                                boolean activateExperiment) {
-        if (isValid()) {
-            return optimizely.getVariableInteger(variableKey, userId, getAllAttributes(attributes),
-                                                 activateExperiment);
-        } else {
-            logger.warn("Optimizely is not initialized, could not get live variable {} " +
-                    "for user {}", variableKey, userId);
-            return null;
-        }
-    }
-
-    /**
-     * Get the value of a Double live variable
-     * @param variableKey the String key for the variable
-     * @param userId the user ID
-     * @param activateExperiment the flag denoting whether to activate an experiment or not
-     * @return Double value of the live variable
-     */
-    public @Nullable Double getVariableDouble(@NonNull String variableKey,
-                                              @NonNull String userId,
-                                              boolean activateExperiment) {
-        return getVariableDouble(variableKey, userId, getDefaultAttributes(),
-                                 activateExperiment);
-    }
-
-    /**
-     * Get the value of a Double live variable
-     * @param variableKey the String key for the variable
-     * @param userId the user ID
-     * @param attributes a map of attributes about the user
-     * @param activateExperiment the flag denoting whether to activate an experiment or not
-     * @return Double value of the live variable
-     */
-    public @Nullable Double getVariableDouble(@NonNull String variableKey,
-                                              @NonNull String userId,
-                                              @NonNull Map<String, String> attributes,
-                                              boolean activateExperiment) {
-        if (isValid()) {
-            return optimizely.getVariableDouble(variableKey, userId, getAllAttributes(attributes),
-                                                activateExperiment);
-        } else {
-            logger.warn("Optimizely is not initialized, could not get live variable {} " +
-                    "for user {}", variableKey, userId);
-            return null;
-        }
-    }
-
     /**
      * Get the variation the user is bucketed into
      * @see Optimizely#getVariation(Experiment, String)

android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java

@@ -19,6 +19,7 @@
 import com.optimizely.ab.Optimizely;
 import com.optimizely.ab.config.Experiment;
 import com.optimizely.ab.config.Variation;
+import com.optimizely.ab.internal.ReservedEventKey;
 import com.optimizely.ab.notification.NotificationListener;
 
 import org.junit.Test;
@@ -108,13 +109,6 @@ public void testBadTrack2() {
                 "with attributes", "event1", "1");
     }
 
-    @Test(expected=ArgumentsAreDifferent.class)
-    public void testGoodTrack3() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
-        optimizelyClient.track("event1", "1", 1L);
-        verify(optimizely).track("event1", "1", 1L);
-    }
-
     @Test
     public void testBadTrack3() {
         OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
@@ -128,8 +122,8 @@ public void testGoodTrack4() {
         OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
         final HashMap<String, String> attributes = new HashMap<>();
         optimizelyClient.track("event1", "1", attributes, 1L);
-        verify(optimizely).track("event1", "1", attributes, 1L);
-    }
+        Map<String, String> defaultAttributes = new HashMap<>();
+        verify(optimizely).track("event1", "1", defaultAttributes, Collections.singletonMap(ReservedEventKey.REVENUE.toString(), 1L));    }
 
     @Test
     public void testBadTrack4() {
@@ -209,78 +203,6 @@ public void testIsInvalid() {
         assertFalse(optimizelyClient.isValid());
     }
 
-    @Test
-    public void testGoodGetVariableString() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
-        optimizelyClient.getVariableString("test_key", "userId",
-                                           Collections.<String, String>emptyMap(), true);
-        verify(optimizely).getVariableString("test_key", "userId",
-                                             Collections.<String, String>emptyMap(), true);
-    }
-
-    @Test
-    public void testBadGetVariableString() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
-        optimizelyClient.getVariableString("test_key", "userId",
-                                           Collections.<String, String>emptyMap(), true);
-        verify(logger).warn("Optimizely is not initialized, could not get live variable {} " +
-                "for user {}", "test_key", "userId");
-    }
-
-    @Test
-    public void testGoodGetVariableBoolean() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
-        optimizelyClient.getVariableBoolean("test_key", "userId",
-                                            Collections.<String, String>emptyMap(), true);
-        verify(optimizely).getVariableBoolean("test_key", "userId",
-                                              Collections.<String, String>emptyMap(), true);
-    }
-
-    @Test
-    public void testBadGetVariableBoolean() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
-        optimizelyClient.getVariableBoolean("test_key", "userId",
-                                            Collections.<String, String>emptyMap(), true);
-        verify(logger).warn("Optimizely is not initialized, could not get live variable {} " +
-                "for user {}", "test_key", "userId");
-    }
-
-    @Test
-    public void testGoodGetVariableInteger() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
-        optimizelyClient.getVariableInteger("test_key", "userId",
-                                            Collections.<String, String>emptyMap(), true);
-        verify(optimizely).getVariableInteger("test_key", "userId",
-                                              Collections.<String, String>emptyMap(), true);
-    }
-
-    @Test
-    public void testBadGetVariableInteger() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
-        optimizelyClient.getVariableInteger("test_key", "userId",
-                                            Collections.<String, String>emptyMap(), true);
-        verify(logger).warn("Optimizely is not initialized, could not get live variable {} " +
-                "for user {}", "test_key", "userId");
-    }
-
-    @Test
-    public void testGoodGetVariableDouble() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(optimizely, logger);
-        optimizelyClient.getVariableDouble("test_key", "userId",
-                                           Collections.<String, String>emptyMap(), true);
-        verify(optimizely).getVariableDouble("test_key", "userId",
-                                             Collections.<String, String>emptyMap(), true);
-    }
-
-    @Test
-    public void testBadGetVariableDouble() {
-        OptimizelyClient optimizelyClient = new OptimizelyClient(null, logger);
-        optimizelyClient.getVariableDouble("test_key", "userId",
-                                           Collections.<String, String>emptyMap(), true);
-        verify(logger).warn("Optimizely is not initialized, could not get live variable {} " +
-                "for user {}", "test_key", "userId");
-    }
-
     //======== Notification listeners ========//
 
     @Test