Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,14 @@ public static SourceCollector combining(String sourceName, StreamableEventSource
public MessageStream<EventMessage> 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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void simplePublishAndConsumeFromSingleSource() {
eventSourceA.publishMessage(publishedEvent);

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

assertThat(stream.hasNextAvailable()).isTrue();
Expand All @@ -86,7 +86,7 @@ void publishAndConsumeFromMultipleSources() {
eventSourceB.publishMessage(event2);

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

assertThat(stream.hasNextAvailable()).isTrue();
Expand Down Expand Up @@ -115,7 +115,7 @@ void messagesAreOrderedByTimestampByDefault() throws InterruptedException {
eventSourceB.publishMessage(event2);

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

MessageStream.Entry<EventMessage> first = stream.next().orElseThrow();
Expand Down Expand Up @@ -143,7 +143,7 @@ void customComparatorIsUsed() {
eventSourceB.publishMessage(EventTestUtils.asEventMessage("EventB"));

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

MessageStream.Entry<EventMessage> first = stream.next().orElseThrow();
Expand All @@ -160,7 +160,7 @@ void peekDoesNotConsumeMessage() {
eventSourceA.publishMessage(event);

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

MessageStream.Entry<EventMessage> peeked = stream.peek().orElseThrow();
Expand Down Expand Up @@ -216,12 +216,12 @@ void tokenAtReturnsMultiSourceToken() {
}

@Test
void openWithNullTokenStartsFromBeginning() {
void openWithFirstTokenStartsFromBeginning() {
eventSourceA.publishMessage(EventTestUtils.asEventMessage("Event1"));
eventSourceB.publishMessage(EventTestUtils.asEventMessage("Event2"));

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

assertThat(stream.hasNextAvailable()).isTrue();
Expand All @@ -230,6 +230,25 @@ void openWithNullTokenStartsFromBeginning() {
stream.close();
}

@Test
void openWithLatestTokenSkipsExistingEvents() {
eventSourceA.publishMessage(EventTestUtils.asEventMessage("Event1"));

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(TrackingToken.LATEST), null
);

assertThat(stream.hasNextAvailable()).isFalse();

eventSourceA.publishMessage(EventTestUtils.asEventMessage("Event2"));

assertThat(stream.hasNextAvailable()).isTrue();
MessageStream.Entry<EventMessage> 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
Expand Down Expand Up @@ -270,7 +289,7 @@ void trackingTokenIsUpdatedAsMessagesAreConsumed() {
eventSourceB.publishMessage(EventTestUtils.asEventMessage("Event2"));

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

MessageStream.Entry<EventMessage> entry1 = stream.next().orElseThrow();
Expand All @@ -292,7 +311,7 @@ void streamCompletesWhenAllSourcesComplete() {
eventSourceA.publishMessage(EventTestUtils.asEventMessage("Event1"));

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

stream.next();
Expand All @@ -308,7 +327,7 @@ void callbackIsInvokedWhenMessagesAreAvailable() {
AtomicBoolean callbackInvoked = new AtomicBoolean(false);

MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

stream.setCallback(() -> callbackInvoked.set(true));
Expand Down Expand Up @@ -375,7 +394,7 @@ void streamsAreClosedWhenOneSourceFailsToOpen() {
@Test
void emptyStreamReturnsNoMessages() {
MessageStream<EventMessage> stream = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

assertThat(stream.hasNextAvailable()).isFalse();
Expand All @@ -390,10 +409,10 @@ void multipleStreamsCanBeOpenedConcurrently() {
eventSourceB.publishMessage(EventTestUtils.asEventMessage("Event2"));

MessageStream<EventMessage> stream1 = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);
MessageStream<EventMessage> stream2 = testSubject.open(
StreamingCondition.startingFrom(null), null
StreamingCondition.startingFrom(TrackingToken.FIRST), null
);

assertThat(stream1.next()).isPresent();
Expand Down
Loading