[FSSDK-12670] Address review feedback: fix log message and null guard

Author: jaeopt

core-api/src/main/java/com/optimizely/ab/odp/ODPEventManager.java

@@ -139,6 +139,11 @@ public void identifyUser(@Nullable String vuid, @Nullable String userId) {
     }
 
     public void identifyUser(@Nonnull Map<String, String> identifiers) {
+        if (identifiers == null) {
+            logger.debug("ODP identify event is not dispatched (fewer than 2 valid identifiers).");
+            return;
+        }
+
         Map<String, String> validIdentifiers = new HashMap<>();
         for (Map.Entry<String, String> entry : identifiers.entrySet()) {
             if (entry.getValue() != null && !entry.getValue().isEmpty()) {
@@ -147,7 +152,7 @@ public void identifyUser(@Nonnull Map<String, String> identifiers) {
         }
 
         if (validIdentifiers.size() < 2) {
-            logger.debug("ODP identify event is not dispatched (only one identifier provided).");
+            logger.debug("ODP identify event is not dispatched (fewer than 2 valid identifiers).");
             return;
         }
 

core-api/src/test/java/com/optimizely/ab/odp/ODPEventManagerTest.java

@@ -305,9 +305,9 @@ public void identifyUserWithMultipleIdentifiers() throws InterruptedException {
 
         ODPEvent event = captor.getValue();
         Map<String, String> eventIdentifiers = event.getIdentifiers();
-        assertEquals(eventIdentifiers.size(), 2);
-        assertEquals(eventIdentifiers.get("vuid"), "vuid_123");
-        assertEquals(eventIdentifiers.get("fs_user_id"), "test-user");
+        assertEquals(2, eventIdentifiers.size());
+        assertEquals("vuid_123", eventIdentifiers.get("vuid"));
+        assertEquals("test-user", eventIdentifiers.get("fs_user_id"));
     }
 
     @Test
@@ -318,7 +318,7 @@ public void identifyUserSkippedWithSingleIdentifier() throws InterruptedExceptio
         identifiers.put("fs_user_id", "test-user");
         eventManager.identifyUser(identifiers);
         verify(eventManager, never()).sendEvent(any(ODPEvent.class));
-        logbackVerifier.expectMessage(Level.DEBUG, "ODP identify event is not dispatched (only one identifier provided).");
+        logbackVerifier.expectMessage(Level.DEBUG, "ODP identify event is not dispatched (fewer than 2 valid identifiers).");
     }
 
     @Test
@@ -331,7 +331,7 @@ public void identifyUserSkippedWithEmptyValues() throws InterruptedException {
         identifiers.put("email", "");
         eventManager.identifyUser(identifiers);
         verify(eventManager, never()).sendEvent(any(ODPEvent.class));
-        logbackVerifier.expectMessage(Level.DEBUG, "ODP identify event is not dispatched (only one identifier provided).");
+        logbackVerifier.expectMessage(Level.DEBUG, "ODP identify event is not dispatched (fewer than 2 valid identifiers).");
     }
 
     @Test
@@ -344,7 +344,7 @@ public void identifyUserSkippedWithNullValues() throws InterruptedException {
         identifiers.put("vuid", null);
         eventManager.identifyUser(identifiers);
         verify(eventManager, never()).sendEvent(any(ODPEvent.class));
-        logbackVerifier.expectMessage(Level.DEBUG, "ODP identify event is not dispatched (only one identifier provided).");
+        logbackVerifier.expectMessage(Level.DEBUG, "ODP identify event is not dispatched (fewer than 2 valid identifiers).");
     }
 
     @Test
@@ -354,7 +354,7 @@ public void identifyUserSkippedWithEmptyMap() throws InterruptedException {
         Map<String, String> identifiers = new HashMap<>();
         eventManager.identifyUser(identifiers);
         verify(eventManager, never()).sendEvent(any(ODPEvent.class));
-        logbackVerifier.expectMessage(Level.DEBUG, "ODP identify event is not dispatched (only one identifier provided).");
+        logbackVerifier.expectMessage(Level.DEBUG, "ODP identify event is not dispatched (fewer than 2 valid identifiers).");
     }
 
     @Test