Skip to content
Merged
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<sonar.organization>axoniq</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>

<axonserver.api.version>2025.2.0</axonserver.api.version>
<axonserver.api.version>2026.0.0-SNAPSHOT</axonserver.api.version>

<grpc.version>1.76.0</grpc.version>
<protobuf.version>4.34.0</protobuf.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package io.axoniq.axonserver.connector.event;

import io.axoniq.axonserver.grpc.event.Confirmation;
import io.axoniq.axonserver.grpc.event.ConfirmationWithConsistencyMarker;
import io.axoniq.axonserver.grpc.event.Event;

import java.util.concurrent.CompletableFuture;
Expand All @@ -39,7 +39,7 @@ public interface AppendEventsTransaction {
*
* @return a CompletableFuture resolving the confirmation of the successful processing of the transaction
*/
CompletableFuture<Confirmation> commit();
CompletableFuture<ConfirmationWithConsistencyMarker> commit();

/**
* Rolls back the transaction.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import io.axoniq.axonserver.connector.ResultStream;
import io.axoniq.axonserver.grpc.InstructionAck;
import io.axoniq.axonserver.grpc.event.Confirmation;
import io.axoniq.axonserver.grpc.event.ConfirmationWithConsistencyMarker;
import io.axoniq.axonserver.grpc.event.Event;
import io.axoniq.axonserver.grpc.streams.CreateResult;
import io.axoniq.axonserver.grpc.streams.CreateStreamResponse;
import io.axoniq.axonserver.grpc.streams.StreamStatus;

import java.time.Duration;
Expand Down Expand Up @@ -105,7 +105,7 @@ default CompletableFuture<String> reschedule(String scheduleToken, Duration trig
* @return a {@link CompletableFuture} resolving the confirmation of the successful processing of the append
* transaction
*/
default CompletableFuture<Confirmation> appendEvents(Event... events) {
default CompletableFuture<ConfirmationWithConsistencyMarker> appendEvents(Event... events) {
AppendEventsTransaction tx = startAppendEventsTransaction();
for (Event event : events) {
tx.appendEvent(event);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package io.axoniq.axonserver.connector.event.impl;

import io.axoniq.axonserver.connector.event.AppendEventsTransaction;
import io.axoniq.axonserver.grpc.event.Confirmation;
import io.axoniq.axonserver.grpc.event.ConfirmationWithConsistencyMarker;
import io.axoniq.axonserver.grpc.event.Event;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
Expand All @@ -31,16 +31,16 @@
public class AppendEventsTransactionImpl implements AppendEventsTransaction {

private final StreamObserver<Event> stream;
private final CompletableFuture<Confirmation> result;
private final CompletableFuture<ConfirmationWithConsistencyMarker> result;

/**
* Constructs a {@link AppendEventsTransactionImpl} used to append events to the Event Store.
*
* @param stream the {@link StreamObserver} of {@link Event} instances which should be appended
* @param result a {@link CompletableFuture} resolving the {@link Confirmation} of the successful processing of this
* @param result a {@link CompletableFuture} resolving the {@link ConfirmationWithConsistencyMarker} of the successful processing of this
* transaction
*/
public AppendEventsTransactionImpl(StreamObserver<Event> stream, CompletableFuture<Confirmation> result) {
public AppendEventsTransactionImpl(StreamObserver<Event> stream, CompletableFuture<ConfirmationWithConsistencyMarker> result) {
this.stream = stream;
this.result = result;
}
Expand All @@ -52,7 +52,7 @@ public AppendEventsTransaction appendEvent(Event event) {
}

@Override
public CompletableFuture<Confirmation> commit() {
public CompletableFuture<ConfirmationWithConsistencyMarker> commit() {
stream.onCompleted();
return result;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import io.axoniq.axonserver.grpc.control.ClientIdentification;
import io.axoniq.axonserver.grpc.event.CancelScheduledEventRequest;
import io.axoniq.axonserver.grpc.event.Confirmation;
import io.axoniq.axonserver.grpc.event.ConfirmationWithConsistencyMarker;
import io.axoniq.axonserver.grpc.event.Event;
import io.axoniq.axonserver.grpc.event.EventSchedulerGrpc;
import io.axoniq.axonserver.grpc.event.EventStoreGrpc;
Expand Down Expand Up @@ -152,7 +153,7 @@ public boolean isReady() {

@Override
public AppendEventsTransaction startAppendEventsTransaction() {
FutureStreamObserver<Confirmation> result = new FutureStreamObserver<>(null);
FutureStreamObserver<ConfirmationWithConsistencyMarker> result = new FutureStreamObserver<>(null);
StreamObserver<Event> clientStream = eventStore.appendEvent(result);
return new AppendEventsTransactionImpl(clientStream, result);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.axoniq.axonserver.connector.ResultStream;
import io.axoniq.axonserver.connector.impl.StreamClosedException;
import io.axoniq.axonserver.grpc.InstructionAck;
import io.axoniq.axonserver.grpc.event.Confirmation;
import io.axoniq.axonserver.grpc.event.ConfirmationWithConsistencyMarker;
import io.axoniq.axonserver.grpc.event.Event;
import io.axoniq.axonserver.grpc.event.EventWithToken;
import org.junit.jupiter.api.AfterEach;
Expand Down Expand Up @@ -103,11 +103,11 @@ void testCallbackNotifiedOfAvailableEvent() throws Exception {

CountDownLatch dataAvailable = new CountDownLatch(1);

CompletableFuture<Confirmation> result = publishingEventChannel
CompletableFuture<ConfirmationWithConsistencyMarker> result = publishingEventChannel
.startAppendEventsTransaction()
.appendEvent(createEvent("Hello world"))
.commit();
Confirmation confirmation = result.get(1, SECONDS);
ConfirmationWithConsistencyMarker confirmation = result.get(1, SECONDS);

assertTrue(confirmation.getSuccess());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import io.axoniq.axonserver.connector.AbstractAxonServerIntegrationTest;
import io.axoniq.axonserver.grpc.control.ClientIdentification;
import io.axoniq.axonserver.grpc.event.Confirmation;
import io.axoniq.axonserver.grpc.event.ConfirmationWithConsistencyMarker;
import io.axoniq.axonserver.grpc.event.Event;
import io.axoniq.axonserver.grpc.event.EventStoreGrpc;
import io.grpc.ConnectivityState;
Expand Down Expand Up @@ -170,7 +170,7 @@ void testCallOnDisconnectedChannelFailImmediately() throws IOException {

EventStoreGrpc.EventStoreStub stub = EventStoreGrpc.newStub(testSubject);

ClientResponseObserver<Event, Confirmation> observer = mock(ClientResponseObserver.class);
ClientResponseObserver<Event, ConfirmationWithConsistencyMarker> observer = mock(ClientResponseObserver.class);
StreamObserver<Event> upstream = stub.appendEvent(observer);

InOrder inOrder = Mockito.inOrder(observer);
Expand Down