diff --git a/messaging/axoniq-event-streaming/src/main/java/io/axoniq/framework/messaging/eventstreaming/MultiStreamableEventSource.java b/messaging/axoniq-event-streaming/src/main/java/io/axoniq/framework/messaging/eventstreaming/MultiStreamableEventSource.java index 586e1370327..989e331ee79 100644 --- a/messaging/axoniq-event-streaming/src/main/java/io/axoniq/framework/messaging/eventstreaming/MultiStreamableEventSource.java +++ b/messaging/axoniq-event-streaming/src/main/java/io/axoniq/framework/messaging/eventstreaming/MultiStreamableEventSource.java @@ -114,10 +114,14 @@ public static SourceCollector combining(String sourceName, StreamableEventSource public MessageStream open(StreamingCondition condition, @Nullable ProcessingContext context) { TrackingToken trackingToken = condition.position(); - if (trackingToken == null) { + if (TrackingToken.FIRST.equals(trackingToken)) { // Start from the beginning return DelayedMessageStream.create(createToken(m -> m.firstToken(context)) .thenApply(s -> open(s, condition, context))); + } else if (TrackingToken.LATEST.equals(trackingToken)) { + // Start from the tail, skipping historical events + return DelayedMessageStream.create(createToken(m -> m.latestToken(context)) + .thenApply(s -> open(s, condition, context))); } else if (trackingToken instanceof MultiSourceTrackingToken multiSourceToken) { return open(multiSourceToken, condition, context); } diff --git a/messaging/axoniq-event-streaming/src/test/java/io/axoniq/framework/messaging/eventstreaming/MultiStreamableEventSourceTest.java b/messaging/axoniq-event-streaming/src/test/java/io/axoniq/framework/messaging/eventstreaming/MultiStreamableEventSourceTest.java index 6aba8956cbc..edee1722ba0 100644 --- a/messaging/axoniq-event-streaming/src/test/java/io/axoniq/framework/messaging/eventstreaming/MultiStreamableEventSourceTest.java +++ b/messaging/axoniq-event-streaming/src/test/java/io/axoniq/framework/messaging/eventstreaming/MultiStreamableEventSourceTest.java @@ -67,7 +67,7 @@ void simplePublishAndConsumeFromSingleSource() { eventSourceA.publishMessage(publishedEvent); MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); assertThat(stream.hasNextAvailable()).isTrue(); @@ -86,7 +86,7 @@ void publishAndConsumeFromMultipleSources() { eventSourceB.publishMessage(event2); MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); assertThat(stream.hasNextAvailable()).isTrue(); @@ -115,7 +115,7 @@ void messagesAreOrderedByTimestampByDefault() throws InterruptedException { eventSourceB.publishMessage(event2); MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); MessageStream.Entry first = stream.next().orElseThrow(); @@ -143,7 +143,7 @@ void customComparatorIsUsed() { eventSourceB.publishMessage(EventTestUtils.asEventMessage("EventB")); MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); MessageStream.Entry first = stream.next().orElseThrow(); @@ -160,7 +160,7 @@ void peekDoesNotConsumeMessage() { eventSourceA.publishMessage(event); MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); MessageStream.Entry peeked = stream.peek().orElseThrow(); @@ -216,12 +216,12 @@ void tokenAtReturnsMultiSourceToken() { } @Test - void openWithNullTokenStartsFromBeginning() { + void openWithFirstTokenStartsFromBeginning() { eventSourceA.publishMessage(EventTestUtils.asEventMessage("Event1")); eventSourceB.publishMessage(EventTestUtils.asEventMessage("Event2")); MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); assertThat(stream.hasNextAvailable()).isTrue(); @@ -230,6 +230,25 @@ void openWithNullTokenStartsFromBeginning() { stream.close(); } + @Test + void openWithLatestTokenSkipsExistingEvents() { + eventSourceA.publishMessage(EventTestUtils.asEventMessage("Event1")); + + MessageStream stream = testSubject.open( + StreamingCondition.startingFrom(TrackingToken.LATEST), null + ); + + assertThat(stream.hasNextAvailable()).isFalse(); + + eventSourceA.publishMessage(EventTestUtils.asEventMessage("Event2")); + + assertThat(stream.hasNextAvailable()).isTrue(); + MessageStream.Entry entry = stream.next().orElseThrow(); + assertThat(entry.message().payload()).isEqualTo("Event2"); + + stream.close(); + } + @Test void openWithMultiSourceTokenStartsFromToken() { // Create a token manually representing the position of the first event not yet consumed in each source @@ -270,7 +289,7 @@ void trackingTokenIsUpdatedAsMessagesAreConsumed() { eventSourceB.publishMessage(EventTestUtils.asEventMessage("Event2")); MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); MessageStream.Entry entry1 = stream.next().orElseThrow(); @@ -292,7 +311,7 @@ void streamCompletesWhenAllSourcesComplete() { eventSourceA.publishMessage(EventTestUtils.asEventMessage("Event1")); MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); stream.next(); @@ -308,7 +327,7 @@ void callbackIsInvokedWhenMessagesAreAvailable() { AtomicBoolean callbackInvoked = new AtomicBoolean(false); MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); stream.setCallback(() -> callbackInvoked.set(true)); @@ -375,7 +394,7 @@ void streamsAreClosedWhenOneSourceFailsToOpen() { @Test void emptyStreamReturnsNoMessages() { MessageStream stream = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); assertThat(stream.hasNextAvailable()).isFalse(); @@ -390,10 +409,10 @@ void multipleStreamsCanBeOpenedConcurrently() { eventSourceB.publishMessage(EventTestUtils.asEventMessage("Event2")); MessageStream stream1 = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); MessageStream stream2 = testSubject.open( - StreamingCondition.startingFrom(null), null + StreamingCondition.startingFrom(TrackingToken.FIRST), null ); assertThat(stream1.next()).isPresent();