Migrated to Junit5

fuinorg · Dec 25, 2023 · 41c43ef · 41c43ef
1 parent bd64b63
commit 41c43ef
Show file tree

Hide file tree

Showing 173 changed files with 727 additions and 986 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -66,8 +66,8 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -83,6 +83,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.fuin</groupId>
             <artifactId>units4j</artifactId>

diff --git a/api/src/main/java/org/fuin/esc/api/CommonEvent.java b/api/src/main/java/org/fuin/esc/api/CommonEvent.java
@@ -17,10 +17,9 @@
  */
 package org.fuin.esc.api;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 
-import org.fuin.objects4j.common.Nullable;
-
 /**
  * Event that is uniquely identified by a UUID. It's equals and hash code methods are defined on the
  * <code>id</code>.

diff --git a/api/src/main/java/org/fuin/esc/api/DelegatingAsyncEventStore.java b/api/src/main/java/org/fuin/esc/api/DelegatingAsyncEventStore.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.esc.api;
 
+import jakarta.validation.constraints.NotNull;
+import org.fuin.objects4j.common.Contract;
+
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Supplier;
 
-import jakarta.validation.constraints.NotNull;
-
-import org.fuin.objects4j.common.Contract;
-
 /**
  * Asynchronous event store that uses a synchronous one internally.
  */

diff --git a/api/src/main/java/org/fuin/esc/api/EventId.java b/api/src/main/java/org/fuin/esc/api/EventId.java
@@ -17,18 +17,17 @@
  */
 package org.fuin.esc.api;
 
-import java.io.Serializable;
-import java.util.UUID;
-
-import org.fuin.objects4j.common.Immutable;
 import jakarta.validation.constraints.NotNull;
 import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
 import org.fuin.objects4j.common.Contract;
+import org.fuin.objects4j.common.Immutable;
 import org.fuin.objects4j.vo.UUIDStr;
 import org.fuin.objects4j.vo.UUIDStrValidator;
 import org.fuin.objects4j.vo.ValueObjectWithBaseType;
 
+import java.io.Serializable;
+import java.util.UUID;
+
 /**
  * Represents a unique event identifier.
  */

diff --git a/api/src/main/java/org/fuin/esc/api/EventIdConverter.java b/api/src/main/java/org/fuin/esc/api/EventIdConverter.java
@@ -17,10 +17,9 @@
  */
 package org.fuin.esc.api;
 
+import jakarta.annotation.Nullable;
 import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.fuin.objects4j.common.Nullable;
-
 /**
  * XML Converter for event IDs.
  */

diff --git a/api/src/main/java/org/fuin/esc/api/EventNotFoundException.java b/api/src/main/java/org/fuin/esc/api/EventNotFoundException.java
@@ -18,7 +18,6 @@
 package org.fuin.esc.api;
 
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 

diff --git a/api/src/main/java/org/fuin/esc/api/EventStoreBasicsAsync.java b/api/src/main/java/org/fuin/esc/api/EventStoreBasicsAsync.java
@@ -17,10 +17,10 @@
  */
 package org.fuin.esc.api;
 
-import java.util.concurrent.CompletableFuture;
-
 import jakarta.validation.constraints.NotNull;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * Basic synchronous operations shared by all event store types.
  */

diff --git a/api/src/main/java/org/fuin/esc/api/ExpectedVersion.java b/api/src/main/java/org/fuin/esc/api/ExpectedVersion.java
@@ -17,7 +17,7 @@
  */
 package org.fuin.esc.api;
 
-import org.fuin.objects4j.common.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * Stream version numbers that have a special meaning. This is used for an optimistic concurrency check on the

diff --git a/api/src/main/java/org/fuin/esc/api/ProjectionAdminEventStore.java b/api/src/main/java/org/fuin/esc/api/ProjectionAdminEventStore.java
@@ -17,10 +17,10 @@
  */
 package org.fuin.esc.api;
 
-import java.util.List;
-
 import jakarta.validation.constraints.NotNull;
 
+import java.util.List;
+
 /**
  * An event store that provides a projection administration API.
  */

diff --git a/api/src/main/java/org/fuin/esc/api/ProjectionStreamId.java b/api/src/main/java/org/fuin/esc/api/ProjectionStreamId.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.esc.api;
 
-import java.util.Collections;
-import java.util.List;
-
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 import org.fuin.objects4j.vo.KeyValue;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Projection stream identifier that is based on a name.
  */

diff --git a/api/src/main/java/org/fuin/esc/api/ReadableEventStoreAsync.java b/api/src/main/java/org/fuin/esc/api/ReadableEventStoreAsync.java
@@ -17,10 +17,10 @@
  */
 package org.fuin.esc.api;
 
-import java.util.concurrent.CompletableFuture;
-
 import jakarta.validation.constraints.NotNull;
 
+import java.util.concurrent.CompletableFuture;
+
 /**
  * Interface for reading events from an event store asynchronously. Calling any
  * method on a non-open event store will implicitly {@link #open()} it.

diff --git a/api/src/main/java/org/fuin/esc/api/SimpleCommonEvent.java b/api/src/main/java/org/fuin/esc/api/SimpleCommonEvent.java
@@ -17,11 +17,10 @@
  */
 package org.fuin.esc.api;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
-import org.fuin.objects4j.common.Nullable;
 
 /**
  * Event that is uniquely identified by a UUID. It's equals and hash code methods are defined on the

diff --git a/api/src/main/java/org/fuin/esc/api/SimpleStreamId.java b/api/src/main/java/org/fuin/esc/api/SimpleStreamId.java
@@ -17,15 +17,14 @@
  */
 package org.fuin.esc.api;
 
