diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/JacksonEvent.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/JacksonEvent.java index fe04059153..09a0705e0e 100644 --- a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/JacksonEvent.java +++ b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/event/JacksonEvent.java @@ -540,7 +540,7 @@ public abstract static class Builder> { private String eventType; private Instant timeReceived; private Map eventMetadataAttributes; - protected EventHandle eventHandle; + protected transient EventHandle eventHandle; public abstract T getThis(); diff --git a/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/JacksonEventTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/JacksonEventTest.java index 90645d2961..68f9c6b19b 100644 --- a/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/JacksonEventTest.java +++ b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/event/JacksonEventTest.java @@ -36,6 +36,7 @@ import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -577,6 +578,20 @@ public void testBuild_withEventType() { assertThat(event.getEventHandle().getInternalOriginationTime(), is(notNullValue())); } + @Test + public void testBuild_withEventHandle() { + final Instant now = Instant.now(); + + EventHandle eventHandle = new DefaultEventHandle(now); + event = JacksonEvent.builder() + .withEventType(eventType) + .withEventHandle(eventHandle) + .build(); + + assertThat(event.getEventHandle(), is(eventHandle)); + assertThat(event.getEventHandle().getInternalOriginationTime(), is(equalTo(now))); + } + @Test public void testBuild_withTimeReceived() { @@ -860,6 +875,7 @@ void fromEvent_with_a_JacksonEvent() { assertThat(createdEvent, notNullValue()); assertThat(createdEvent, not(sameInstance(originalEvent))); assertThat(event.getEventHandle(), is(notNullValue())); + assertTrue(event.getEventHandle() instanceof DefaultEventHandle); assertThat(event.getEventHandle().getInternalOriginationTime(), is(notNullValue())); assertThat(createdEvent.toMap(), equalTo(dataObject));