Fix addTags API in EventMetadata (#2926)

Signed-off-by: Krishna Kondaka <[email protected]> Co-authored-by: Krishna Kondaka <[email protected]>
opensearch-project · Jun 23, 2023 · 5565337 · 5565337
1 parent c2352ba
commit 5565337
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...repper-api/src/main/java/org/opensearch/dataprepper/model/event/DefaultEventMetadata.java b/...repper-api/src/main/java/org/opensearch/dataprepper/model/event/DefaultEventMetadata.java
@@ -97,7 +97,9 @@ public Boolean hasTags(final List<String> tagsList) {
 
     @Override
     public void addTags(final List<String> newTags) {
-        tags.addAll(newTags);
+        if (Objects.nonNull(newTags)) {
+            tags.addAll(newTags);
+        }
     }
 
     @Override

diff --git a/...er-api/src/test/java/org/opensearch/dataprepper/model/event/DefaultEventMetadataTest.java b/...er-api/src/test/java/org/opensearch/dataprepper/model/event/DefaultEventMetadataTest.java
@@ -199,6 +199,18 @@ void fromEventMetadata_returns_matching_EventMetadata() {
         assertThat(copiedMetadata.getAttributes(), not(sameInstance(attributes)));
     }
 
+    @Test
+    public void testEventMetadata_withNullTags() {
+        final String testEventType = UUID.randomUUID().toString();
+
+        final EventMetadata eventMetadata = DefaultEventMetadata.builder()
+                .withEventType(testEventType)
+                .build();
+        assertThat(eventMetadata, notNullValue());
+        eventMetadata.addTags(null);
+        assertThat(eventMetadata.getTags(), equalTo(Collections.emptySet()));
+    }
+
     @Test
     public void testBuild_withTags() {
         final String testEventType = UUID.randomUUID().toString();