From b2ad9607e360ef03eb9839a2c0a470817a942b2a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 15 Mar 2026 14:41:11 +0000 Subject: [PATCH 1/4] Initial plan From 5b7ea7af831ee686cbea31850acf237317e58703 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 15 Mar 2026 15:17:36 +0000 Subject: [PATCH 2/4] Upgrade all Java dependency versions to latest stable releases Co-authored-by: jwijgerd <914840+jwijgerd@users.noreply.github.com> --- main/pom.xml | 16 ++++++++-------- .../storage/KafkaTopicSchemaStorageTest.java | 2 +- pom.xml | 18 +++++++++--------- services/pom.xml | 4 ++-- test-apps/pom.xml | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index 61e5814b..c5f4b65b 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -31,30 +31,30 @@ https://github.com/elasticsoftwarefoundation/akces-framework - 4.33.5 + 4.34.0 2.25.3 - 2.20.1 + 2.21.1 2.0.17 3.30.2-GA 1.8.1 - 4.1.1 + 4.2.0 5.2.0 10.2.1 6.0.0 1.1.1 - 7.11.0 + 7.12.0 4.3.0 2.2 4.0.2 - 4.2.7.Final + 4.2.10.Final 1.16.2 0.2.0 - 8.1.1 + 8.2.0 5.0.0 - 2.14.0 - 1.5.25 + 2.14.1 + 1.5.32 2.0.3 0.23.0 diff --git a/main/shared/src/test/java/org/elasticsoftware/akces/schemas/storage/KafkaTopicSchemaStorageTest.java b/main/shared/src/test/java/org/elasticsoftware/akces/schemas/storage/KafkaTopicSchemaStorageTest.java index 58a555e7..9cd75cf0 100644 --- a/main/shared/src/test/java/org/elasticsoftware/akces/schemas/storage/KafkaTopicSchemaStorageTest.java +++ b/main/shared/src/test/java/org/elasticsoftware/akces/schemas/storage/KafkaTopicSchemaStorageTest.java @@ -162,7 +162,7 @@ void testSaveSchemaFailure() { CompletableFuture future = new CompletableFuture<>(); future.completeExceptionally(new RuntimeException("Kafka error")); - when(producer.send(any(ProducerRecord.class))).thenReturn(future); + when(producer.send(any(ProducerRecord.class), any(Callback.class))).thenReturn(future); // When/Then assertThrows(SchemaException.class, diff --git a/pom.xml b/pom.xml index 4bd1f475..bd6fed3d 100644 --- a/pom.xml +++ b/pom.xml @@ -73,9 +73,9 @@ 25 - 5.20.0 - 7.0.4 - 4.0.2 + 5.23.0 + 7.0.5 + 4.0.3 33.5.0-jre 3.2.3 @@ -97,7 +97,7 @@ maven-dependency-plugin - 3.9.0 + 3.10.0 maven-compiler-plugin @@ -105,7 +105,7 @@ maven-surefire-plugin - 3.5.4 + 3.5.5 maven-jar-plugin @@ -129,7 +129,7 @@ maven-shade-plugin - 3.6.1 + 3.6.2 org.simplify4u.plugins @@ -146,7 +146,7 @@ org.codehaus.mojo buildnumber-maven-plugin - 3.2.1 + 3.3.0 org.codehaus.mojo @@ -181,7 +181,7 @@ org.graalvm.buildtools native-maven-plugin - 0.11.4 + 0.11.5 true @@ -192,7 +192,7 @@ io.fabric8 crd-generator-maven-plugin - 7.5.2 + 7.6.1 org.cyclonedx diff --git a/services/pom.xml b/services/pom.xml index 7026ab3c..d5924698 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -30,10 +30,10 @@ https://github.com/elasticsoftwarefoundation/akces-framework - 5.2.2 + 5.2.3 6.3.3 1.83 - 7.5.2 + 7.6.1 diff --git a/test-apps/pom.xml b/test-apps/pom.xml index d55be06d..6e1633f1 100644 --- a/test-apps/pom.xml +++ b/test-apps/pom.xml @@ -57,7 +57,7 @@ org.checkerframework checker-qual - 3.53.1 + 3.54.0 org.apache.commons From 48702455b7c60d062b0009aceb07a68bfdd956b6 Mon Sep 17 00:00:00 2001 From: Joost van de Wijgerd Date: Sun, 15 Mar 2026 16:47:48 +0100 Subject: [PATCH 3/4] Update mockito.version to 5.20.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index bd6fed3d..197c0d11 100644 --- a/pom.xml +++ b/pom.xml @@ -72,8 +72,8 @@ UTF-8 25 - - 5.23.0 + + 5.20.0 7.0.5 4.0.3 33.5.0-jre @@ -479,4 +479,4 @@ - \ No newline at end of file + From 6c5155665b6f4e2b8054391f63d4f13926378fbc Mon Sep 17 00:00:00 2001 From: jwijgerd Date: Sun, 15 Mar 2026 17:11:08 +0100 Subject: [PATCH 4/4] refactor: rename aggregateId to id in error event records and add @Nonnull annotation --- .../akces/errors/AggregateAlreadyExistsErrorEvent.java | 6 ++++-- .../akces/errors/AggregateNotFoundErrorEvent.java | 6 ++++-- .../akces/errors/CommandExecutionErrorEvent.java | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/main/shared/src/main/java/org/elasticsoftware/akces/errors/AggregateAlreadyExistsErrorEvent.java b/main/shared/src/main/java/org/elasticsoftware/akces/errors/AggregateAlreadyExistsErrorEvent.java index e7b2adde..69cd5bb8 100644 --- a/main/shared/src/main/java/org/elasticsoftware/akces/errors/AggregateAlreadyExistsErrorEvent.java +++ b/main/shared/src/main/java/org/elasticsoftware/akces/errors/AggregateAlreadyExistsErrorEvent.java @@ -17,17 +17,19 @@ package org.elasticsoftware.akces.errors; +import jakarta.annotation.Nonnull; import jakarta.validation.constraints.NotNull; import org.elasticsoftware.akces.annotations.DomainEventInfo; import org.elasticsoftware.akces.events.ErrorEvent; @DomainEventInfo(type = "AggregateAlreadyExistsError") public record AggregateAlreadyExistsErrorEvent( - @NotNull String aggregateId, + @NotNull String id, @NotNull String aggregateName ) implements ErrorEvent { @Override + @Nonnull public String getAggregateId() { - return aggregateId(); + return id(); } } diff --git a/main/shared/src/main/java/org/elasticsoftware/akces/errors/AggregateNotFoundErrorEvent.java b/main/shared/src/main/java/org/elasticsoftware/akces/errors/AggregateNotFoundErrorEvent.java index 16de9625..f6f90807 100644 --- a/main/shared/src/main/java/org/elasticsoftware/akces/errors/AggregateNotFoundErrorEvent.java +++ b/main/shared/src/main/java/org/elasticsoftware/akces/errors/AggregateNotFoundErrorEvent.java @@ -17,17 +17,19 @@ package org.elasticsoftware.akces.errors; +import jakarta.annotation.Nonnull; import jakarta.validation.constraints.NotNull; import org.elasticsoftware.akces.annotations.DomainEventInfo; import org.elasticsoftware.akces.events.ErrorEvent; @DomainEventInfo(type = "AggregateNotFoundError") public record AggregateNotFoundErrorEvent( - @NotNull String aggregateId, + @NotNull String id, @NotNull String aggregateName ) implements ErrorEvent { @Override + @Nonnull public String getAggregateId() { - return aggregateId(); + return id(); } } diff --git a/main/shared/src/main/java/org/elasticsoftware/akces/errors/CommandExecutionErrorEvent.java b/main/shared/src/main/java/org/elasticsoftware/akces/errors/CommandExecutionErrorEvent.java index 348e6f85..356f17e8 100644 --- a/main/shared/src/main/java/org/elasticsoftware/akces/errors/CommandExecutionErrorEvent.java +++ b/main/shared/src/main/java/org/elasticsoftware/akces/errors/CommandExecutionErrorEvent.java @@ -17,19 +17,21 @@ package org.elasticsoftware.akces.errors; +import jakarta.annotation.Nonnull; import jakarta.validation.constraints.NotNull; import org.elasticsoftware.akces.annotations.DomainEventInfo; import org.elasticsoftware.akces.events.ErrorEvent; @DomainEventInfo(type = "CommandExecutionError") public record CommandExecutionErrorEvent( - @NotNull String aggregateId, + @NotNull String id, @NotNull String aggregateName, @NotNull String commandName, String errorDescription ) implements ErrorEvent { @Override + @Nonnull public String getAggregateId() { - return aggregateId(); + return id(); } }