Use EventMetadataHelpers class

Author: gthea

events-domain/src/main/java/io/split/android/client/events/metadata/EventMetadataBuilder.java

@@ -15,14 +15,14 @@
  * Values are validated during put operations. Only String, Number, Boolean,
  * and List<String> values are accepted. Invalid values will be silently ignored.
  */
-public class EventMetadataBuilder {
+class EventMetadataBuilder {
 
     private static final MetadataValidator DEFAULT_VALIDATOR = new MetadataValidatorImpl();
 
     private final Map<String, Object> mData = new HashMap<>();
     private final MetadataValidator mValidator;
 
-    public EventMetadataBuilder() {
+    EventMetadataBuilder() {
         this(DEFAULT_VALIDATOR);
     }
 

main/src/main/java/io/split/android/client/localhost/LocalhostSplitsStorage.java

@@ -19,13 +19,12 @@
 import java.util.concurrent.ExecutorService;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import io.split.android.client.api.EventMetadata;
 import io.split.android.client.dtos.Split;
 import io.split.android.client.events.EventsManagerCoordinator;
 import io.split.android.client.events.SplitInternalEvent;
-import io.split.android.client.events.metadata.EventMetadataBuilder;
+import io.split.android.client.events.metadata.EventMetadataHelpers;
 import io.split.android.client.service.ServiceConstants;
 import io.split.android.client.storage.legacy.FileStorage;
 import io.split.android.client.storage.splits.ProcessedSplitChange;
@@ -267,8 +266,6 @@ private void copyFileResourceToDataFolder(String fileName, FileStorage fileStora
 
     private EventMetadata createUpdatedFlagsMetadata() {
         List<String> updatedSplitNames = new ArrayList<>(mInMemorySplits.keySet());
-        return new EventMetadataBuilder()
-                .put("updatedFlags", updatedSplitNames)
-                .build();
+        return EventMetadataHelpers.createUpdatedFlagsMetadata(updatedSplitNames);
     }
 }

main/src/main/java/io/split/android/client/service/splits/SplitInPlaceUpdateTask.java

@@ -11,7 +11,7 @@
 import io.split.android.client.dtos.Split;
 import io.split.android.client.events.ISplitEventsManager;
 import io.split.android.client.events.SplitInternalEvent;
-import io.split.android.client.events.metadata.EventMetadataBuilder;
+import io.split.android.client.events.metadata.EventMetadataHelpers;
 import io.split.android.client.service.executor.SplitTask;
 import io.split.android.client.service.executor.SplitTaskExecutionInfo;
 import io.split.android.client.service.executor.SplitTaskType;
@@ -68,8 +68,6 @@ public SplitTaskExecutionInfo execute() {
 
     private EventMetadata createUpdatedFlagsMetadata(ProcessedSplitChange processedSplitChange) {
         List<String> updatedSplitNames = extractSplitNames(processedSplitChange);
-        return new EventMetadataBuilder()
-                .put("updatedFlags", updatedSplitNames)
-                .build();
+        return EventMetadataHelpers.createUpdatedFlagsMetadata(updatedSplitNames);
     }
 }

main/src/main/java/io/split/android/client/service/splits/SplitsSyncTask.java

@@ -10,7 +10,7 @@
 import io.split.android.client.api.EventMetadata;
 import io.split.android.client.events.ISplitEventsManager;
 import io.split.android.client.events.SplitInternalEvent;
-import io.split.android.client.events.metadata.EventMetadataBuilder;
+import io.split.android.client.events.metadata.EventMetadataHelpers;
 import io.split.android.client.service.ServiceConstants;
 import io.split.android.client.service.executor.SplitTask;
 import io.split.android.client.service.executor.SplitTaskExecutionInfo;
@@ -111,9 +111,7 @@ private void notifyInternalEvent(long storedChangeNumber) {
 
     private EventMetadata createUpdatedFlagsMetadata() {
         List<String> updatedSplitNames = mSplitsSyncHelper.getLastUpdatedSplitNames();
-        return new EventMetadataBuilder()
-                .put("updatedFlags", updatedSplitNames)
-                .build();
+        return EventMetadataHelpers.createUpdatedFlagsMetadata(updatedSplitNames);
     }
 
     private boolean splitsFilterHasChanged(String storedSplitsFilterQueryString) {

main/src/main/java/io/split/android/client/service/splits/SplitsUpdateTask.java

@@ -11,7 +11,7 @@
 import io.split.android.client.api.EventMetadata;
 import io.split.android.client.events.ISplitEventsManager;
 import io.split.android.client.events.SplitInternalEvent;
-import io.split.android.client.events.metadata.EventMetadataBuilder;
+import io.split.android.client.events.metadata.EventMetadataHelpers;
 import io.split.android.client.service.ServiceConstants;
 import io.split.android.client.service.executor.SplitTask;
 import io.split.android.client.service.executor.SplitTaskExecutionInfo;
@@ -86,9 +86,7 @@ public SplitTaskExecutionInfo execute() {
 
     private EventMetadata createUpdatedFlagsMetadata() {
         List<String> updatedSplitNames = mSplitsSyncHelper.getLastUpdatedSplitNames();
-        return new EventMetadataBuilder()
-                .put("updatedFlags", updatedSplitNames)
-                .build();
+        return EventMetadataHelpers.createUpdatedFlagsMetadata(updatedSplitNames);
     }
 
     @VisibleForTesting

main/src/test/java/io/split/android/client/events/EventsManagerCoordinatorTest.java

@@ -107,9 +107,7 @@ public void SPLITS_UPDATEDEventWithMetadataIsPassedDownToChildren() {
         mEventsManager.registerEventsManager(new Key("key", "bucketing"), mMockChildEventsManager);
 
         List<String> updatedFlags = Arrays.asList("flag1", "flag2");
-        EventMetadata metadata = new io.split.android.client.events.metadata.EventMetadataBuilder()
-                .put("updatedFlags", updatedFlags)
-                .build();
+        EventMetadata metadata = io.split.android.client.events.metadata.EventMetadataHelpers.createUpdatedFlagsMetadata(updatedFlags);
 
         mEventsManager.notifyInternalEvent(SplitInternalEvent.SPLITS_UPDATED, metadata);