Rename new notifications

splitio · Sep 3, 2024 · cc17b1f · cc17b1f
1 parent c1a7c25
commit cc17b1f
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 33 deletions.
diff --git a/src/androidTest/java/tests/integration/shared/TestingData.java b/src/androidTest/java/tests/integration/shared/TestingData.java
@@ -123,7 +123,7 @@ public static String segmentsUnboundedNoCompression(String intervalMs) {
 
     public static String largeSegmentsUnboundedNoCompression(String intervalMs) {
         return "{" +
-                "\\\"type\\\":\\\"MEMBERSHIP_LS_UPDATE\\\"" +
+                "\\\"type\\\":\\\"MEMBERSHIPS_LS_UPDATE\\\"" +
                 ",\\\"cn\\\":1702507130121," +
                 "\\\"n\\\":[\\\"android_test\\\",\\\"ios_test\\\"]," +
                 "\\\"c\\\":0," +
@@ -137,7 +137,7 @@ public static String largeSegmentsUnboundedNoCompression(String intervalMs) {
 
     public static String largeSegmentsRemoval() {
         return "{" +
-                "\\\"type\\\":\\\"MEMBERSHIP_LS_UPDATE\\\"" +
+                "\\\"type\\\":\\\"MEMBERSHIPS_LS_UPDATE\\\"" +
                 ",\\\"cn\\\":1702507130121," +
                 "\\\"n\\\":[\\\"large-segment1\\\",\\\"large-segment2\\\"]," +
                 "\\\"c\\\":0," +

diff --git a/...n/java/io/split/android/client/service/sseclient/notifications/NotificationProcessor.java b/...n/java/io/split/android/client/service/sseclient/notifications/NotificationProcessor.java
@@ -48,8 +48,8 @@ public void process(IncomingNotification incomingNotification) {
                 case SPLIT_KILL:
                     processSplitKill(mNotificationParser.parseSplitKill(notificationJson));
                     break;
-                case MEMBERSHIP_MS_UPDATE:
-                case MEMBERSHIP_LS_UPDATE:
+                case MEMBERSHIPS_MS_UPDATE:
+                case MEMBERSHIPS_LS_UPDATE:
                     processMembershipsUpdate(mNotificationParser.parseMembershipNotification(notificationJson));
                     break;
                 default:

diff --git a/src/main/java/io/split/android/client/service/sseclient/notifications/NotificationType.java b/src/main/java/io/split/android/client/service/sseclient/notifications/NotificationType.java
@@ -14,8 +14,8 @@ public enum NotificationType {
     @SerializedName("ERROR")
     ERROR,
 
-    @SerializedName("MEMBERSHIP_LS_UPDATE")
-    MEMBERSHIP_LS_UPDATE,
-    @SerializedName("MEMBERSHIP_MS_UPDATE")
-    MEMBERSHIP_MS_UPDATE,
+    @SerializedName("MEMBERSHIPS_LS_UPDATE")
+    MEMBERSHIPS_LS_UPDATE,
+    @SerializedName("MEMBERSHIPS_MS_UPDATE")
+    MEMBERSHIPS_MS_UPDATE,
 }
diff --git a/...ent/service/sseclient/notifications/memberships/MembershipsNotificationProcessorImpl.java b/...ent/service/sseclient/notifications/memberships/MembershipsNotificationProcessorImpl.java
@@ -94,14 +94,14 @@ private void processUpdate(NotificationType notificationType, MySegmentUpdateStr
                     break;
             }
         } catch (Exception e) {
-            Logger.e("Executing unbounded fetch because an error has occurred processing my "+(notificationType == NotificationType.MEMBERSHIP_LS_UPDATE ? "large" : "")+" segment notification: " + e.getLocalizedMessage());
+            Logger.e("Executing unbounded fetch because an error has occurred processing my "+(notificationType == NotificationType.MEMBERSHIPS_LS_UPDATE ? "large" : "")+" segment notification: " + e.getLocalizedMessage());
             notifyMySegmentRefreshNeeded(notificationsQueue, syncDelay, notificationType, changeNumber);
         }
     }
 
     private void notifyMySegmentRefreshNeeded(BlockingQueue<MySegmentUpdateParams> notificationsQueue, long syncDelay, NotificationType notificationType, Long changeNumber) {
-        Long targetSegmentsCn = (notificationType == NotificationType.MEMBERSHIP_MS_UPDATE) ? changeNumber : null;
-        Long targetLargeSegmentsCn = (notificationType == NotificationType.MEMBERSHIP_LS_UPDATE) ? changeNumber : null;
+        Long targetSegmentsCn = (notificationType == NotificationType.MEMBERSHIPS_MS_UPDATE) ? changeNumber : null;
+        Long targetLargeSegmentsCn = (notificationType == NotificationType.MEMBERSHIPS_LS_UPDATE) ? changeNumber : null;
 
         //noinspection ResultOfMethodCallIgnored
         notificationsQueue.offer(new MySegmentUpdateParams(syncDelay, targetSegmentsCn, targetLargeSegmentsCn));
@@ -112,7 +112,7 @@ private void removeSegment(NotificationType notificationType, Set<String> segmen
         if (segmentNames == null) {
             return;
         }
-        MySegmentsUpdateTask task = (notificationType == NotificationType.MEMBERSHIP_LS_UPDATE) ?
+        MySegmentsUpdateTask task = (notificationType == NotificationType.MEMBERSHIPS_LS_UPDATE) ?
                 mConfiguration.getMySegmentsTaskFactory().createMyLargeSegmentsUpdateTask(false, segmentNames, changeNumber) :
                 mConfiguration.getMySegmentsTaskFactory().createMySegmentsUpdateTask(false, segmentNames, changeNumber);
         mSplitTaskExecutor.submit(task, null);
@@ -139,7 +139,7 @@ private void updateSegments(NotificationType notificationType, String keyListStr
             return;
         }
 
-        boolean largeSegmentsUpdate = notificationType == NotificationType.MEMBERSHIP_LS_UPDATE;
+        boolean largeSegmentsUpdate = notificationType == NotificationType.MEMBERSHIPS_LS_UPDATE;
         Logger.d("Executing KeyList my "+ (largeSegmentsUpdate ? "large " : "") +"segment fetch request: Adding = " + actionIsAdd);
         MySegmentsUpdateTask task = largeSegmentsUpdate ? mConfiguration.getMySegmentsTaskFactory().createMyLargeSegmentsUpdateTask(actionIsAdd, segmentNames, changeNumber) :
                 mConfiguration.getMySegmentsTaskFactory().createMySegmentsUpdateTask(actionIsAdd, segmentNames, changeNumber);

diff --git a/src/main/java/io/split/android/client/service/sseclient/sseclient/SseHandler.java b/src/main/java/io/split/android/client/service/sseclient/sseclient/SseHandler.java
@@ -64,6 +64,7 @@ public boolean isConnectionConfirmed(Map<String, String> values) {
     public void handleIncomingMessage(Map<String, String> values) {
 
         String messageData = values.get(EventStreamParser.DATA_FIELD);
+
         if (messageData != null) {
             if (mNotificationParser.isError(values)) {
                 handleError(messageData);
@@ -84,8 +85,8 @@ public void handleIncomingMessage(Map<String, String> values) {
                     break;
                 case SPLIT_KILL:
                 case SPLIT_UPDATE:
-                case MEMBERSHIP_MS_UPDATE:
-                case MEMBERSHIP_LS_UPDATE:
+                case MEMBERSHIPS_MS_UPDATE:
+                case MEMBERSHIPS_LS_UPDATE:
                     if (mNotificationManagerKeeper.isStreamingActive()) {
                         mNotificationProcessor.process(incomingNotification);
                     }

diff --git a/src/test/java/io/split/android/client/service/sseclient/NotificationParserTest.java b/src/test/java/io/split/android/client/service/sseclient/NotificationParserTest.java
@@ -1,7 +1,7 @@
 package io.split.android.client.service.sseclient;
 
 import static org.junit.Assert.assertEquals;
-import static io.split.android.client.service.sseclient.notifications.NotificationType.MEMBERSHIP_LS_UPDATE;
+import static io.split.android.client.service.sseclient.notifications.NotificationType.MEMBERSHIPS_LS_UPDATE;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -38,7 +38,7 @@ public class NotificationParserTest {
 
     private final static String CONTROL = "{\"id\":\"x2dE2TEiJL:0:0\",\"clientId\":\"NDEzMTY5Mzg0MA==:OTc5Nzc4NDYz\",\"timestamp\":1584647533288,\"encoding\":\"json\",\"channel\":\"control_pri\",\"data\":\"{\\\"type\\\":\\\"CONTROL\\\",\\\"controlType\\\":\\\"STREAMING_RESUMED\\\"}\"}";
 
-    private static final String MY_LARGE_SEGMENTS_UPDATE = "{\"id\": \"diSrQttrC9:0:0\",\"clientId\": \"pri:MjcyNDE2NDUxMA==\",\"timestamp\": 1702507131100,\"encoding\": \"json\",\"channel\": \"NzM2MDI5Mzc0_MTc1MTYwODQxMQ==_memberships\",\"data\": \"{\\\"type\\\":\\\"MEMBERSHIP_LS_UPDATE\\\",\\\"cn\\\":1702507130121,\\\"n\\\":[\\\"android_test\\\"],\\\"c\\\":2,\\\"u\\\":2,\\\"d\\\":\\\"eJwEwLsRwzAMA9BdWKsg+IFBraJTkRXS5rK7388+tg+KdC8+jq4eBBQLFcUnO8FAAC36gndOSEyFqJFP32Vf2+f+3wAAAP//hUQQ9A==\\\",\\\"i\\\":100,\\\"h\\\":1,\\\"s\\\":325}\"}";
+    private static final String MY_LARGE_SEGMENTS_UPDATE = "{\"id\": \"diSrQttrC9:0:0\",\"clientId\": \"pri:MjcyNDE2NDUxMA==\",\"timestamp\": 1702507131100,\"encoding\": \"json\",\"channel\": \"NzM2MDI5Mzc0_MTc1MTYwODQxMQ==_memberships\",\"data\": \"{\\\"type\\\":\\\"MEMBERSHIPS_LS_UPDATE\\\",\\\"cn\\\":1702507130121,\\\"n\\\":[\\\"android_test\\\"],\\\"c\\\":2,\\\"u\\\":2,\\\"d\\\":\\\"eJwEwLsRwzAMA9BdWKsg+IFBraJTkRXS5rK7388+tg+KdC8+jq4eBBQLFcUnO8FAAC36gndOSEyFqJFP32Vf2+f+3wAAAP//hUQQ9A==\\\",\\\"i\\\":100,\\\"h\\\":1,\\\"s\\\":325}\"}";
 
     @Before
     public void setup() {
@@ -138,8 +138,8 @@ public void NoCrashIfisNullEventError() {
     public void parseMyLargeSegmentsIncomingNotification() {
         IncomingNotification incoming = mParser.parseIncoming(MY_LARGE_SEGMENTS_UPDATE);
 
-        assertEquals(MEMBERSHIP_LS_UPDATE, incoming.getType());
-        assertEquals("{\"type\":\"MEMBERSHIP_LS_UPDATE\",\"cn\":1702507130121,\"n\":[\"android_test\"],\"c\":2,\"u\":2,\"d\":\"eJwEwLsRwzAMA9BdWKsg+IFBraJTkRXS5rK7388+tg+KdC8+jq4eBBQLFcUnO8FAAC36gndOSEyFqJFP32Vf2+f+3wAAAP//hUQQ9A==\",\"i\":100,\"h\":1,\"s\":325}", incoming.getJsonData());
+        assertEquals(MEMBERSHIPS_LS_UPDATE, incoming.getType());
+        assertEquals("{\"type\":\"MEMBERSHIPS_LS_UPDATE\",\"cn\":1702507130121,\"n\":[\"android_test\"],\"c\":2,\"u\":2,\"d\":\"eJwEwLsRwzAMA9BdWKsg+IFBraJTkRXS5rK7388+tg+KdC8+jq4eBBQLFcUnO8FAAC36gndOSEyFqJFP32Vf2+f+3wAAAP//hUQQ9A==\",\"i\":100,\"h\":1,\"s\":325}", incoming.getJsonData());
         assertEquals("NzM2MDI5Mzc0_MTc1MTYwODQxMQ==_memberships", incoming.getChannel());
         assertEquals(1702507131100L, incoming.getTimestamp());
     }

diff --git a/src/test/java/io/split/android/client/service/sseclient/NotificationProcessorTest.java b/src/test/java/io/split/android/client/service/sseclient/NotificationProcessorTest.java
@@ -95,7 +95,7 @@ public void notificationProcessorDelegatesMySegmentsNotificationsV2ToRegisteredP
         MembershipNotification mySegmentChangeNotification = mock(MembershipNotification.class);
 
         when(mySegmentChangeNotification.getJsonData()).thenReturn("{}");
-        when(mIncomingNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
+        when(mIncomingNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
         when(mNotificationParser.parseMembershipNotification(anyString())).thenReturn(mySegmentChangeNotification);
 
         mNotificationProcessor.registerMembershipsNotificationProcessor("1", mySegmentsNotificationProcessor);

diff --git a/src/test/java/io/split/android/client/service/sseclient/SseHandlerTest.java b/src/test/java/io/split/android/client/service/sseclient/SseHandlerTest.java
@@ -102,7 +102,7 @@ public void incomingSplitKill() {
     public void incomingMembershipUpdate() {
 
         IncomingNotification incomingNotification =
-                new IncomingNotification(NotificationType.MEMBERSHIP_MS_UPDATE, "", "", 100);
+                new IncomingNotification(NotificationType.MEMBERSHIPS_MS_UPDATE, "", "", 100);
         MembershipNotification notification = new MembershipNotification();
 
         when(mNotificationParser.parseIncoming(anyString())).thenReturn(incomingNotification);
@@ -118,7 +118,7 @@ public void incomingMembershipUpdate() {
     public void incomingLargeMembershipUpdate() {
 
         IncomingNotification incomingNotification =
-                new IncomingNotification(NotificationType.MEMBERSHIP_LS_UPDATE, "", "", 100);
+                new IncomingNotification(NotificationType.MEMBERSHIPS_LS_UPDATE, "", "", 100);
         MembershipNotification notification = new MembershipNotification();
 
         when(mNotificationParser.parseIncoming(anyString())).thenReturn(incomingNotification);
@@ -134,7 +134,7 @@ public void incomingLargeMembershipUpdate() {
     public void streamingPaused() {
 
         IncomingNotification incomingNotification =
-                new IncomingNotification(NotificationType.MEMBERSHIP_LS_UPDATE, "", "", 100);
+                new IncomingNotification(NotificationType.MEMBERSHIPS_LS_UPDATE, "", "", 100);
         MembershipNotification notification = new MembershipNotification();
 
         when(mNotificationParser.parseIncoming(anyString())).thenReturn(incomingNotification);

diff --git a/...t/service/sseclient/notifications/mysegments/MySegmentsNotificationProcessorImplTest.java b/...t/service/sseclient/notifications/mysegments/MySegmentsNotificationProcessorImplTest.java
@@ -105,7 +105,7 @@ public void mySegmentsUpdateV2UnboundedNotification() {
         MembershipNotification mySegmentChangeNotification
                 = mock(MembershipNotification.class);
         when(mySegmentChangeNotification.getUpdateStrategy()).thenReturn(MySegmentUpdateStrategy.UNBOUNDED_FETCH_REQUEST);
-        when(mySegmentChangeNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
+        when(mySegmentChangeNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
         when(mNotificationParser.parseMembershipNotification(anyString())).thenReturn(mySegmentChangeNotification);
 
         mNotificationProcessor.process(mySegmentChangeNotification);
@@ -119,7 +119,7 @@ public void mySegmentsUpdateV2RemovalNotification() {
         String segmentName = "ToRemove";
         when(mMsMembershipNotification.getUpdateStrategy()).thenReturn(MySegmentUpdateStrategy.SEGMENT_REMOVAL);
         when(mMsMembershipNotification.getNames()).thenReturn(Collections.singleton(segmentName));
-        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
+        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
         when(mMsMembershipNotification.getChangeNumber()).thenReturn(25L);
         when(mNotificationParser.parseMembershipNotification(anyString())).thenReturn(mMsMembershipNotification);
 
@@ -150,8 +150,8 @@ public void mySegmentsUpdateV2BoundedNotification(boolean hasToFetch) {
                 = mock(MembershipNotification.class);
         when(mySegmentChangeNotification.getUpdateStrategy()).thenReturn(MySegmentUpdateStrategy.BOUNDED_FETCH_REQUEST);
         when(mySegmentChangeNotification.getData()).thenReturn("dummy");
-        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
-        when(mySegmentChangeNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
+        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
+        when(mySegmentChangeNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
         try {
             when(mMySegmentsPayloadDecoder.decodeAsBytes(anyString(), any())).thenReturn(new byte[]{});
         } catch (MySegmentsParsingException e) {
@@ -191,8 +191,8 @@ public void mySegmentsUpdateV2KeyListNotificationErrorFallback() throws MySegmen
                 = mock(MembershipNotification.class);
         when(mySegmentChangeNotification.getUpdateStrategy()).thenReturn(MySegmentUpdateStrategy.KEY_LIST);
         when(mySegmentChangeNotification.getNames()).thenReturn(Collections.singleton("s1"));
-        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
-        when(mySegmentChangeNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
+        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
+        when(mySegmentChangeNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
         when(mMySegmentsPayloadDecoder.decodeAsString(anyString(), any())).thenThrow(MySegmentsParsingException.class);
 
         mNotificationProcessor.process(mMsMembershipNotification);
@@ -208,8 +208,8 @@ public void mySegmentsUpdateV2BoundedNotificationErrorFallback() throws MySegmen
                 = mock(MembershipNotification.class);
         when(mySegmentChangeNotification.getUpdateStrategy()).thenReturn(MySegmentUpdateStrategy.BOUNDED_FETCH_REQUEST);
         when(mySegmentChangeNotification.getNames()).thenReturn(Collections.singleton("s1"));
-        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
-        when(mySegmentChangeNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
+        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
+        when(mySegmentChangeNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
         when(mMySegmentsPayloadDecoder.decodeAsBytes(anyString(), any())).thenThrow(MySegmentsParsingException.class);
 
         mNotificationProcessor.process(mMsMembershipNotification);
@@ -237,8 +237,8 @@ private void mySegmentsUpdateV2KeyListNotification(String segmentName, KeyList.A
         when(mMsMembershipNotification.getUpdateStrategy()).thenReturn(MySegmentUpdateStrategy.KEY_LIST);
         when(mMsMembershipNotification.getNames()).thenReturn(Collections.singleton(segmentName));
         when(mMsMembershipNotification.getChangeNumber()).thenReturn(123456L);
-        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
-        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIP_MS_UPDATE);
+        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
+        when(mMsMembershipNotification.getType()).thenReturn(NotificationType.MEMBERSHIPS_MS_UPDATE);
         try {
             when(mMySegmentsPayloadDecoder.decodeAsString(anyString(), any())).thenReturn("");
         } catch (MySegmentsParsingException e) {