-import java.util.Collections;
-import java.util.List;
-
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 import org.fuin.objects4j.vo.KeyValue;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * Stream identifier that is based on a name.
  */

diff --git a/api/src/main/java/org/fuin/esc/api/SimpleTenantId.java b/api/src/main/java/org/fuin/esc/api/SimpleTenantId.java
@@ -18,7 +18,6 @@
 package org.fuin.esc.api;
 
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 

diff --git a/api/src/main/java/org/fuin/esc/api/StreamAlreadyExistsException.java b/api/src/main/java/org/fuin/esc/api/StreamAlreadyExistsException.java
@@ -18,7 +18,6 @@
 package org.fuin.esc.api;
 
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 

diff --git a/api/src/main/java/org/fuin/esc/api/StreamDeletedException.java b/api/src/main/java/org/fuin/esc/api/StreamDeletedException.java
@@ -18,7 +18,6 @@
 package org.fuin.esc.api;
 
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 

diff --git a/api/src/main/java/org/fuin/esc/api/StreamEventsSlice.java b/api/src/main/java/org/fuin/esc/api/StreamEventsSlice.java
@@ -17,17 +17,16 @@
  */
 package org.fuin.esc.api;
 
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.fuin.objects4j.common.Immutable;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import jakarta.validation.constraints.NotNull;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.fuin.objects4j.common.Immutable;
-import org.fuin.objects4j.common.Nullable;
-
 /**
  *
  */

diff --git a/api/src/main/java/org/fuin/esc/api/StreamId.java b/api/src/main/java/org/fuin/esc/api/StreamId.java
@@ -17,13 +17,12 @@
  */
 package org.fuin.esc.api;
 
-import java.io.Serializable;
-import java.util.List;
-
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.vo.KeyValue;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * Name of a stream that is unique within the event store.<br>
  * <br>

diff --git a/api/src/main/java/org/fuin/esc/api/StreamNotFoundException.java b/api/src/main/java/org/fuin/esc/api/StreamNotFoundException.java
@@ -18,7 +18,6 @@
 package org.fuin.esc.api;
 
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 

diff --git a/api/src/main/java/org/fuin/esc/api/StreamReadOnlyException.java b/api/src/main/java/org/fuin/esc/api/StreamReadOnlyException.java
@@ -18,7 +18,6 @@
 package org.fuin.esc.api;
 
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
 

diff --git a/api/src/main/java/org/fuin/esc/api/SubscribableEventStore.java b/api/src/main/java/org/fuin/esc/api/SubscribableEventStore.java
@@ -17,10 +17,10 @@
  */
 package org.fuin.esc.api;
 
-import java.util.function.BiConsumer;
-
 import jakarta.validation.constraints.NotNull;
 
+import java.util.function.BiConsumer;
+
 /**
  * An event store that is capable of handling volatile subscriptions. Calling
  * any method on a non-open event store will implicitly {@link #open()} it.

diff --git a/api/src/main/java/org/fuin/esc/api/SubscribableEventStoreAsync.java b/api/src/main/java/org/fuin/esc/api/SubscribableEventStoreAsync.java
@@ -17,11 +17,11 @@
  */
 package org.fuin.esc.api;
 
+import jakarta.validation.constraints.NotNull;
+
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;
 
-import jakarta.validation.constraints.NotNull;
-
 /**
  * An event store that is capable of handling volatile subscriptions. Calling
  * any method on a non-open event store will implicitly {@link #open()} it.

diff --git a/api/src/main/java/org/fuin/esc/api/Subscription.java b/api/src/main/java/org/fuin/esc/api/Subscription.java
@@ -17,11 +17,10 @@
  */
 package org.fuin.esc.api;
 
-import java.io.Serializable;
-
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 
-import org.fuin.objects4j.common.Nullable;
+import java.io.Serializable;
 
 /**
  * Result of subscribing to a stream. The sub classes will contain

diff --git a/api/src/main/java/org/fuin/esc/api/TypeName.java b/api/src/main/java/org/fuin/esc/api/TypeName.java
@@ -17,11 +17,10 @@
  */
 package org.fuin.esc.api;
 
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
-import jakarta.validation.constraints.NotEmpty;
 import org.fuin.objects4j.vo.AbstractStringValueObject;
 
 /**

diff --git a/api/src/main/java/org/fuin/esc/api/WritableEventStore.java b/api/src/main/java/org/fuin/esc/api/WritableEventStore.java
@@ -17,10 +17,10 @@
  */
 package org.fuin.esc.api;
 
-import java.util.List;
-
 import jakarta.validation.constraints.NotNull;
 
+import java.util.List;
+
 /**
  * Interface for writing events to an event store synchronously. Calling any
  * method on a non-open event store will implicitly {@link #open()} it.

diff --git a/api/src/main/java/org/fuin/esc/api/WritableEventStoreAsync.java b/api/src/main/java/org/fuin/esc/api/WritableEventStoreAsync.java
@@ -17,11 +17,11 @@
  */
 package org.fuin.esc.api;
 
+import jakarta.validation.constraints.NotNull;
+
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import jakarta.validation.constraints.NotNull;
-
 /**
  * Interface for writing events to an event store asynchronously. Calling any
  * method on a non-open event store will implicitly {@link #open()} it.

diff --git a/api/src/main/java/org/fuin/esc/api/WrongExpectedVersionException.java b/api/src/main/java/org/fuin/esc/api/WrongExpectedVersionException.java
@@ -17,11 +17,10 @@
  */
 package org.fuin.esc.api;
 
+import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
-
 import org.fuin.objects4j.common.Contract;
 import org.fuin.objects4j.common.Immutable;
-import org.fuin.objects4j.common.Nullable;
 
 /**
  * Signals a conflict between an expected and an actual version.