Feat: Added notification listener handler functions to support latest changes (#273)

Author: mnoman09

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

@@ -30,7 +30,11 @@
 import com.optimizely.ab.event.LogEvent;
 import com.optimizely.ab.internal.ReservedEventKey;
 import com.optimizely.ab.notification.ActivateNotificationListener;
+import com.optimizely.ab.notification.DecisionNotification;
 import com.optimizely.ab.notification.NotificationCenter;
+import com.optimizely.ab.notification.NotificationHandler;
+import com.optimizely.ab.notification.NotificationManager;
+import com.optimizely.ab.notification.TrackNotification;
 import com.optimizely.ab.notification.TrackNotificationListener;
 
 import org.junit.Assert;
@@ -58,6 +62,7 @@
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 import static org.hamcrest.Matchers.hasEntry;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeTrue;
 import static org.mockito.Mockito.mock;
@@ -1757,4 +1762,80 @@ public void testBadGetFeatureVariableString() {
                 GENERIC_USER_ID
         );
     }
+
+    @Test
+    public void testAddDecisionNotificationHandler() {
+        assumeTrue(datafileVersion == Integer.parseInt(ProjectConfig.Version.V4.toString()));
+
+        OptimizelyClient optimizelyClient = new OptimizelyClient(
+                optimizely,
+                logger
+        );
+
+        int notificationId = optimizelyClient.addDecisionNotificationHandler(decisionNotification -> {});
+        assertTrue(optimizelyClient.getNotificationCenter().removeNotificationListener(notificationId));
+    }
+
+    @Test
+    public void testAddTrackNotificationHandler() {
+        OptimizelyClient optimizelyClient = new OptimizelyClient(
+                optimizely,
+                logger
+        );
+        NotificationManager<TrackNotification> manager = optimizely.getNotificationCenter()
+                .getNotificationManager(TrackNotification.class);
+
+        int notificationId = optimizelyClient.addTrackNotificationHandler(trackNotification -> {});
+        assertTrue(manager.remove(notificationId));
+    }
+
+    @Test
+    public void testAddingTrackNotificationHandlerWithInvalidOptimizely() {
+        OptimizelyClient optimizelyClient = new OptimizelyClient(
+                null,
+                logger
+        );
+        NotificationManager<TrackNotification> manager = optimizely.getNotificationCenter()
+                .getNotificationManager(TrackNotification.class);
+
+        int notificationId = optimizelyClient.addTrackNotificationHandler(trackNotification -> {});
+        assertEquals(-1, notificationId);
+        assertFalse(manager.remove(notificationId));
+    }
+
+    @Test
+    public void testAddingDecisionNotificationHandlerWithInvalidOptimizely() {
+        assumeTrue(datafileVersion == Integer.parseInt(ProjectConfig.Version.V4.toString()));
+
+        OptimizelyClient optimizelyClient = new OptimizelyClient(
+                null,
+                logger
+        );
+        NotificationManager<DecisionNotification> manager = optimizely.getNotificationCenter()
+                .getNotificationManager(DecisionNotification.class);
+        int notificationId = optimizelyClient.addDecisionNotificationHandler(decisionNotification -> {});
+        assertEquals(-1, notificationId);
+        assertFalse(manager.remove(notificationId));
+    }
+
+    @Test
+    public void testAddingDecisionNotificationHandlerTwice() {
+        assumeTrue(datafileVersion == Integer.parseInt(ProjectConfig.Version.V4.toString()));
+
+        OptimizelyClient optimizelyClient = new OptimizelyClient(
+                optimizely,
+                logger
+        );
+        NotificationHandler<DecisionNotification> decisionNotificationHandler = new NotificationHandler<DecisionNotification>() {
+            @Override
+            public void handle(DecisionNotification decisionNotification) {
+            }
+        };
+        int notificationId = optimizelyClient.addDecisionNotificationHandler(decisionNotificationHandler);
+        int notificationId2 = optimizelyClient.addDecisionNotificationHandler(decisionNotificationHandler);
+        assertNotEquals(-1, notificationId);
+        assertEquals(-1, notificationId2);
+        assertTrue(optimizelyClient.getNotificationCenter().removeNotificationListener(notificationId));
+        assertFalse(optimizelyClient.getNotificationCenter().removeNotificationListener(notificationId2));
+    }
 }

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

@@ -24,7 +24,10 @@
 import com.optimizely.ab.UnknownEventTypeException;
 import com.optimizely.ab.config.ProjectConfig;
 import com.optimizely.ab.config.Variation;
+import com.optimizely.ab.notification.DecisionNotification;
 import com.optimizely.ab.notification.NotificationCenter;
+import com.optimizely.ab.notification.NotificationHandler;
+import com.optimizely.ab.notification.TrackNotification;
 
 import org.slf4j.Logger;
 
@@ -655,6 +658,36 @@ String getFeatureVariableString(@NonNull String featureKey,
         }
     }
 
+    //======== Notification APIs ========//
+
+    /**
+     * Convenience method for adding DecisionNotification Handlers
+     * @return notificationId or -1 if notification is not added
+     */
+    @Nullable
+    public int addDecisionNotificationHandler(NotificationHandler<DecisionNotification> handler) {
+        if (isValid()) {
+            return optimizely.addDecisionNotificationHandler(handler);
+        } else {
+            logger.warn("Optimizely is not initialized, could not add the notification listener");
+        }
+        return -1;
+    }
+
+    /**
+     * Convenience method for adding TrackNotification Handlers
+     * @return notificationId or -1 if notification is not added
+     */
+    public int addTrackNotificationHandler(NotificationHandler<TrackNotification> handler) {
+        if (isValid()) {
+            return optimizely.addTrackNotificationHandler(handler);
+        } else {
+            logger.warn("Optimizely is not initialized, could not add the notification listener");
+        }
+
+        return -1;
+    }
+
     /**
      * Return the notification center {@link NotificationCenter} used to add notifications for events
      * such as Activate and track.

build.gradle

@@ -34,7 +34,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -53,7 +53,7 @@ ext {
     build_tools_version = "28.0.3"
     min_sdk_version = 14
     target_sdk_version = 28
-    java_core_ver = "3.0.1"
+    java_core_ver = "3.1.0"
     android_logger_ver = "1.3.6"
     jacksonversion= "2.9.8"
     support_annotations_ver = "24.2.1"