* This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation; either version 3 of the License, or (at your option) any * later version. - * + *
* This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. - * + *
* You should have received a copy of the GNU Lesser General Public License * along with this library. If not, see http://www.gnu.org/licenses/. */ @@ -29,42 +29,42 @@ public interface CommonEvent { /** * Returns the ID of the event, used as part of the idempotent write check. This is type string to allow * different UUID implementations. It has to be a valid UUID string representation. - * + * * @return Unique event identifier. */ @NotNull - public EventId getId(); + EventId getId(); /** * Returns the event type. - * + * * @return Never changing unique event type name. */ @NotNull - public TypeName getDataType(); + TypeName getDataType(); /** * Returns the event data. - * + * * @return Event data. */ @NotNull - public Object getData(); + Object getData(); /** - * Returns the meta data type. - * + * Returns the metadata type. + * * @return Never changing unique event meta data type name. */ @Nullable - public TypeName getMetaType(); - + TypeName getMetaType(); + /** - * Returns the meta data. - * + * Returns the metadata. + * * @return Meta data. */ @Nullable - public Object getMeta(); + Object getMeta(); } diff --git a/api/src/main/java/org/fuin/esc/api/Converter.java b/api/src/main/java/org/fuin/esc/api/Converter.java index 1f50ba9c..fc32c8a3 100644 --- a/api/src/main/java/org/fuin/esc/api/Converter.java +++ b/api/src/main/java/org/fuin/esc/api/Converter.java @@ -1,17 +1,17 @@ /** - * Copyright (C) 2015 Michael Schnell. All rights reserved. + * Copyright (C) 2015 Michael Schnell. All rights reserved. * http://www.fuin.org/ - * + *
* This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation; either version 3 of the License, or (at your option) any * later version. - * + *
* This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. - * + *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,7 +19,7 @@
/**
* Converts a type into another one.
- *
+ *
* @param
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -30,13 +30,13 @@
*/
public final class DelegatingAsyncEventStore implements EventStoreAsync {
- private Executor executor;
+ private final Executor executor;
- private EventStore delegate;
+ private final EventStore delegate;
/**
* Constructor with all mandatory data.
- *
+ *
* @param executor
* Executor used to create the completable futures.
* @param delegate
@@ -51,7 +51,7 @@ public DelegatingAsyncEventStore(@NotNull final Executor executor, @NotNull fina
}
@Override
- public final CompletableFuture
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
-import org.fuin.esc.api.SerializedDataType;
+import jakarta.validation.constraints.NotNull;
/**
* Serializes an object.
@@ -26,7 +26,7 @@ public interface Deserializer {
/**
* Converts the given data into an object.
- *
+ *
* @param data
* Serialized object. Can have different types like
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -27,65 +27,65 @@ public interface DeserializerRegistry {
/**
* Tries to find a deserializer for the given combination.
- *
+ *
* @param type
* Unique identifier for the type of data.
* @param mimeType
* Mime type.
- *
+ *
* @return Deserializer instance configured with the arguments or throws an
* {@link IllegalArgumentException} if no deserializer was found for the type.
*/
@NotNull
- public Deserializer getDeserializer(@NotNull SerializedDataType type, @NotNull EnhancedMimeType mimeType);
+ Deserializer getDeserializer(@NotNull SerializedDataType type, @NotNull EnhancedMimeType mimeType);
/**
* Tries to find a deserializer for the given type using the
* {@link #getDefaultContentType(SerializedDataType)}. This method fails if the default mime type is not
* set.
- *
+ *
* @param type
* Unique identifier for the type of data.
- *
+ *
* @return Deserializer instance configured with the arguments oor throws an
* {@link IllegalArgumentException} if no deserializer was found for the type.
*/
@NotNull
- public Deserializer getDeserializer(@NotNull SerializedDataType type);
+ Deserializer getDeserializer(@NotNull SerializedDataType type);
/**
* Returns the default mime type for the given type.
- *
+ *
* @param type
* Unique identifier for the type of data.
- *
+ *
* @return Default mime type or NULL if nothing was configured for the given type.
*/
@Nullable
- public EnhancedMimeType getDefaultContentType(@NotNull SerializedDataType type);
+ EnhancedMimeType getDefaultContentType(@NotNull SerializedDataType type);
/**
* Tries to find a deserializer for the given type using the
* {@link #getDefaultContentType(SerializedDataType)}. This method fails if the default mime type is not
* set.
- *
+ *
* @param type
* Unique identifier for the type of data.
- *
+ *
* @return TRUE if a deserializer was found.
*/
- public boolean deserializerExists(@NotNull SerializedDataType type);
+ boolean deserializerExists(@NotNull SerializedDataType type);
/**
* Tries to find a deserializer for the given combination.
- *
+ *
* @param type
* Unique identifier for the type of data.
* @param mimeType
* Mime type.
- *
+ *
* @return TRUE if a deserializer was found.
*/
- public boolean deserializerExists(@NotNull SerializedDataType type, @NotNull EnhancedMimeType mimeType);
+ boolean deserializerExists(@NotNull SerializedDataType type, @NotNull EnhancedMimeType mimeType);
}
diff --git a/api/src/main/java/org/fuin/esc/api/DeserializerRegistryRequired.java b/api/src/main/java/org/fuin/esc/api/DeserializerRegistryRequired.java
index 1425f8ce..51e2a189 100644
--- a/api/src/main/java/org/fuin/esc/api/DeserializerRegistryRequired.java
+++ b/api/src/main/java/org/fuin/esc/api/DeserializerRegistryRequired.java
@@ -8,9 +8,9 @@ public interface DeserializerRegistryRequired {
/**
* Sets the registry to use.
- *
+ *
* @param registry Actual registry.
*/
- public void setRegistry(DeserializerRegistry registry);
+ void setRegistry(DeserializerRegistry registry);
}
diff --git a/api/src/main/java/org/fuin/esc/api/EnhancedMimeType.java b/api/src/main/java/org/fuin/esc/api/EnhancedMimeType.java
index 98e6e8cc..979b487b 100644
--- a/api/src/main/java/org/fuin/esc/api/EnhancedMimeType.java
+++ b/api/src/main/java/org/fuin/esc/api/EnhancedMimeType.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -48,10 +48,10 @@ public EnhancedMimeType() {
/**
* Constructor with all data.
- *
+ *
* @param str
- * Contains base type, sub type and parameters.
- *
+ * Contains base type, subtype and parameters.
+ *
* @throws MimeTypeParseException
* If the string is not valid.
*/
@@ -60,15 +60,15 @@ public EnhancedMimeType(@NotNull final String str) throws MimeTypeParseException
}
/**
- * Constructor with primary and sub type (no parameters).
- *
+ * Constructor with primary and subtype (no parameters).
+ *
* @param primary
* Primary type.
* @param sub
- * Sub type.
- *
+ * Subtype.
+ *
* @throws MimeTypeParseException
- * If the primary type or sub type is not a valid token
+ * If the primary type or subtype is not a valid token
*/
public EnhancedMimeType(@NotNull final String primary, @NotNull final String sub)
throws MimeTypeParseException {
@@ -76,20 +76,20 @@ public EnhancedMimeType(@NotNull final String primary, @NotNull final String sub
}
/**
- * Constructor with primary, sub type and encoding.
- *
+ * Constructor with primary, subtype and encoding.
+ *
* @param primary
* Primary type.
* @param sub
- * Sub type.
+ * Subtype.
* @param encoding
* Encoding.
- *
+ *
* @throws MimeTypeParseException
- * If the primary type or sub type is not a valid token
+ * If the primary type or subtype is not a valid token
*/
public EnhancedMimeType(@NotNull final String primary, @NotNull final String sub,
- @Nullable final Charset encoding) throws MimeTypeParseException {
+ @Nullable final Charset encoding) throws MimeTypeParseException {
super(primary, sub);
if (encoding != null) {
super.setParameter(ENCODING, encoding.name());
@@ -97,45 +97,45 @@ public EnhancedMimeType(@NotNull final String primary, @NotNull final String sub
}
/**
- * Constructor with primary, sub type, encoding and version.
- *
+ * Constructor with primary, subtype, encoding and version.
+ *
* @param primary
* Primary type.
* @param sub
- * Sub type.
+ * Subtype.
* @param encoding
* Encoding.
* @param version
* Version.
- *
+ *
* @throws MimeTypeParseException
- * If the primary type or sub type is not a valid token
+ * If the primary type or subtype is not a valid token
*/
public EnhancedMimeType(@NotNull final String primary, @NotNull final String sub,
- @Nullable final Charset encoding, @Nullable final String version) throws MimeTypeParseException {
+ @Nullable final Charset encoding, @Nullable final String version) throws MimeTypeParseException {
this(primary, sub, encoding, version, null);
}
/**
* Constructor with all data.
- *
+ *
* @param primary
* Primary type.
* @param sub
- * Sub type.
+ * Subtype.
* @param encoding
* Encoding.
* @param version
* Version.
* @param params
* Other parameters than version and encoding.
- *
+ *
* @throws MimeTypeParseException
- * If the primary type or sub type is not a valid token
+ * If the primary type or subtype is not a valid token
*/
public EnhancedMimeType(@NotNull final String primary, @NotNull final String sub,
- @Nullable final Charset encoding, @Nullable final String version,
- @Nullable final Map
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -24,7 +24,7 @@ public final class EscApiUtils {
/**
* TODO Replace this with an enum.
- *
+ *
* Only events will be seen that are added after subscription was
* established.
*/
diff --git a/api/src/main/java/org/fuin/esc/api/EventId.java b/api/src/main/java/org/fuin/esc/api/EventId.java
index e9f5cef8..0bc929dd 100644
--- a/api/src/main/java/org/fuin/esc/api/EventId.java
+++ b/api/src/main/java/org/fuin/esc/api/EventId.java
@@ -1,46 +1,44 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
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.common.ValueObjectWithBaseType;
import org.fuin.objects4j.core.UUIDStr;
import org.fuin.objects4j.core.UUIDStrValidator;
-import org.fuin.objects4j.common.ValueObjectWithBaseType;
+import javax.annotation.concurrent.Immutable;
import java.io.Serializable;
+import java.util.Objects;
import java.util.UUID;
/**
- * Represents a unique event identifier.
+ * Represents a unique event identifier based on a UUID.
*/
@Immutable
-@XmlJavaTypeAdapter(EventIdConverter.class)
-public final class EventId implements ValueObjectWithBaseType
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,7 +19,8 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
/**
* Signals that an event with the given number was not found.
@@ -35,14 +36,14 @@ public final class EventNotFoundException extends RuntimeException {
/**
* Constructor with all data.
- *
+ *
* @param streamId
* Unique identifier of the stream.
* @param eventNumber
* Number of the event that was not found.
*/
public EventNotFoundException(@NotNull final StreamId streamId,
- final long eventNumber) {
+ final long eventNumber) {
super("Version " + eventNumber + " does not exist on stream '"
+ streamId + "'");
@@ -54,20 +55,20 @@ public EventNotFoundException(@NotNull final StreamId streamId,
/**
* Returns the unique ID of the stream.
- *
+ *
* @return Stream with version that was not found.
*/
@NotNull
- public final StreamId getStreamId() {
+ public StreamId getStreamId() {
return streamId;
}
/**
* Returns the number of the event.
- *
+ *
* @return Number that was not found.
*/
- public final long getVersion() {
+ public long getVersion() {
return version;
}
diff --git a/api/src/main/java/org/fuin/esc/api/EventStore.java b/api/src/main/java/org/fuin/esc/api/EventStore.java
index f86ce4c5..b2ecb368 100644
--- a/api/src/main/java/org/fuin/esc/api/EventStore.java
+++ b/api/src/main/java/org/fuin/esc/api/EventStore.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
diff --git a/api/src/main/java/org/fuin/esc/api/EventStoreAsync.java b/api/src/main/java/org/fuin/esc/api/EventStoreAsync.java
index 2f87c1b6..a219519c 100644
--- a/api/src/main/java/org/fuin/esc/api/EventStoreAsync.java
+++ b/api/src/main/java/org/fuin/esc/api/EventStoreAsync.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
diff --git a/api/src/main/java/org/fuin/esc/api/EventStoreBasics.java b/api/src/main/java/org/fuin/esc/api/EventStoreBasics.java
index 4773b633..2513137c 100644
--- a/api/src/main/java/org/fuin/esc/api/EventStoreBasics.java
+++ b/api/src/main/java/org/fuin/esc/api/EventStoreBasics.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -25,15 +25,15 @@ public interface EventStoreBasics extends AutoCloseable {
/**
* Opens a connection to the event store. Opening an already opened event
* store is ignored.
- *
+ *
* @return This event store.
*/
- public EventStoreBasics open();
+ EventStoreBasics open();
/**
* Closes the connection to the event store. Closing an already closed or
* never opened event store is simply ignored.
*/
- public void close();
+ void close();
}
diff --git a/api/src/main/java/org/fuin/esc/api/EventStoreBasicsAsync.java b/api/src/main/java/org/fuin/esc/api/EventStoreBasicsAsync.java
index d9fe904a..e6095e4e 100644
--- a/api/src/main/java/org/fuin/esc/api/EventStoreBasicsAsync.java
+++ b/api/src/main/java/org/fuin/esc/api/EventStoreBasicsAsync.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,16 +28,16 @@ public interface EventStoreBasicsAsync extends AutoCloseable {
/**
* Opens a connection to the event store.
- *
+ *
* @return Nothing.
*/
@NotNull
- public CompletableFuture
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -31,15 +31,15 @@ public enum ExpectedVersion {
/** This specifies the expectation that target stream does not yet exist or is empty. */
NO_OR_EMPTY_STREAM(-1);
- private long no;
+ private final long no;
- private ExpectedVersion(final long no) {
+ ExpectedVersion(final long no) {
this.no = no;
}
/**
* Returns the value for the enum.
- *
+ *
* @return Version value.
*/
public final long getNo() {
@@ -48,10 +48,10 @@ public final long getNo() {
/**
* Determines if the given name is a valid one.
- *
+ *
* @param name
* Name to test.
- *
+ *
* @return TRUE if the name is valid, else FALSE.
*/
public static boolean valid(@Nullable final String name) {
@@ -68,11 +68,11 @@ public static boolean valid(@Nullable final String name) {
/**
* Returns the value of the given constant or if it cannot be found the string converted to an int.
- *
+ *
* @param name
* Name of a constant or a valid Integer value. If the argument is
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.api;
+
+/**
+ * Contains some Base64 encoded data.
+ */
+public interface IBase64Data extends IBaseType {
+
+ /**
+ * Unique XML/JSON root element name of the type.
+ */
+ String EL_ROOT_NAME = "Base64";
+
+ /**
+ * Unique name of the type.
+ */
+ TypeName TYPE = new TypeName(EL_ROOT_NAME);
+
+ /**
+ * Unique name of the serialized type.
+ */
+ SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
+
+ /**
+ * Returns the Base64 encoded data.
+ *
+ * @return Base64 string.
+ */
+ String getEncoded();
+
+ /**
+ * Returns the decoded data.
+ *
+ * @return Binary data.
+ */
+ byte[] getDecoded();
+
+}
diff --git a/api/src/main/java/org/fuin/esc/api/IBaseType.java b/api/src/main/java/org/fuin/esc/api/IBaseType.java
new file mode 100644
index 00000000..9a8467e5
--- /dev/null
+++ b/api/src/main/java/org/fuin/esc/api/IBaseType.java
@@ -0,0 +1,7 @@
+package org.fuin.esc.api;
+
+/**
+ * Tag interface for common base types.
+ */
+public interface IBaseType {
+}
diff --git a/api/src/main/java/org/fuin/esc/api/IBaseTypeFactory.java b/api/src/main/java/org/fuin/esc/api/IBaseTypeFactory.java
new file mode 100644
index 00000000..e1433f53
--- /dev/null
+++ b/api/src/main/java/org/fuin/esc/api/IBaseTypeFactory.java
@@ -0,0 +1,34 @@
+package org.fuin.esc.api;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+
+/**
+ * Creates the bases types that are only known as interfaces in this module.
+ */
+public interface IBaseTypeFactory {
+
+ /**
+ * Constructor with binary data that will be Base64 encoded.
+ *
+ * @param binaryData Binary data.
+ */
+ IBase64Data createBase64Data(@NotNull byte[] binaryData);
+
+
+ /**
+ * Constructor with all data.
+ *
+ * @param dataType Type of the data.
+ * @param dataContentType Type of the data.
+ * @param metaType Unique name of the meta data type if available.
+ * @param metaContentType Type of the meta data if meta data is available.
+ * @param meta Meta data object if available.
+ */
+ IEscMeta createEscMeta(@NotNull final String dataType,
+ @NotNull final EnhancedMimeType dataContentType,
+ @Nullable final String metaType,
+ @Nullable final EnhancedMimeType metaContentType,
+ @Nullable final Object meta);
+
+}
diff --git a/api/src/main/java/org/fuin/esc/api/IData.java b/api/src/main/java/org/fuin/esc/api/IData.java
new file mode 100644
index 00000000..96455f8a
--- /dev/null
+++ b/api/src/main/java/org/fuin/esc/api/IData.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.api;
+
+import jakarta.validation.constraints.NotNull;
+import org.fuin.objects4j.common.ValueObject;
+
+import java.io.Serializable;
+
+/**
+ * Helper class that allows sending the data of an event as XML directly to the
+ * event store. Represents a block of data in a serialized form. This class
+ * might be useful for tests. It's not used in the 'esc-spi' code itself
+ */
+public interface IData extends IBaseType, ValueObject, Serializable {
+
+ /**
+ * Unique XML/JSON root element name of the type.
+ */
+ String EL_ROOT_NAME = "data";
+
+ /**
+ * XML/JSON name of the {@link #getType()} field.
+ */
+ String EL_TYPE = "type";
+
+ /**
+ * XML/JSON name of the {@link #getMimeType()} field.
+ */
+ String EL_MIME_TYPE = "mime-type";
+
+ /**
+ * Returns the unique identifier for the type of data.
+ *
+ * @return Unique and never changing type name.
+ */
+ @NotNull
+ String getType();
+
+ /**
+ * Returns the Internet Media Type that classifies the data.
+ *
+ * @return Mime type.
+ */
+ @NotNull
+ EnhancedMimeType getMimeType();
+
+ /**
+ * Returns the raw data block.
+ *
+ * @return Raw data.
+ */
+ @NotNull
+ String getContent();
+
+}
diff --git a/api/src/main/java/org/fuin/esc/api/ToJsonCapable.java b/api/src/main/java/org/fuin/esc/api/IDataWrapper.java
similarity index 69%
rename from api/src/main/java/org/fuin/esc/api/ToJsonCapable.java
rename to api/src/main/java/org/fuin/esc/api/IDataWrapper.java
index bf49d4a7..92d520b6 100644
--- a/api/src/main/java/org/fuin/esc/api/ToJsonCapable.java
+++ b/api/src/main/java/org/fuin/esc/api/IDataWrapper.java
@@ -1,36 +1,38 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
-import jakarta.json.JsonStructure;
import jakarta.validation.constraints.NotNull;
/**
- * Marks an object that can be converted into a JSON object or array.
+ * A structure that wraps another object of different types.
*/
-public interface ToJsonCapable {
+public interface IDataWrapper extends IBaseType {
+
+ /** Unique name of the type. */
+ String EL_ROOT = "Wrapper";
/**
- * Returns the instance as JSON structure.
- *
- * @return JSON representation of the instance.
+ * Returns the wrapped object.
+ *
+ * @return Inner object.
*/
@NotNull
- public JsonStructure toJson();
+ Object getObj();
}
diff --git a/api/src/main/java/org/fuin/esc/api/IEscEvent.java b/api/src/main/java/org/fuin/esc/api/IEscEvent.java
new file mode 100644
index 00000000..2492478f
--- /dev/null
+++ b/api/src/main/java/org/fuin/esc/api/IEscEvent.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.api;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+
+/**
+ * An event structure.
+ */
+public interface IEscEvent extends IBaseType {
+
+ /** Unique XML/JSON root element name of the type. */
+ String EL_ROOT_NAME = "Event";
+
+ /** XML/JSON name of the {@link #getEventId()} field. */
+ String EL_EVENT_ID = "EventId";
+
+ /** XML/JSON name of the {@link #getEventType()} field. */
+ String EL_EVENT_TYPE = "EventType";
+
+ /** XML/JSON name of the {@link #getData()} field. */
+ String EL_DATA = "Data";
+
+ /** XML/JSON name of the {@link #getMeta()} field. */
+ String EL_META_DATA = "MetaData";
+
+ /**
+ * Returns the unique event identifier.
+ *
+ * @return Event ID.
+ */
+ @NotNull
+ String getEventId();
+
+ /**
+ * Returns the unique type name of the event.
+ *
+ * @return Event type.
+ */
+ @NotNull
+ String getEventType();
+
+ /**
+ * Returns the data.
+ *
+ * @return Data.
+ */
+ @NotNull
+ IDataWrapper getData();
+
+ /**
+ * Returns the metadata.
+ *
+ * @return Metadata.
+ */
+ @Nullable
+ IDataWrapper getMeta();
+
+}
diff --git a/api/src/main/java/org/fuin/esc/api/IEscEvents.java b/api/src/main/java/org/fuin/esc/api/IEscEvents.java
new file mode 100644
index 00000000..a38bb708
--- /dev/null
+++ b/api/src/main/java/org/fuin/esc/api/IEscEvents.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.api;
+
+import java.util.List;
+
+/**
+ * A list of events.
+ */
+public interface IEscEvents extends IBaseType {
+
+ /**
+ * Unique root element name of the type.
+ */
+ String EL_ROOT_NAME = "Events";
+
+ /**
+ * XML/JSON name of the elements in the list.
+ */
+ String EL_EVENT = "Event";
+
+ /**
+ * Returns an immutable event list.
+ *
+ * @return Unmodifiable list of events.
+ */
+ List
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.api;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+
+/**
+ * A structure that contains the user's metadata and the system's meta information.
+ */
+public interface IEscMeta extends IBaseType {
+
+ /** Unique name of the type. */
+ TypeName TYPE = new TypeName("EscMeta");
+
+ /** Unique name of the serialized type. */
+ SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
+
+ /** Unique XML/JSON root element name of the type. */
+ String EL_ROOT_NAME = "esc-meta";
+
+ /** XML/JSON tag name of the {@link #getDataType()}. */
+ String EL_DATA_TYPE = "data-type";
+
+ /** XML/JSON tag name of the {@link #getDataContentType()}. */
+ String EL_DATA_CONTENT_TYPE = "data-content-type";
+
+ /** XML/JSON tag name of the {@link #getMetaType()}. */
+ String EL_META_TYPE = "meta-type";
+
+ /** XML/JSON tag name of the {@link #getMetaContentType()}. */
+ String EL_META_CONTENT_TYPE = "meta-content-type";
+
+ /**
+ * Returns the unique name of the data type.
+ *
+ * @return Data type.
+ */
+ @NotNull
+ String getDataType();
+
+ /**
+ * Returns the type of the data.
+ *
+ * @return Data type.
+ */
+ @NotNull
+ EnhancedMimeType getDataContentType();
+
+ /**
+ * Returns the unique name of the metadata type if available.
+ *
+ * @return Metadata type.
+ */
+ @Nullable
+ String getMetaType();
+
+ /**
+ * Returns the type of the metadata if metadata is available.
+ *
+ * @return Meta type.
+ */
+ @Nullable
+ EnhancedMimeType getMetaContentType();
+
+ /**
+ * Returns the metadata object.
+ *
+ * @return Metadata object.
+ */
+ @NotNull
+ Object getMeta();
+
+}
diff --git a/api/src/main/java/org/fuin/esc/api/JsonDeSerializer.java b/api/src/main/java/org/fuin/esc/api/JsonDeSerializer.java
deleted file mode 100644
index 8fe91653..00000000
--- a/api/src/main/java/org/fuin/esc/api/JsonDeSerializer.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
- * http://www.fuin.org/
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option) any
- * later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see http://www.gnu.org/licenses/.
- */
-package org.fuin.esc.api;
-
-import jakarta.json.Json;
-import jakarta.json.JsonReader;
-import jakarta.json.JsonStructure;
-import jakarta.json.JsonWriter;
-import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.api.SerDeserializer;
-import org.fuin.esc.api.SerializedDataType;
-import org.fuin.esc.api.ToJsonCapable;
-
-import java.io.*;
-import java.nio.charset.Charset;
-
-/**
- * Serializes and deserializes a JSON object. The content type for serialization is always "application/json".
- * This implementation supports {@link JsonStructure} and
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,55 +28,55 @@ public interface ProjectionAdminEventStore extends AutoCloseable {
/**
* Opens a connection to the event store.
- *
+ *
* @return Event store instance.
*/
- public ProjectionAdminEventStore open();
+ ProjectionAdminEventStore open();
/**
* Closes the connection to the event store.
*/
- public void close();
-
+ void close();
+
/**
* Determines if a projection exists.
- *
+ *
* @param projectionId
* Unique identifier of the projection.
- *
+ *
* @return TRUE if the projection exists, else FALSE.
*/
- public boolean projectionExists(@NotNull StreamId projectionId);
+ boolean projectionExists(@NotNull StreamId projectionId);
/**
* Enables an existing projection. If the projection is already enabled, the
* command is ignored.
- *
+ *
* @param projectionId
* Unique projection identifier.
- *
+ *
* @throws StreamNotFoundException
* The given projection could not be enabled because it does not
* exist.
*/
- public void enableProjection(@NotNull StreamId projectionId) throws StreamNotFoundException;
+ void enableProjection(@NotNull StreamId projectionId) throws StreamNotFoundException;
/**
* Disables an existing projection. If the projection is already disabled,
* the command is ignored.
- *
+ *
* @param projectionId
* Unique projection identifier.
- *
+ *
* @throws StreamNotFoundException
* The given projection could not be disabled because it does
* not exist.
*/
- public void disableProjection(@NotNull StreamId projectionId) throws StreamNotFoundException;
+ void disableProjection(@NotNull StreamId projectionId) throws StreamNotFoundException;
/**
* Creates a new projection that selects an array of events by their type.
- *
+ *
* @param projectionId
* Unique name of the projection to create.
* @param enable
@@ -84,17 +84,17 @@ public interface ProjectionAdminEventStore extends AutoCloseable {
* (
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,9 +19,9 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
import org.fuin.objects4j.core.KeyValue;
+import javax.annotation.concurrent.Immutable;
import java.util.Collections;
import java.util.List;
@@ -37,7 +37,7 @@ public final class ProjectionStreamId implements StreamId {
/**
* Constructor for projection.
- *
+ *
* @param name
* Unique name.
*/
@@ -47,37 +47,37 @@ public ProjectionStreamId(@NotNull final String name) {
}
@Override
- public final String getName() {
+ public String getName() {
return name;
}
@Override
- public final boolean isProjection() {
+ public boolean isProjection() {
return true;
}
@Override
- public final
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,17 +28,17 @@ public interface ReadableEventStore extends EventStoreBasics {
/**
* Reads count Events from an Event Stream forwards (e.g. oldest to newest)
* starting from position start. traing to read from a non-open
- *
+ *
* @param streamId
* The stream to read from.
* @param start
* The starting point to read from.
* @param count
* The count of items to read.
- *
+ *
* @return A slice containing the results of the read operation. Never
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -30,17 +30,17 @@ public interface ReadableEventStoreAsync extends EventStoreBasicsAsync {
/**
* Reads count Events from an Event Stream forwards (e.g. oldest to newest)
* starting from position start.
- *
+ *
* @param streamId
* The stream to read from.
* @param start
* The starting point to read from.
* @param count
* The count of items to read.
- *
+ *
* @return A slice containing the results of the read operation. Never
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
diff --git a/api/src/main/java/org/fuin/esc/api/SerDeserializerRegistry.java b/api/src/main/java/org/fuin/esc/api/SerDeserializerRegistry.java
index b84326e8..d73614e9 100644
--- a/api/src/main/java/org/fuin/esc/api/SerDeserializerRegistry.java
+++ b/api/src/main/java/org/fuin/esc/api/SerDeserializerRegistry.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
diff --git a/api/src/main/java/org/fuin/esc/api/SerializedDataType.java b/api/src/main/java/org/fuin/esc/api/SerializedDataType.java
index ac2a2b60..788b6ce1 100644
--- a/api/src/main/java/org/fuin/esc/api/SerializedDataType.java
+++ b/api/src/main/java/org/fuin/esc/api/SerializedDataType.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -20,9 +20,10 @@
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
import org.fuin.objects4j.core.AbstractStringValueObject;
+import javax.annotation.concurrent.Immutable;
+
/**
* Uniquely identifies a type of serialized data.
*/
@@ -43,7 +44,7 @@ protected SerializedDataType() { //NOSONAR Ignore uninitialized fields
/**
* Constructor with unique type name.
- *
+ *
* @param value
* Type name.
*/
@@ -54,12 +55,12 @@ public SerializedDataType(@NotEmpty final String value) {
}
@Override
- public final String asBaseType() {
+ public String asBaseType() {
return value;
}
@Override
- public final String toString() {
+ public String toString() {
return asBaseType();
}
diff --git a/api/src/main/java/org/fuin/esc/api/SerializedDataTypeRegistry.java b/api/src/main/java/org/fuin/esc/api/SerializedDataTypeRegistry.java
index c1fbc7d9..64124c41 100644
--- a/api/src/main/java/org/fuin/esc/api/SerializedDataTypeRegistry.java
+++ b/api/src/main/java/org/fuin/esc/api/SerializedDataTypeRegistry.java
@@ -1,24 +1,23 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
import jakarta.validation.constraints.NotNull;
-import org.fuin.esc.api.SerializedDataType;
/**
* Locates a class for a given type.
@@ -27,13 +26,13 @@ public interface SerializedDataTypeRegistry {
/**
* Tries to find a class for the given type.
- *
+ *
* @param type
* Unique identifier for the type of data.
- *
+ *
* @return Class or throws a {@link IllegalArgumentException} if no class was found for that type.
*/
@NotNull
- public Class findClass(@NotNull SerializedDataType type);
-
+ Class findClass(@NotNull SerializedDataType type);
+
}
diff --git a/api/src/main/java/org/fuin/esc/api/SerializedDataTypeRegistryRequired.java b/api/src/main/java/org/fuin/esc/api/SerializedDataTypeRegistryRequired.java
index ae0af4ed..79ac0685 100644
--- a/api/src/main/java/org/fuin/esc/api/SerializedDataTypeRegistryRequired.java
+++ b/api/src/main/java/org/fuin/esc/api/SerializedDataTypeRegistryRequired.java
@@ -8,10 +8,9 @@ public interface SerializedDataTypeRegistryRequired {
/**
* Sets the registry to use.
- *
- * @param registry
- * Actual registry.
+ *
+ * @param registry Actual registry.
*/
- public void setRegistry(SerializedDataTypeRegistry registry);
+ void setRegistry(SerializedDataTypeRegistry registry);
}
diff --git a/api/src/main/java/org/fuin/esc/api/Serializer.java b/api/src/main/java/org/fuin/esc/api/Serializer.java
index 585c9b23..296b731e 100644
--- a/api/src/main/java/org/fuin/esc/api/Serializer.java
+++ b/api/src/main/java/org/fuin/esc/api/Serializer.java
@@ -1,24 +1,23 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
import jakarta.validation.constraints.NotNull;
-import org.fuin.esc.api.SerializedDataType;
/**
* Serializes an object.
@@ -27,25 +26,25 @@ public interface Serializer {
/**
* Returns the mime type used to serialize the object.
- *
+ *
* @return Content type information.
*/
- public EnhancedMimeType getMimeType();
+ @NotNull
+ EnhancedMimeType getMimeType();
/**
* Converts the given object into a byte representation.
- *
+ *
* @param obj
* Object to serialize.
* @param type
* Type of event.
- *
+ *
* @return Serialized object.
- *
+ *
* @param
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -26,23 +26,23 @@ public interface SerializerRegistry {
/**
* Tries to find a serializer for the given type.
- *
+ *
* @param type
* Unique identifier for the type of data.
- *
+ *
* @return Serializer instance or throws a {@link IllegalArgumentException} if no serializer was found.
*/
@NotNull
- public Serializer getSerializer(@NotNull SerializedDataType type);
+ Serializer getSerializer(@NotNull SerializedDataType type);
/**
* Tries to find a serializer for the given type.
- *
+ *
* @param type
* Unique identifier for the type of data.
- *
+ *
* @return TRUE if a serializer was found for the type.
*/
- public boolean serializerExists(@NotNull SerializedDataType type);
+ boolean serializerExists(@NotNull SerializedDataType type);
}
diff --git a/api/src/main/java/org/fuin/esc/api/SerializerRegistryRequired.java b/api/src/main/java/org/fuin/esc/api/SerializerRegistryRequired.java
index 1db1c090..3708442c 100644
--- a/api/src/main/java/org/fuin/esc/api/SerializerRegistryRequired.java
+++ b/api/src/main/java/org/fuin/esc/api/SerializerRegistryRequired.java
@@ -8,9 +8,9 @@ public interface SerializerRegistryRequired {
/**
* Sets the registry to use.
- *
+ *
* @param registry Actual registry.
*/
- public void setRegistry(SerializerRegistry registry);
+ void setRegistry(SerializerRegistry registry);
}
diff --git a/api/src/main/java/org/fuin/esc/api/SimpleCommonEvent.java b/api/src/main/java/org/fuin/esc/api/SimpleCommonEvent.java
index 0b95d00d..b03370fb 100644
--- a/api/src/main/java/org/fuin/esc/api/SimpleCommonEvent.java
+++ b/api/src/main/java/org/fuin/esc/api/SimpleCommonEvent.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -20,7 +20,8 @@
import jakarta.annotation.Nullable;
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
/**
* Event that is uniquely identified by a UUID. It's equals and hash code methods are defined on the
@@ -55,8 +56,8 @@ protected SimpleCommonEvent() { //NOSONAR Ignore uninitialized fields
}
/**
- * Constructor without meta data.
- *
+ * Constructor without metadata.
+ *
* @param id
* The ID of the event, used as part of the idempotent write check. This is type string to
* allow different UUID implementations. It has to be a valid UUID string representation.
@@ -64,16 +65,16 @@ protected SimpleCommonEvent() { //NOSONAR Ignore uninitialized fields
* Unique name of the type of data.
* @param data
* Event data.
- *
+ *
*/
public SimpleCommonEvent(@NotNull final EventId id, @NotNull final TypeName dataType,
- @NotNull final Object data) {
+ @NotNull final Object data) {
this(id, dataType, data, null, null);
}
/**
- * Constructor with meta data.
- *
+ * Constructor with metadata.
+ *
* @param id
* The ID of the event, used as part of the idempotent write check. This is type string to
* allow different UUID implementations. It has to be a valid UUID string representation.
@@ -82,13 +83,13 @@ public SimpleCommonEvent(@NotNull final EventId id, @NotNull final TypeName data
* @param data
* Event data.
* @param metaType
- * Unique name of the type of meta data.
+ * Unique name of the type of metadata.
* @param meta
* Meta data.
- *
+ *
*/
public SimpleCommonEvent(@NotNull final EventId id, @NotNull final TypeName dataType,
- @NotNull final Object data, @Nullable final TypeName metaType, @Nullable final Object meta) {//NOSONAR
+ @NotNull final Object data, @Nullable final TypeName metaType, @Nullable final Object meta) {//NOSONAR
super();
Contract.requireArgNotNull("id", id);
@@ -104,34 +105,32 @@ public SimpleCommonEvent(@NotNull final EventId id, @NotNull final TypeName data
}
@Override
- public final EventId getId() {
+ public EventId getId() {
return id;
}
@Override
- public final TypeName getDataType() {
+ public TypeName getDataType() {
return dataType;
}
@Override
- public final Object getData() {
+ public Object getData() {
return data;
}
@Override
- public final TypeName getMetaType() {
+ public TypeName getMetaType() {
return metaType;
}
@Override
- public final Object getMeta() {
+ public Object getMeta() {
return meta;
}
- // CHECKSTYLE:OFF Generated code
-
@Override
- public final int hashCode() {
+ public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
@@ -139,23 +138,18 @@ public final int hashCode() {
}
@Override
- public final boolean equals(Object obj) {
+ public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
- if (!(obj instanceof SimpleCommonEvent))
+ if (!(obj instanceof SimpleCommonEvent other))
return false;
- SimpleCommonEvent other = (SimpleCommonEvent) obj;
if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- return true;
+ return other.id == null;
+ } else return id.equals(other.id);
}
- // CHECKSTYLE:ON
@Override
public String toString() {
diff --git a/api/src/main/java/org/fuin/esc/api/SimpleSerializedDataTypeRegistry.java b/api/src/main/java/org/fuin/esc/api/SimpleSerializedDataTypeRegistry.java
index 3f536abf..99c0ac46 100644
--- a/api/src/main/java/org/fuin/esc/api/SimpleSerializedDataTypeRegistry.java
+++ b/api/src/main/java/org/fuin/esc/api/SimpleSerializedDataTypeRegistry.java
@@ -1,25 +1,23 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
import jakarta.validation.constraints.NotNull;
-import org.fuin.esc.api.SerializedDataType;
-import org.fuin.esc.api.SerializedDataTypeRegistry;
import org.fuin.objects4j.common.Contract;
import java.util.HashMap;
@@ -42,13 +40,13 @@ public SimpleSerializedDataTypeRegistry() {
/**
* Adds a new type/class combination to the registry.
- *
+ *
* @param type
* Type of the data.
* @param clasz
* Class for the type.
*/
- public final void add(@NotNull final SerializedDataType type, final Class clasz) {
+ public void add(@NotNull final SerializedDataType type, final Class clasz) {
Contract.requireArgNotNull("type", type);
Contract.requireArgNotNull("clasz", clasz);
map.put(type, clasz);
diff --git a/api/src/main/java/org/fuin/esc/api/SimpleSerializerDeserializerRegistry.java b/api/src/main/java/org/fuin/esc/api/SimpleSerializerDeserializerRegistry.java
index ba4960e0..3334ef6a 100644
--- a/api/src/main/java/org/fuin/esc/api/SimpleSerializerDeserializerRegistry.java
+++ b/api/src/main/java/org/fuin/esc/api/SimpleSerializerDeserializerRegistry.java
@@ -1,24 +1,23 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
import jakarta.validation.constraints.NotNull;
-import org.fuin.esc.api.*;
import org.fuin.objects4j.common.Contract;
import java.util.HashMap;
@@ -40,14 +39,14 @@ public final class SimpleSerializerDeserializerRegistry implements SerDeserializ
*/
public SimpleSerializerDeserializerRegistry() {
super();
- serMap = new HashMap
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,9 +19,9 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
import org.fuin.objects4j.core.KeyValue;
+import javax.annotation.concurrent.Immutable;
import java.util.Collections;
import java.util.List;
@@ -37,7 +37,7 @@ public final class SimpleStreamId implements StreamId {
/**
* Constructor with mandatory data.
- *
+ *
* @param name
* Unique name.
*/
@@ -47,37 +47,37 @@ public SimpleStreamId(@NotNull final String name) {
}
@Override
- public final String getName() {
+ public String getName() {
return name;
}
@Override
- public final boolean isProjection() {
+ public boolean isProjection() {
return false;
}
@Override
- public final
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,7 +19,8 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
/**
* Tenant identifier that is based on a name.
@@ -33,7 +34,7 @@ public final class SimpleTenantId implements TenantId {
/**
* Constructor with mandatory data.
- *
+ *
* @param name
* Unique name.
*/
@@ -43,17 +44,17 @@ public SimpleTenantId(@NotNull final String name) {
}
@Override
- public final String asString() {
+ public String asString() {
return name;
}
@Override
- public final int hashCode() {
+ public int hashCode() {
return name.hashCode();
}
@Override
- public final boolean equals(final Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -68,7 +69,7 @@ public final boolean equals(final Object obj) {
}
@Override
- public final String toString() {
+ public String toString() {
return name;
}
diff --git a/api/src/main/java/org/fuin/esc/api/StreamAlreadyExistsException.java b/api/src/main/java/org/fuin/esc/api/StreamAlreadyExistsException.java
index 066665e4..c0a0fc04 100644
--- a/api/src/main/java/org/fuin/esc/api/StreamAlreadyExistsException.java
+++ b/api/src/main/java/org/fuin/esc/api/StreamAlreadyExistsException.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,7 +19,8 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
/**
* Signals that a stream with that ID already exist and cannot be created.
@@ -33,7 +34,7 @@ public final class StreamAlreadyExistsException extends RuntimeException {
/**
* Constructor with all data.
- *
+ *
* @param streamId
* Unique name of the stream.
*/
@@ -45,11 +46,11 @@ public StreamAlreadyExistsException(@NotNull final StreamId streamId) {
/**
* Returns the unique identifier of the stream.
- *
+ *
* @return Stream that couldn't be created.
*/
@NotNull
- public final StreamId getStreamId() {
+ public StreamId getStreamId() {
return streamId;
}
diff --git a/api/src/main/java/org/fuin/esc/api/StreamDeletedException.java b/api/src/main/java/org/fuin/esc/api/StreamDeletedException.java
index 1dff9ad1..1baab430 100644
--- a/api/src/main/java/org/fuin/esc/api/StreamDeletedException.java
+++ b/api/src/main/java/org/fuin/esc/api/StreamDeletedException.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,7 +19,8 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
/**
* Signals that a stream with that name previously existed but was deleted.
@@ -33,7 +34,7 @@ public final class StreamDeletedException extends RuntimeException {
/**
* Constructor with all data.
- *
+ *
* @param streamId
* Unique name of the stream.
*/
@@ -45,11 +46,11 @@ public StreamDeletedException(@NotNull final StreamId streamId) {
/**
* Returns the unique identifier of the stream.
- *
+ *
* @return Stream that was not found.
*/
@NotNull
- public final StreamId getStreamId() {
+ public StreamId getStreamId() {
return streamId;
}
diff --git a/api/src/main/java/org/fuin/esc/api/StreamEventsSlice.java b/api/src/main/java/org/fuin/esc/api/StreamEventsSlice.java
index 7bdff313..63bd7497 100644
--- a/api/src/main/java/org/fuin/esc/api/StreamEventsSlice.java
+++ b/api/src/main/java/org/fuin/esc/api/StreamEventsSlice.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,16 +19,15 @@
import jakarta.annotation.Nullable;
import jakarta.validation.constraints.NotNull;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.fuin.objects4j.common.Immutable;
+import javax.annotation.concurrent.Immutable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
- *
+ * Multiple ordered events read from an eventstore.
*/
@Immutable
public final class StreamEventsSlice {
@@ -43,7 +42,7 @@ public final class StreamEventsSlice {
/**
* Constructor with all data.
- *
+ *
* @param fromEventNumber
* The starting point (represented as a sequence number) of the
* read.
@@ -53,17 +52,17 @@ public final class StreamEventsSlice {
* @param nextEventNumber
* The next event number that can be read.
* @param endOfStream
- * Determines whether or not this is the end of the stream.
+ * Determines whether this is the end of the stream.
*/
public StreamEventsSlice(final long fromEventNumber,
- @Nullable final List
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -32,45 +32,44 @@ public interface StreamId extends Serializable {
/**
* Returns the name of the stream.
- *
+ *
* @return Unique name.
*/
@NotNull
- public String getName();
+ String getName();
/**
* Returns the information if this identifier points to a projection.
- *
+ *
* @return TRUE if this is an identifier for a projection, else FALSE (stream).
*/
- public boolean isProjection();
+ boolean isProjection();
/**
* Convenience method that returns the one-and-only parameter value. CAUTION: This method will throw an exception if there are no
- * parameters, more than one parameter or the type of the value cannot be casted to the expected result type.
- *
+ * parameters, more than one parameter or the type of the value cannot be cast to the expected result type.
+ *
* @return Value of the single parameter.
- *
+ *
* @param
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,7 +19,8 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
/**
* Signals that a stream with that ID doesn't exist.
@@ -33,7 +34,7 @@ public final class StreamNotFoundException extends RuntimeException {
/**
* Constructor with all data.
- *
+ *
* @param streamId
* Unique name of the stream.
*/
@@ -45,11 +46,11 @@ public StreamNotFoundException(@NotNull final StreamId streamId) {
/**
* Returns the unique identifier of the stream.
- *
+ *
* @return Stream that was not found.
*/
@NotNull
- public final StreamId getStreamId() {
+ public StreamId getStreamId() {
return streamId;
}
diff --git a/api/src/main/java/org/fuin/esc/api/StreamReadOnlyException.java b/api/src/main/java/org/fuin/esc/api/StreamReadOnlyException.java
index ef7e69dc..230925c9 100644
--- a/api/src/main/java/org/fuin/esc/api/StreamReadOnlyException.java
+++ b/api/src/main/java/org/fuin/esc/api/StreamReadOnlyException.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,10 +19,11 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
/**
- * Signals that a an attempt was made to write to a stream that is read only.
+ * Signals that a attempt was made to write to a stream that is read only.
*/
@Immutable
public final class StreamReadOnlyException extends RuntimeException {
@@ -33,7 +34,7 @@ public final class StreamReadOnlyException extends RuntimeException {
/**
* Constructor with all data.
- *
+ *
* @param streamId
* Unique name of the stream.
*/
@@ -45,11 +46,11 @@ public StreamReadOnlyException(@NotNull final StreamId streamId) {
/**
* Returns the unique identifier of the stream.
- *
+ *
* @return Stream that was not found.
*/
@NotNull
- public final StreamId getStreamId() {
+ public StreamId getStreamId() {
return streamId;
}
diff --git a/api/src/main/java/org/fuin/esc/api/StreamState.java b/api/src/main/java/org/fuin/esc/api/StreamState.java
index fcb71ecf..3a50d199 100644
--- a/api/src/main/java/org/fuin/esc/api/StreamState.java
+++ b/api/src/main/java/org/fuin/esc/api/StreamState.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -26,34 +26,34 @@ public enum StreamState {
/** The stream was created and may contain events. */
ACTIVE(0),
-
+
/** The stream was deleted, but may be recreated by appending new events to it. */
SOFT_DELETED(1),
-
+
/** The stream was deleted, but cannot be recreated. */
HARD_DELETED(2);
-
-
- private int dbValue;
-
- private StreamState(final int dbValue) {
+
+
+ private final int dbValue;
+
+ StreamState(final int dbValue) {
this.dbValue = dbValue;
}
-
+
/**
* Returns the database value.
- *
+ *
* @return DB value.
*/
public final int dbValue() {
return dbValue;
}
-
+
/**
* Returns the enum from a database value.
- *
+ *
* @param db Database value to return an enum for.
- *
+ *
* @return Enum.
*/
@NotNull
@@ -65,5 +65,5 @@ public static StreamState fromDbValue(final int db) {
}
throw new IllegalArgumentException("The db value is unknown: " + db);
}
-
+
}
diff --git a/api/src/main/java/org/fuin/esc/api/SubscribableEventStore.java b/api/src/main/java/org/fuin/esc/api/SubscribableEventStore.java
index d5dfd34a..e913836b 100644
--- a/api/src/main/java/org/fuin/esc/api/SubscribableEventStore.java
+++ b/api/src/main/java/org/fuin/esc/api/SubscribableEventStore.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -29,7 +29,7 @@ public interface SubscribableEventStore extends EventStoreBasics {
/**
* Subscribe a stream starting with a given event number.
- *
+ *
* @param streamId
* Unique stream identifier.
* @param eventNumber
@@ -41,9 +41,9 @@ public interface SubscribableEventStore extends EventStoreBasics {
* @param onDrop
* Will be called when the subscription was exceptionally
* dropped.
- *
+ *
* @return Subscription result.
- *
+ *
* @throws StreamNotFoundException
* A stream with the given name does not exist in the
* repository.
@@ -52,17 +52,17 @@ public interface SubscribableEventStore extends EventStoreBasics {
* deleted.
*/
@NotNull
- public Subscription subscribeToStream(@NotNull StreamId streamId, long eventNumber,
- @NotNull BiConsumer
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -30,7 +30,7 @@ public interface SubscribableEventStoreAsync extends EventStoreBasicsAsync {
/**
* Subscribe a stream starting with a given event number.
- *
+ *
* @param streamId
* Unique stream identifier.
* @param eventNumber
@@ -42,23 +42,23 @@ public interface SubscribableEventStoreAsync extends EventStoreBasicsAsync {
* @param onDrop
* Will be called when the subscription was exceptionally
* dropped.
- *
+ *
* @return Future with subscription result.
*/
@NotNull
- public CompletableFuture
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -23,7 +23,7 @@
import java.io.Serializable;
/**
- * Result of subscribing to a stream. The sub classes will contain
+ * Result of subscribing to a stream. The subclasses will contain
* implementation specific data that is required to handle unsubscribe requests.
*/
public abstract class Subscription implements Serializable {
@@ -36,21 +36,21 @@ public abstract class Subscription implements Serializable {
/**
* Constructor with all mandatory data.
- *
+ *
* @param streamId
* Unique stream identifier.
* @param lastEventNumber
* Number of the last event written to the stream.
*/
public Subscription(@NotNull final StreamId streamId,
- @Nullable final Long lastEventNumber) {
+ @Nullable final Long lastEventNumber) {
this.streamId = streamId;
this.lastEventNumber = lastEventNumber;
}
/**
* Returns the unique stream identifier.
- *
+ *
* @return Stream ID.
*/
@NotNull
@@ -60,7 +60,7 @@ public final StreamId getStreamId() {
/**
* Returns the number of the last event written to the stream.
- *
+ *
* @return Event number.
*/
@Nullable
diff --git a/api/src/main/java/org/fuin/esc/api/TenantId.java b/api/src/main/java/org/fuin/esc/api/TenantId.java
index c1cb5186..8055ed44 100644
--- a/api/src/main/java/org/fuin/esc/api/TenantId.java
+++ b/api/src/main/java/org/fuin/esc/api/TenantId.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,9 +28,9 @@ public interface TenantId extends Serializable {
/**
* Returns the identifier as string.
- *
+ *
* @return String representation of the ID.
*/
- public String asString();
-
+ String asString();
+
}
diff --git a/api/src/main/java/org/fuin/esc/api/TypeName.java b/api/src/main/java/org/fuin/esc/api/TypeName.java
index 8820b64f..a82aa065 100644
--- a/api/src/main/java/org/fuin/esc/api/TypeName.java
+++ b/api/src/main/java/org/fuin/esc/api/TypeName.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -20,15 +20,18 @@
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
import org.fuin.objects4j.core.AbstractStringValueObject;
+import javax.annotation.concurrent.Immutable;
+import java.io.Serial;
+
/**
* Name that uniquely identifies a type of data.
*/
@Immutable
public final class TypeName extends AbstractStringValueObject {
+ @Serial
private static final long serialVersionUID = 811127657088134517L;
@NotNull
@@ -43,7 +46,7 @@ protected TypeName() { //NOSONAR Ignore uninitialized fields
/**
* Constructor with unique type name.
- *
+ *
* @param value
* Type name.
*/
@@ -54,12 +57,12 @@ public TypeName(@NotEmpty final String value) {
}
@Override
- public final String asBaseType() {
+ public String asBaseType() {
return value;
}
@Override
- public final String toString() {
+ public String toString() {
return asBaseType();
}
diff --git a/api/src/main/java/org/fuin/esc/api/WritableEventStore.java b/api/src/main/java/org/fuin/esc/api/WritableEventStore.java
index cf991bf5..3fa9769b 100644
--- a/api/src/main/java/org/fuin/esc/api/WritableEventStore.java
+++ b/api/src/main/java/org/fuin/esc/api/WritableEventStore.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -32,40 +32,40 @@ public interface WritableEventStore extends EventStoreBasics {
* creating a stream without appending events to it. If the event store does
* not support a create operation, a call to {@link #createStream(StreamId)}
* will do nothing, but it will not fail.
- *
+ *
* @return TRUE if it's possible to create a stream without appending events
* to it or FALSE if only appending events implicitly creates a
* stream.
*/
- public boolean isSupportsCreateStream();
+ boolean isSupportsCreateStream();
/**
- * Creates a new stream. Some implementations may do nothing, because the
+ * Creates a new stream. Some implementations may do nothing, because they
* create streams when the first event is appended. If
* {@link #isSupportsCreateStream()} returns FALSE, this method does
* nothing, but is expected not fail.
- *
+ *
* @param streamId
* The unique identifier of the stream to create.
- *
+ *
* @throws StreamAlreadyExistsException
* The stream already exists.
*/
- public void createStream(@NotNull StreamId streamId) throws StreamAlreadyExistsException;
+ void createStream(@NotNull StreamId streamId) throws StreamAlreadyExistsException;
/**
* Appends one or more events to a stream. If the stream does not exist, the
* implementation may create it on the fly.
- *
+ *
* @param streamId
* The unique identifier of the stream to append the events to.
* @param expectedVersion
* The version the stream should have.
* @param events
* Array of events to write to the stream
- *
+ *
* @return The next expected version for the stream.
- *
+ *
* @throws StreamNotFoundException
* The stream does not exist in the repository and the
* implementation cannot create it on-the-fly.
@@ -77,21 +77,21 @@ public interface WritableEventStore extends EventStoreBasics {
* @throws StreamReadOnlyException
* The given stream identifier points to a projection.
*/
- public long appendToStream(@NotNull StreamId streamId, long expectedVersion, @NotNull CommonEvent... events)
+ long appendToStream(@NotNull StreamId streamId, long expectedVersion, @NotNull CommonEvent... events)
throws StreamNotFoundException, StreamDeletedException, WrongExpectedVersionException,
StreamReadOnlyException;
/**
* Appends one or more events to a stream. If the stream does not exist, the
* implementation may create it on the fly.
- *
+ *
* @param streamId
* The unique identifier of the stream to append the events to.
* @param events
* Array of events to write to the stream
- *
+ *
* @return The next expected version for the stream.
- *
+ *
* @throws StreamNotFoundException
* The stream does not exist in the repository and the
* implementation cannot create it on-the-fly.
@@ -101,22 +101,22 @@ public long appendToStream(@NotNull StreamId streamId, long expectedVersion, @No
* @throws StreamReadOnlyException
* The given stream identifier points to a projection.
*/
- public long appendToStream(@NotNull StreamId streamId, @NotNull CommonEvent... events)
+ long appendToStream(@NotNull StreamId streamId, @NotNull CommonEvent... events)
throws StreamNotFoundException, StreamDeletedException, StreamReadOnlyException;
/**
* Appends a list of events to a stream. If the stream does not exist, the
* implementation may create it on the fly.
- *
+ *
* @param streamId
* The unique identifier of the stream to append the events to.
* @param expectedVersion
* The version the stream should have.
* @param events
* List of events to write to the stream
- *
+ *
* @return The next expected version for the stream.
- *
+ *
* @throws StreamNotFoundException
* The stream does not exist in the repository and the
* implementation cannot create it on-the-fly.
@@ -127,21 +127,21 @@ public long appendToStream(@NotNull StreamId streamId, @NotNull CommonEvent... e
* @throws StreamReadOnlyException
* The given stream identifier points to a projection.
*/
- public long appendToStream(@NotNull StreamId streamId, long expectedVersion,
- @NotNull List
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -29,36 +29,36 @@
public interface WritableEventStoreAsync extends EventStoreBasicsAsync {
/**
- * Creates a new stream. Some implementations may do nothing, because the
+ * Creates a new stream. Some implementations may do nothing, because they
* create streams when the first event is appended. If
* {@link #isSupportsCreateStream()} returns FALSE, this method does
* nothing, but is expected not fail.
- *
+ *
* @param streamId
* The unique identifier of the stream to create.
- *
+ *
* @return Nothing.
- *
+ *
* @throws StreamAlreadyExistsException
* The stream already exists.
*/
@NotNull
- public CompletableFuture
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -20,7 +20,8 @@
import jakarta.annotation.Nullable;
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
/**
* Signals a conflict between an expected and an actual version.
@@ -38,7 +39,7 @@ public final class WrongExpectedVersionException extends RuntimeException {
/**
* Constructor with all data.
- *
+ *
* @param streamId
* Unique name of the stream.
* @param expected
@@ -47,11 +48,10 @@ public final class WrongExpectedVersionException extends RuntimeException {
* Actual version.
*/
public WrongExpectedVersionException(@NotNull final StreamId streamId,
- @NotNull final Long expected, @Nullable final Long actual) {
- // CHECKSTYLE:OFF:AvoidInlineConditionals OK here
+ @NotNull final Long expected, @Nullable final Long actual) {
super("Expected version " + expected + " for stream '" + streamId
+ (actual == null ? "'" : "', but was " + actual));
- // CHECKSTYLE:ON
+
Contract.requireArgNotNull("streamId", streamId);
Contract.requireArgNotNull("expected", streamId);
this.streamId = streamId;
@@ -61,32 +61,32 @@ public WrongExpectedVersionException(@NotNull final StreamId streamId,
/**
* Returns the unique identifier of the stream.
- *
+ *
* @return Stream that was not found.
*/
@NotNull
- public final StreamId getStreamId() {
+ public StreamId getStreamId() {
return streamId;
}
/**
* Returns the expected version.
- *
+ *
* @return Expected version.
*/
@NotNull
- public final Long getExpected() {
+ public Long getExpected() {
return expected;
}
/**
* Returns the actual version.
- *
+ *
* @return Actual version or
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see http://www.gnu.org/licenses/.
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -35,7 +35,6 @@
/**
* Test for {@link DelegatingAsyncEventStore}.
*/
-// CHECKSTYLE:OFF Test
@ExtendWith(MockitoExtension.class)
public class DelegatingAsyncEventStoreTest {
@@ -113,7 +112,7 @@ public void testAppendToStreamArrayAnyVersion() throws Exception {
verify(delegate).appendToStream(streamId, eventOne, eventTwo);
}
-
+
@Test
public void testReadEvent() throws Exception {
@@ -211,7 +210,7 @@ public void testAppendToStreamListExpectedVersion() throws Exception {
verify(delegate).appendToStream(streamId, ANY_VERSION, events);
}
-
+
@Test
public void testAppendToStreamListAnyVersion() throws Exception {
@@ -260,7 +259,7 @@ public void testStreamState() throws Exception {
verify(delegate).streamState(streamId);
}
-
+
private static CommonEvent event(final String name) {
return event(new EventId(), name);
}
@@ -270,4 +269,4 @@ private static CommonEvent event(final EventId id, final String name) {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/EnhancedMimeTypeTest.java b/api/src/test/java/org/fuin/esc/api/EnhancedMimeTypeTest.java
index 7ac6e085..9f58e85e 100644
--- a/api/src/test/java/org/fuin/esc/api/EnhancedMimeTypeTest.java
+++ b/api/src/test/java/org/fuin/esc/api/EnhancedMimeTypeTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -21,7 +21,6 @@
import jakarta.activation.MimeTypeParseException;
import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Warning;
-import org.fuin.esc.api.EnhancedMimeType;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -35,7 +34,6 @@
/**
* Tests the {@link EnhancedMimeType} class.
*/
-// CHECKSTYLE:OFF Test
public class EnhancedMimeTypeTest {
private EnhancedMimeType testee;
diff --git a/api/src/test/java/org/fuin/esc/api/EscApiUtilsTest.java b/api/src/test/java/org/fuin/esc/api/EscApiUtilsTest.java
index 8d17976e..42841a47 100644
--- a/api/src/test/java/org/fuin/esc/api/EscApiUtilsTest.java
+++ b/api/src/test/java/org/fuin/esc/api/EscApiUtilsTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
diff --git a/api/src/test/java/org/fuin/esc/api/EventIdTest.java b/api/src/test/java/org/fuin/esc/api/EventIdTest.java
index 999b15e4..62822e05 100644
--- a/api/src/test/java/org/fuin/esc/api/EventIdTest.java
+++ b/api/src/test/java/org/fuin/esc/api/EventIdTest.java
@@ -1,69 +1,16 @@
-/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
- * http://www.fuin.org/
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option) any
- * later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see http://www.gnu.org/licenses/.
- */
-package org.fuin.esc.api;
-
-import org.fuin.objects4j.common.ConstraintViolationException;
-import org.junit.jupiter.api.Test;
-
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.fuin.utils4j.Utils4J.deserialize;
-import static org.fuin.utils4j.Utils4J.serialize;
-
-// CHECKSTYLE:OFF Test code
-public final class EventIdTest {
-
- @Test
- public final void testSerialize() {
- final UUID uuid = UUID.randomUUID();
- final EventId original = new EventId(uuid);
- final EventId copy = deserialize(serialize(original));
- assertThat(original).isEqualTo(copy);
- }
-
- @Test
- public final void testConstructValid() {
- final UUID uuid = UUID.randomUUID();
- assertThat(new EventId(uuid).asBaseType()).isEqualTo(uuid);
- }
-
- @Test
- public final void testConstructNullString() {
- assertThatThrownBy(() -> {
- new EventId((String) null);
- }).isInstanceOf(ConstraintViolationException.class);
- }
-
- @Test
- public final void testConstructNullUUID() {
- assertThatThrownBy(() -> {
- new EventId((UUID) null);
- }).isInstanceOf(ConstraintViolationException.class);
- }
-
- @Test
- public final void testConstructInvalidString() {
- assertThatThrownBy(() -> {
- new EventId("x");
- }).isInstanceOf(ConstraintViolationException.class);
- }
-
-}
-// CHECKSTYLE:ON
+package org.fuin.esc.api;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test for the {@link EventId} class.
+ */
+public class EventIdTest {
+
+ @Test
+ void testEqualsHashCode() {
+ EqualsVerifier.forClass(EventId.class).verify();
+ }
+
+}
diff --git a/api/src/test/java/org/fuin/esc/api/EventNotFoundExceptionTest.java b/api/src/test/java/org/fuin/esc/api/EventNotFoundExceptionTest.java
index d51ca885..7bc6247a 100644
--- a/api/src/test/java/org/fuin/esc/api/EventNotFoundExceptionTest.java
+++ b/api/src/test/java/org/fuin/esc/api/EventNotFoundExceptionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link EventNotFoundException} class.
*/
-// CHECKSTYLE:OFF Test
public class EventNotFoundExceptionTest {
private static final StreamId STREAM_ID = new SimpleStreamId("MyStream");
@@ -71,4 +70,4 @@ public void testSerializeDeserialize() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/ExpectedVersionTest.java b/api/src/test/java/org/fuin/esc/api/ExpectedVersionTest.java
index 0cad7678..3077ec25 100644
--- a/api/src/test/java/org/fuin/esc/api/ExpectedVersionTest.java
+++ b/api/src/test/java/org/fuin/esc/api/ExpectedVersionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -21,7 +21,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF Test code
+
public final class ExpectedVersionTest {
@Test
@@ -45,4 +45,4 @@ public final void testNo() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/JsonDeSerializerTest.java b/api/src/test/java/org/fuin/esc/api/JsonDeSerializerTest.java
deleted file mode 100644
index bcbeda07..00000000
--- a/api/src/test/java/org/fuin/esc/api/JsonDeSerializerTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
- * http://www.fuin.org/
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option) any
- * later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see http://www.gnu.org/licenses/.
- */
-package org.fuin.esc.api;
-
-import jakarta.activation.MimeTypeParseException;
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.api.JsonDeSerializer;
-import org.fuin.esc.api.SerializedDataType;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests the {@link JsonDeSerializer} class.
- */
-// CHECKSTYLE:OFF Test
-public class JsonDeSerializerTest {
-
- private JsonDeSerializer testee;
-
- @BeforeEach
- public void setup() throws MimeTypeParseException {
- testee = new JsonDeSerializer();
- }
-
- @AfterEach
- public void teardown() {
- testee = null;
- }
-
- @Test
- public void testMarshalUnmarshal() {
-
- // PREPARE
- final SerializedDataType type = new SerializedDataType("Person");
- final JsonObject original = Json.createObjectBuilder().add("name", "Peter").add("age", 21).build();
-
- // TEST
- final byte[] data = testee.marshal(original, type);
- final JsonObject copy = testee.unmarshal(data, type, EnhancedMimeType.create("application/json; encoding=utf-8"));
-
- // VERIFY
- assertThat(copy.keySet()).contains("name", "age");
- assertThat(copy.getString("name")).isEqualTo("Peter");
- assertThat(copy.getInt("age")).isEqualTo(21);
-
- }
-
-}
-// CHECKSTYLE:ON
diff --git a/api/src/test/java/org/fuin/esc/api/MyEvent.java b/api/src/test/java/org/fuin/esc/api/MyEvent.java
index 21dc7b9c..46b17c35 100644
--- a/api/src/test/java/org/fuin/esc/api/MyEvent.java
+++ b/api/src/test/java/org/fuin/esc/api/MyEvent.java
@@ -1,9 +1,11 @@
-// CHECKSTYLE:OFF Test
package org.fuin.esc.api;
+import com.tngtech.archunit.junit.ArchIgnore;
+
/**
* Example event.
*/
+@ArchIgnore
@HasSerializedDataTypeConstant
public class MyEvent {
@@ -45,4 +47,3 @@ public boolean equals(Object obj) {
}
}
-// CHECKSTYLE:ON
diff --git a/api/src/test/java/org/fuin/esc/api/ProjectionNotWritableExceptionTest.java b/api/src/test/java/org/fuin/esc/api/ProjectionNotWritableExceptionTest.java
index 6d93f28b..4609b16e 100644
--- a/api/src/test/java/org/fuin/esc/api/ProjectionNotWritableExceptionTest.java
+++ b/api/src/test/java/org/fuin/esc/api/ProjectionNotWritableExceptionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link StreamReadOnlyException} class.
*/
-// CHECKSTYLE:OFF Test
public class ProjectionNotWritableExceptionTest {
private static final StreamId STREAM_ID = new SimpleStreamId("MyStream");
@@ -67,4 +66,4 @@ public void testSerializeDeserialize() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/ProjectionStreamIdTest.java b/api/src/test/java/org/fuin/esc/api/ProjectionStreamIdTest.java
index bfd37b60..d573c118 100644
--- a/api/src/test/java/org/fuin/esc/api/ProjectionStreamIdTest.java
+++ b/api/src/test/java/org/fuin/esc/api/ProjectionStreamIdTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link ProjectionStreamId} class.
*/
-// CHECKSTYLE:OFF Test
public class ProjectionStreamIdTest {
private static final String NAME = "MyProjection";
@@ -65,4 +64,4 @@ public void testGetSingleParamValue() {
}).isInstanceOf(UnsupportedOperationException.class);
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/SerializedDataTypeTest.java b/api/src/test/java/org/fuin/esc/api/SerializedDataTypeTest.java
index 97b63dbe..c19914da 100644
--- a/api/src/test/java/org/fuin/esc/api/SerializedDataTypeTest.java
+++ b/api/src/test/java/org/fuin/esc/api/SerializedDataTypeTest.java
@@ -1,23 +1,22 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
-import org.fuin.esc.api.SerializedDataType;
import org.fuin.objects4j.common.ConstraintViolationException;
import org.junit.jupiter.api.Test;
@@ -26,7 +25,7 @@
import static org.fuin.utils4j.Utils4J.deserialize;
import static org.fuin.utils4j.Utils4J.serialize;
-// CHECKSTYLE:OFF Test code
+
public final class SerializedDataTypeTest {
@Test
@@ -56,7 +55,7 @@ public final void testConstructEmpty() {
assertThatThrownBy(() -> {
new SerializedDataType("");
}).isInstanceOf(ConstraintViolationException.class);
-}
+ }
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/SimpleCommonEventTest.java b/api/src/test/java/org/fuin/esc/api/SimpleCommonEventTest.java
index 083c014d..8557382a 100644
--- a/api/src/test/java/org/fuin/esc/api/SimpleCommonEventTest.java
+++ b/api/src/test/java/org/fuin/esc/api/SimpleCommonEventTest.java
@@ -1,24 +1,22 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Warning;
import org.junit.jupiter.api.AfterEach;
@@ -30,18 +28,17 @@
/**
* Tests the {@link SimpleCommonEvent} class.
*/
-// CHECKSTYLE:OFF Test
public class SimpleCommonEventTest {
private static final EventId ID = new EventId();
private static final TypeName DATA_TYPE = new TypeName("MyEvent");
- private static MyEvent DATA = new MyEvent("Peter");
+ private static final MyEvent DATA = new MyEvent("Peter");
private static final TypeName META_TYPE = new TypeName("MyMeta");
- private static JsonObject META = Json.createObjectBuilder().add("ip", "127.0.0.1").build();
+ private static final String META = " { \"ip\" : \"127.0.0.1\" }";
private SimpleCommonEvent testee;
@@ -70,4 +67,4 @@ public void testGetter() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/SimpleSerializedDataTypeRegistryTest.java b/api/src/test/java/org/fuin/esc/api/SimpleSerializedDataTypeRegistryTest.java
index e1ff601b..519fbe58 100644
--- a/api/src/test/java/org/fuin/esc/api/SimpleSerializedDataTypeRegistryTest.java
+++ b/api/src/test/java/org/fuin/esc/api/SimpleSerializedDataTypeRegistryTest.java
@@ -1,24 +1,22 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
-import org.fuin.esc.api.SerializedDataType;
-import org.fuin.esc.api.SimpleSerializedDataTypeRegistry;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -27,7 +25,6 @@
/**
* Tests the {@link SimpleSerializedDataTypeRegistry} class.
*/
-// CHECKSTYLE:OFF Test
public class SimpleSerializedDataTypeRegistryTest {
@Test
@@ -36,7 +33,7 @@ public void testFindClass() {
final SimpleSerializedDataTypeRegistry testee = new SimpleSerializedDataTypeRegistry();
final SerializedDataType type = new SerializedDataType("String");
testee.add(type, String.class);
-
+
assertThat(testee.findClass(type)).isEqualTo(String.class);
try {
@@ -48,4 +45,4 @@ public void testFindClass() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/SimpleSerializerDeserializerRegistryTest.java b/api/src/test/java/org/fuin/esc/api/SimpleSerializerDeserializerRegistryTest.java
index b11cfbc4..21d07203 100644
--- a/api/src/test/java/org/fuin/esc/api/SimpleSerializerDeserializerRegistryTest.java
+++ b/api/src/test/java/org/fuin/esc/api/SimpleSerializerDeserializerRegistryTest.java
@@ -1,38 +1,35 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
import jakarta.activation.MimeTypeParseException;
-import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.api.SerializedDataType;
-import org.fuin.esc.api.SimpleSerializerDeserializerRegistry;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests the {@link SimpleSerializerDeserializerRegistry} class.
*/
-// CHECKSTYLE:OFF Test
public class SimpleSerializerDeserializerRegistryTest {
private SimpleSerializerDeserializerRegistry testee;
@@ -53,16 +50,15 @@ public void testAddGetDeserializer() {
// PREPARE
final SerializedDataType type = new SerializedDataType("MyType");
final String contentType = "application/json";
- final JsonDeSerializer deserializer = new JsonDeSerializer();
+ final Deserializer deserializer = Mockito.mock(Deserializer.class);
final EnhancedMimeType mimeType = EnhancedMimeType.create(
- "application", "json", Charset.forName("utf-8"), "1");
+ "application", "json", StandardCharsets.UTF_8, "1");
// TEST
testee.addDeserializer(type, contentType, deserializer);
// VERIFY
- assertThat(testee.getDeserializer(type, mimeType)).isSameAs(
- deserializer);
+ assertThat(testee.getDeserializer(type, mimeType)).isSameAs(deserializer);
}
@@ -72,9 +68,9 @@ public void testSetGetDefaultContentType() {
// PREPARE
final SerializedDataType type = new SerializedDataType("MyType");
final String contentType = "application/json";
- final JsonDeSerializer deserializer = new JsonDeSerializer();
+ final Deserializer deserializer = Mockito.mock(Deserializer.class);
final EnhancedMimeType mimeType = EnhancedMimeType.create(
- "application", "json", Charset.forName("utf-8"));
+ "application", "json", StandardCharsets.UTF_8);
testee.addDeserializer(type, contentType, deserializer);
// TEST
@@ -91,7 +87,7 @@ public void testAddGetSerializer() {
// PREPARE
final SerializedDataType type = new SerializedDataType("MyType");
- final JsonDeSerializer serializer = new JsonDeSerializer();
+ final Serializer serializer = Mockito.mock(Serializer.class);
// TEST
testee.addSerializer(type, serializer);
@@ -102,4 +98,4 @@ public void testAddGetSerializer() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/SimpleStreamIdTest.java b/api/src/test/java/org/fuin/esc/api/SimpleStreamIdTest.java
index 34b0ff9a..dd27df97 100644
--- a/api/src/test/java/org/fuin/esc/api/SimpleStreamIdTest.java
+++ b/api/src/test/java/org/fuin/esc/api/SimpleStreamIdTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link SimpleStreamId} class.
*/
-// CHECKSTYLE:OFF Test
public class SimpleStreamIdTest {
private static final String NAME = "MyStream1";
@@ -65,4 +64,4 @@ public void testGetSingleParamValue() {
}).isInstanceOf(UnsupportedOperationException.class);
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/SimpleTenantIdTest.java b/api/src/test/java/org/fuin/esc/api/SimpleTenantIdTest.java
index 42c296aa..0a3ebbdc 100644
--- a/api/src/test/java/org/fuin/esc/api/SimpleTenantIdTest.java
+++ b/api/src/test/java/org/fuin/esc/api/SimpleTenantIdTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
diff --git a/api/src/test/java/org/fuin/esc/api/StreamAlreadyExistsExceptionTest.java b/api/src/test/java/org/fuin/esc/api/StreamAlreadyExistsExceptionTest.java
index b0315ae7..f395f233 100644
--- a/api/src/test/java/org/fuin/esc/api/StreamAlreadyExistsExceptionTest.java
+++ b/api/src/test/java/org/fuin/esc/api/StreamAlreadyExistsExceptionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link StreamAlreadyExistsException} class.
*/
-// CHECKSTYLE:OFF Test
public class StreamAlreadyExistsExceptionTest {
private static final StreamId STREAM_ID = new SimpleStreamId("MyStream");
@@ -67,4 +66,4 @@ public void testSerializeDeserialize() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/StreamDeletedExceptionTest.java b/api/src/test/java/org/fuin/esc/api/StreamDeletedExceptionTest.java
index 7197bd95..2186a5f7 100644
--- a/api/src/test/java/org/fuin/esc/api/StreamDeletedExceptionTest.java
+++ b/api/src/test/java/org/fuin/esc/api/StreamDeletedExceptionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link StreamDeletedException} class.
*/
-// CHECKSTYLE:OFF Test
public class StreamDeletedExceptionTest {
private static final StreamId STREAM_ID = new SimpleStreamId("MyStream");
@@ -67,4 +66,4 @@ public void testSerializeDeserialize() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/StreamEventsSliceTest.java b/api/src/test/java/org/fuin/esc/api/StreamEventsSliceTest.java
index b949c8be..9191d552 100644
--- a/api/src/test/java/org/fuin/esc/api/StreamEventsSliceTest.java
+++ b/api/src/test/java/org/fuin/esc/api/StreamEventsSliceTest.java
@@ -1,25 +1,23 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.api;
import jakarta.activation.MimeTypeParseException;
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
import nl.jqno.equalsverifier.EqualsVerifier;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -34,7 +32,6 @@
/**
* Tests the {@link StreamEventsSlice} class.
*/
-// CHECKSTYLE:OFF Test
public class StreamEventsSliceTest {
private static final int FROM = 0;
@@ -51,7 +48,7 @@ public class StreamEventsSliceTest {
public static void beforeClass() throws MimeTypeParseException {
final TypeName dataType = new TypeName("MyEvent");
final TypeName metaType = new TypeName("MyMeta");
- final JsonObject meta = Json.createObjectBuilder().add("ip", "127.0.0.1").build();
+ final String meta = "{ \"ip\" : \"127.0.0.1\" }";
events = new ArrayList
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link StreamNotFoundException} class.
*/
-// CHECKSTYLE:OFF Test
public class StreamNotFoundExceptionTest {
private static final StreamId STREAM_ID = new SimpleStreamId("MyStream");
@@ -67,4 +66,4 @@ public void testSerializeDeserialize() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/StreamReadOnlyExceptionTest.java b/api/src/test/java/org/fuin/esc/api/StreamReadOnlyExceptionTest.java
index fabd4659..fbc00461 100644
--- a/api/src/test/java/org/fuin/esc/api/StreamReadOnlyExceptionTest.java
+++ b/api/src/test/java/org/fuin/esc/api/StreamReadOnlyExceptionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link StreamReadOnlyException} class.
*/
-// CHECKSTYLE:OFF Test
public class StreamReadOnlyExceptionTest {
private static final StreamId STREAM_ID = new SimpleStreamId("MyStream");
@@ -67,4 +66,4 @@ public void testSerializeDeserialize() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/StreamStateTest.java b/api/src/test/java/org/fuin/esc/api/StreamStateTest.java
index 7289a3f7..3494a481 100644
--- a/api/src/test/java/org/fuin/esc/api/StreamStateTest.java
+++ b/api/src/test/java/org/fuin/esc/api/StreamStateTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -21,7 +21,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF Test code
+
public final class StreamStateTest {
@Test
@@ -34,4 +34,4 @@ public final void testFromDbValue() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/StreamVersionConflictExceptionTest.java b/api/src/test/java/org/fuin/esc/api/StreamVersionConflictExceptionTest.java
index 0782f727..bd5c8056 100644
--- a/api/src/test/java/org/fuin/esc/api/StreamVersionConflictExceptionTest.java
+++ b/api/src/test/java/org/fuin/esc/api/StreamVersionConflictExceptionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link WrongExpectedVersionException} class.
*/
-// CHECKSTYLE:OFF Test
public class StreamVersionConflictExceptionTest {
private static final StreamId STREAM_ID = new SimpleStreamId("MyStream");
@@ -76,4 +75,4 @@ public void testSerializeDeserialize() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/SubscriptionTest.java b/api/src/test/java/org/fuin/esc/api/SubscriptionTest.java
index 3ecf17b0..e68b9cce 100644
--- a/api/src/test/java/org/fuin/esc/api/SubscriptionTest.java
+++ b/api/src/test/java/org/fuin/esc/api/SubscriptionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -21,27 +21,27 @@
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF Test code
+
public final class SubscriptionTest {
@Test
public final void testConstruction() {
-
+
// PREPARE
final StreamId streamId = new SimpleStreamId("stream1");
final Long lastEventNumber = 1L;
-
+
// TEST
final Subscription testee = new Subscription(streamId, lastEventNumber) {
private static final long serialVersionUID = 1L;
};
-
+
// VERIFY
assertThat(testee.getStreamId()).isEqualTo(streamId);
assertThat(testee.getLastEventNumber()).isEqualTo(lastEventNumber);
-
+
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/TypeNameTest.java b/api/src/test/java/org/fuin/esc/api/TypeNameTest.java
index 16113976..ca0166e2 100644
--- a/api/src/test/java/org/fuin/esc/api/TypeNameTest.java
+++ b/api/src/test/java/org/fuin/esc/api/TypeNameTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -25,7 +25,7 @@
import static org.fuin.utils4j.Utils4J.deserialize;
import static org.fuin.utils4j.Utils4J.serialize;
-// CHECKSTYLE:OFF Test code
+
public final class TypeNameTest {
@Test
@@ -58,4 +58,4 @@ public final void testConstructEmpty() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/java/org/fuin/esc/api/WrongExpectedVersionExceptionTest.java b/api/src/test/java/org/fuin/esc/api/WrongExpectedVersionExceptionTest.java
index 5733b80d..f7ab8efe 100644
--- a/api/src/test/java/org/fuin/esc/api/WrongExpectedVersionExceptionTest.java
+++ b/api/src/test/java/org/fuin/esc/api/WrongExpectedVersionExceptionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -28,7 +28,6 @@
/**
* Tests the {@link WrongExpectedVersionException} class.
*/
-// CHECKSTYLE:OFF Test
public class WrongExpectedVersionExceptionTest {
private static final StreamId STREAM_ID = new SimpleStreamId("MyStream");
@@ -75,4 +74,4 @@ public void testSerializeDeserialize() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/api/src/test/resources/logback-test.xml b/api/src/test/resources/logback-test.xml
index 6062cc03..7078062a 100644
--- a/api/src/test/resources/logback-test.xml
+++ b/api/src/test/resources/logback-test.xml
@@ -1,18 +1,18 @@
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.client;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.HasSerializedDataTypeConstant;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.TypeName;
+import org.fuin.objects4j.common.Contract;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+/**
+ * Something interesting happened. Equals and hash code are based on the UUID.
+ */
+@HasSerializedDataTypeConstant
+public final class MyEvent implements Serializable {
+
+ private static final long serialVersionUID = 100L;
+
+ /** Unique name of the event. */
+ public static final TypeName TYPE = new TypeName("MyEvent");
+
+ /** Unique name of the serialized event. */
+ public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
+
+ private String id;
+
+ private String description;
+
+ /**
+ * Protected default constructor for JAXB.
+ */
+ protected MyEvent() {
+ super();
+ }
+
+ /**
+ * Constructor with random UUID.
+ *
+ * @param description
+ * The description.
+ */
+ public MyEvent(@NotEmpty final String description) {
+ super();
+ Contract.requireArgNotEmpty("description", description);
+ this.id = UUID.randomUUID().toString();
+ this.description = description;
+ }
+
+ /**
+ * Constructor with all mandatory data.
+ *
+ * @param uuid
+ * The unique identifier of the event.
+ * @param description
+ * The description.
+ */
+ public MyEvent(@NotNull final UUID uuid, @NotEmpty final String description) {
+ super();
+ Contract.requireArgNotNull("uuid", uuid);
+ Contract.requireArgNotEmpty("description", description);
+ this.id = uuid.toString();
+ this.description = description;
+ }
+
+ /**
+ * Returns the unique identifier.
+ *
+ * @return UUID string.
+ */
+ @NotNull
+ public final String getId() {
+ return id;
+ }
+
+ /**
+ * Returns the description.
+ *
+ * @return The description.
+ */
+ @NotEmpty
+ public final String getDescription() {
+ return description;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ MyEvent other = (MyEvent) obj;
+ if (id == null) {
+ if (other.id != null) {
+ return false;
+ }
+ } else if (!id.equals(other.id)) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public final String toString() {
+ return "My event: " + description;
+ }
+
+}
diff --git a/esgrpc/README.md b/esgrpc/README.md
index 84ad53f3..43e7dc9e 100644
--- a/esgrpc/README.md
+++ b/esgrpc/README.md
@@ -1,3 +1,5 @@
# esc-esgrpc
-Event store commons [gRPC](https://developers.eventstore.com/clients/grpc/) adapter for Greg Young's [Event Store](https://www.eventstore.com/).
+
+Event store commons [gRPC](https://developers.eventstore.com/clients/grpc/) adapter for Greg
+Young's [Event Store](https://www.eventstore.com/).
diff --git a/esgrpc/pom.xml b/esgrpc/pom.xml
index 135354be..198f14cb 100644
--- a/esgrpc/pom.xml
+++ b/esgrpc/pom.xml
@@ -1,265 +1,301 @@
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.esgrpc;
-import java.nio.charset.Charset;
-
+import com.eventstore.dbclient.EventData;
+import com.eventstore.dbclient.EventDataBuilder;
+import jakarta.validation.constraints.NotNull;
import org.fuin.esc.api.CommonEvent;
-import org.fuin.esc.spi.Base64Data;
import org.fuin.esc.api.Converter;
import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.spi.EscMeta;
-import org.fuin.esc.spi.EscSpiUtils;
+import org.fuin.esc.api.IBase64Data;
+import org.fuin.esc.api.IBaseTypeFactory;
+import org.fuin.esc.api.IEscMeta;
import org.fuin.esc.api.SerializedDataType;
import org.fuin.esc.api.Serializer;
import org.fuin.esc.api.SerializerRegistry;
+import org.fuin.esc.spi.EscSpiUtils;
import org.fuin.objects4j.common.Contract;
-import com.eventstore.dbclient.EventData;
-import com.eventstore.dbclient.EventDataBuilder;
-
-import jakarta.validation.constraints.NotNull;
+import java.nio.charset.StandardCharsets;
/**
* Converts a {@link CommonEvent} into {@link EventData}.
*/
public final class CommonEvent2EventDataConverter implements Converter
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.esgrpc;
-import static org.fuin.esc.api.ExpectedVersion.ANY;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
+import com.eventstore.dbclient.AppendToStreamOptions;
+import com.eventstore.dbclient.DeleteStreamOptions;
+import com.eventstore.dbclient.EventData;
+import com.eventstore.dbclient.EventStoreDBClient;
+import com.eventstore.dbclient.ExpectedRevision;
+import com.eventstore.dbclient.ReadResult;
+import com.eventstore.dbclient.ReadStreamOptions;
+import com.eventstore.dbclient.ResolvedEvent;
+import com.eventstore.dbclient.WriteResult;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.DeserializerRegistry;
+import org.fuin.esc.api.EnhancedMimeType;
import org.fuin.esc.api.EventNotFoundException;
import org.fuin.esc.api.ExpectedVersion;
+import org.fuin.esc.api.IBaseTypeFactory;
+import org.fuin.esc.api.SerDeserializerRegistry;
+import org.fuin.esc.api.SerializerRegistry;
import org.fuin.esc.api.StreamAlreadyExistsException;
import org.fuin.esc.api.StreamDeletedException;
import org.fuin.esc.api.StreamEventsSlice;
@@ -37,511 +48,487 @@
import org.fuin.esc.api.TenantId;
import org.fuin.esc.api.WrongExpectedVersionException;
import org.fuin.esc.spi.AbstractReadableEventStore;
-import org.fuin.esc.api.DeserializerRegistry;
-import org.fuin.esc.api.EnhancedMimeType;
import org.fuin.esc.spi.EscSpiUtils;
-import org.fuin.esc.api.SerDeserializerRegistry;
-import org.fuin.esc.api.SerializerRegistry;
import org.fuin.esc.spi.TenantStreamId;
import org.fuin.objects4j.common.Contract;
-import jakarta.annotation.Nullable;
-import com.eventstore.dbclient.AppendToStreamOptions;
-import com.eventstore.dbclient.DeleteStreamOptions;
-import com.eventstore.dbclient.EventData;
-import com.eventstore.dbclient.EventStoreDBClient;
-import com.eventstore.dbclient.ExpectedRevision;
-import com.eventstore.dbclient.ReadResult;
-import com.eventstore.dbclient.ReadStreamOptions;
-import com.eventstore.dbclient.ResolvedEvent;
-import com.eventstore.dbclient.WriteResult;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
-import io.grpc.Status;
-import io.grpc.StatusRuntimeException;
-import jakarta.validation.constraints.NotNull;
+import static org.fuin.esc.api.ExpectedVersion.ANY;
/**
- * Implementation that connects to the event store
- * (http://www.geteventstore.com) using the esjc
- * (https://github.com/msemys/esjc) API.
+ * Implementation that connects to the event store (Eventstore) using the GRPC API.
*/
public final class ESGrpcEventStore extends AbstractReadableEventStore implements IESGrpcEventStore {
- private final EventStoreDBClient es;
-
- private final CommonEvent2EventDataConverter ce2edConv;
-
- private final RecordedEvent2CommonEventConverter ed2ceConv;
-
- private final TenantId tenantId;
-
- private boolean open;
-
- /**
- * Constructor without a tenant.
- *
- * @param es Delegate.
- * @param serRegistry Registry used to locate serializers.
- * @param desRegistry Registry used to locate deserializers.
- * @param targetContentType Target content type (Allows only 'application/xml'
- * or 'application/json' with 'utf-8' encoding).
- *
- * @deprecated Use the Builder in this class instead.
- */
- @Deprecated
- public ESGrpcEventStore(@NotNull final EventStoreDBClient es, @NotNull final SerializerRegistry serRegistry,
- @NotNull final DeserializerRegistry desRegistry, @NotNull final EnhancedMimeType targetContentType) {
- this(es, serRegistry, desRegistry, targetContentType, null);
- }
-
- /**
- * Private constructor with all data used by the builder.
- *
- * @param es Delegate.
- * @param serRegistry Registry used to locate serializers.
- * @param desRegistry Registry used to locate deserializers.
- * @param targetContentType Target content type (Allows only 'application/xml'
- * or 'application/json' with 'utf-8' encoding).
- * @param tenantId Unique tenant identifier.
- */
- private ESGrpcEventStore(@NotNull final EventStoreDBClient es, @NotNull final SerializerRegistry serRegistry,
- @NotNull final DeserializerRegistry desRegistry, @NotNull final EnhancedMimeType targetContentType,
- @Nullable final TenantId tenantId) {
- super();
- Contract.requireArgNotNull("es", es);
- Contract.requireArgNotNull("serRegistry", serRegistry);
- Contract.requireArgNotNull("desRegistry", desRegistry);
- Contract.requireArgNotNull("targetContentType", targetContentType);
- this.es = es;
- this.ce2edConv = new CommonEvent2EventDataConverter(serRegistry, targetContentType);
- this.ed2ceConv = new RecordedEvent2CommonEventConverter(desRegistry);
- this.tenantId = tenantId;
- this.open = false;
- }
-
- @Override
- public final ESGrpcEventStore open() {
- if (open) {
- // Ignore
- return this;
- }
- this.open = true;
- return this;
- }
-
- @Override
- public final void close() {
- if (!open) {
- // Ignore
- return;
- }
- this.open = false;
- }
-
- @Override
- public final boolean isSupportsCreateStream() {
- return false;
- }
-
- @Override
- public final void createStream(final StreamId streamId) throws StreamAlreadyExistsException {
- // Do nothing as the operation is not supported
- }
-
- @Override
- public final long appendToStream(final StreamId streamId, final CommonEvent... events)
- throws StreamNotFoundException, StreamDeletedException, StreamReadOnlyException {
- return appendToStream(streamId, -2, EscSpiUtils.asList(events));
- }
-
- @Override
- public final long appendToStream(final StreamId streamId, final long expectedVersion, final CommonEvent... events)
- throws StreamNotFoundException, StreamDeletedException, WrongExpectedVersionException,
- StreamReadOnlyException {
- return appendToStream(streamId, expectedVersion, EscSpiUtils.asList(events));
- }
-
- @Override
- public long appendToStream(final StreamId streamId, final List
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -20,8 +20,8 @@
import org.fuin.esc.api.EventStore;
/**
- * Interface for the implementation that connects to the http://www.geteventstore.com via TCP API. This allows dependency injections
- * frameworks like CDI to use this interface rather than the (final) implementation.
+ * Interface for the implementation that connects to the Eventstore via TCP API.
+ * This allows dependency injections frameworks like CDI to use this interface rather than the (final) implementation.
*/
public interface IESGrpcEventStore extends EventStore {
diff --git a/esgrpc/src/main/java/org/fuin/esc/esgrpc/RecordedEvent2CommonEventConverter.java b/esgrpc/src/main/java/org/fuin/esc/esgrpc/RecordedEvent2CommonEventConverter.java
index c69e4124..f503e7ab 100644
--- a/esgrpc/src/main/java/org/fuin/esc/esgrpc/RecordedEvent2CommonEventConverter.java
+++ b/esgrpc/src/main/java/org/fuin/esc/esgrpc/RecordedEvent2CommonEventConverter.java
@@ -1,135 +1,132 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.esgrpc;
-import java.nio.charset.Charset;
-
+import com.eventstore.dbclient.RecordedEvent;
+import jakarta.validation.constraints.NotNull;
import org.fuin.esc.api.CommonEvent;
-import org.fuin.esc.api.EventId;
-import org.fuin.esc.api.SimpleCommonEvent;
-import org.fuin.esc.api.TypeName;
-import org.fuin.esc.spi.Base64Data;
import org.fuin.esc.api.Converter;
import org.fuin.esc.api.Deserializer;
import org.fuin.esc.api.DeserializerRegistry;
import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.spi.EscMeta;
+import org.fuin.esc.api.EventId;
+import org.fuin.esc.api.IBase64Data;
+import org.fuin.esc.api.IEscMeta;
import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.SimpleCommonEvent;
+import org.fuin.esc.api.TypeName;
import org.fuin.objects4j.common.Contract;
-import com.eventstore.dbclient.RecordedEvent;
-
-import jakarta.validation.constraints.NotNull;
+import java.nio.charset.StandardCharsets;
/**
* Converts a {@link RecordedEvent} into {@link CommonEvent}.
*/
public final class RecordedEvent2CommonEventConverter implements Converter
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.esgrpc;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.nio.charset.Charset;
-
-import jakarta.json.Json;
-
+import com.eventstore.dbclient.EventData;
import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.EnhancedMimeType;
import org.fuin.esc.api.EventId;
import org.fuin.esc.api.SimpleCommonEvent;
-import org.fuin.esc.api.TypeName;
-import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.spi.EscMeta;
-import org.fuin.esc.api.JsonDeSerializer;
-import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.SimpleSerializedDataTypeRegistry;
import org.fuin.esc.api.SimpleSerializerDeserializerRegistry;
+import org.fuin.esc.jsonb.BaseTypeFactory;
+import org.fuin.esc.jsonb.EscMeta;
+import org.fuin.esc.jsonb.JsonbDeSerializer;
import org.junit.jupiter.api.Test;
-import com.eventstore.dbclient.EventData;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+
+import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* Test for {@link CommonEvent2EventDataConverter} class.
*/
-// CHECKSTYLE:OFF Test code
+
public final class CommonEvent2EventDataConverterTest {
+ private static final EnhancedMimeType JSON_UTF8 = EnhancedMimeType.create("application", "json", StandardCharsets.UTF_8);
+
@Test
- public final void testConvert() {
+ public final void testConvert() throws IOException {
// PREPARE
- final EnhancedMimeType targetContentType = EnhancedMimeType.create("application", "json",
- Charset.forName("utf-8"));
- final SimpleSerializerDeserializerRegistry serRegistry = new SimpleSerializerDeserializerRegistry();
- final JsonDeSerializer deserializer = new JsonDeSerializer();
- serRegistry.addSerializer(new SerializedDataType("MyData"), deserializer);
- serRegistry.addSerializer(new SerializedDataType("MyMeta"), deserializer);
- serRegistry.addSerializer(new SerializedDataType(EscMeta.TYPE.asBaseType()), deserializer);
-
- final EventId id = new EventId();
- final TypeName dataType = new TypeName("MyData");
- final Object data = Json.createObjectBuilder().add("id", 1).add("name", "Peter").build();
- final TypeName metaType = new TypeName("MyMeta");
- final Object meta = Json.createObjectBuilder().add("ip", "127.0.0.1").build();
- final CommonEvent commonEvent = new SimpleCommonEvent(id, dataType, data, metaType, meta);
-
- final CommonEvent2EventDataConverter testee = new CommonEvent2EventDataConverter(serRegistry,
- targetContentType);
-
- // TEST
- final EventData eventData = testee.convert(commonEvent);
-
- // VERIFY
- assertThat(eventData.getEventId()).isEqualTo(commonEvent.getId().asBaseType());
- assertThat(eventData.getEventType()).isEqualTo(commonEvent.getDataType().asBaseType());
- assertThat(new String(eventData.getEventData(), deserializer.getMimeType().getEncoding()))
- .isEqualTo("{\"id\":1,\"name\":\"Peter\"}");
- assertThat(new String(eventData.getUserMetadata(), deserializer.getMimeType().getEncoding())).isEqualTo(
- "{\"data-type\":\"MyData\"," + "\"data-content-type\":\"application/json; encoding=UTF-8\","
- + "\"meta-type\":\"MyMeta\",\"meta-content-type\":\"application/json; encoding=UTF-8\","
- + "\"MyMeta\":{\"ip\":\"127.0.0.1\"}}");
+ final SimpleSerializedDataTypeRegistry typeRegistry = createTypeRegistry();
+ try (final JsonbDeSerializer jsonbDeSer = TestUtils.createJsonbDeSerializer()) {
+ TestUtils.initSerDeserializerRegistry(typeRegistry, jsonbDeSer);
+
+ final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
+ registry.add(EscMeta.SER_TYPE, JSON_UTF8.getBaseType(), jsonbDeSer);
+ registry.add(MyEvent.SER_TYPE, JSON_UTF8.getBaseType(), jsonbDeSer);
+ registry.add(MyMeta.SER_TYPE, JSON_UTF8.getBaseType(), jsonbDeSer);
+
+ final MyEvent myEvent = new MyEvent(UUID.fromString("52faeb52-3933-422e-a1f4-4393a6517678"), "Hello, JSON!");
+ final MyMeta myMeta = new MyMeta("michael");
+ final CommonEvent commonEvent = new SimpleCommonEvent(new EventId(myEvent.getId()), MyEvent.TYPE, myEvent,
+ MyMeta.TYPE, myMeta);
+
+ final CommonEvent2EventDataConverter testee = new CommonEvent2EventDataConverter(registry, new BaseTypeFactory(), JSON_UTF8);
+
+ // TEST
+ final EventData eventData = testee.convert(commonEvent);
+
+ // VERIFY
+ assertThat(eventData.getEventId()).isEqualTo(commonEvent.getId().asBaseType());
+ assertThat(eventData.getEventType()).isEqualTo(commonEvent.getDataType().asBaseType());
+ assertThatJson(new String(eventData.getEventData(), StandardCharsets.UTF_8)).isEqualTo("""
+ {"description":"Hello, JSON!","id":"52faeb52-3933-422e-a1f4-4393a6517678"}""");
+ assertThatJson(new String(eventData.getUserMetadata(), StandardCharsets.UTF_8)).isEqualTo("""
+ {"data-type":"MyEvent","data-content-type":"application/json; encoding=UTF-8","meta-type":"MyMeta","meta-content-type":"application/json; encoding=UTF-8","MyMeta":{"user":"michael"}}""");
+
+ }
}
+ private static SimpleSerializedDataTypeRegistry createTypeRegistry() {
+ final SimpleSerializedDataTypeRegistry typeRegistry = new SimpleSerializedDataTypeRegistry();
+ typeRegistry.add(EscMeta.SER_TYPE, org.fuin.esc.jsonb.EscMeta.class);
+ typeRegistry.add(MyEvent.SER_TYPE, MyEvent.class);
+ typeRegistry.add(MyMeta.SER_TYPE, MyMeta.class);
+ return typeRegistry;
+ }
+
}
-// CHECKSTYLE:ON
+
diff --git a/esgrpc/src/test/java/org/fuin/esc/esgrpc/ESGrpcEventStoreTest.java b/esgrpc/src/test/java/org/fuin/esc/esgrpc/ESGrpcEventStoreTest.java
new file mode 100644
index 00000000..64238dae
--- /dev/null
+++ b/esgrpc/src/test/java/org/fuin/esc/esgrpc/ESGrpcEventStoreTest.java
@@ -0,0 +1,13 @@
+package org.fuin.esc.esgrpc;
+
+import org.fuin.utils4j.TestOmitted;
+
+/**
+ * Test for the {@link ESGrpcEventStore} class.
+ */
+@TestOmitted("Tested in the 'test' project")
+public class ESGrpcEventStoreTest {
+
+ // No code by intention
+
+}
diff --git a/esgrpc/src/test/java/org/fuin/esc/esgrpc/GrpcProjectionAdminEventStoreIT.java b/esgrpc/src/test/java/org/fuin/esc/esgrpc/GrpcProjectionAdminEventStoreIT.java
index 9e233b48..041082df 100644
--- a/esgrpc/src/test/java/org/fuin/esc/esgrpc/GrpcProjectionAdminEventStoreIT.java
+++ b/esgrpc/src/test/java/org/fuin/esc/esgrpc/GrpcProjectionAdminEventStoreIT.java
@@ -3,6 +3,7 @@
import com.eventstore.dbclient.EventStoreDBClientSettings;
import com.eventstore.dbclient.EventStoreDBConnectionString;
import com.eventstore.dbclient.EventStoreDBProjectionManagementClient;
+import com.tngtech.archunit.junit.ArchIgnore;
import org.fuin.esc.api.ProjectionStreamId;
import org.fuin.esc.api.TypeName;
import org.junit.jupiter.api.BeforeAll;
@@ -16,6 +17,7 @@
/**
* Tests the {@link GrpcProjectionAdminEventStore} class.
*/
+@ArchIgnore
class GrpcProjectionAdminEventStoreIT {
private static EventStoreDBProjectionManagementClient client;
diff --git a/esgrpc/src/test/java/org/fuin/esc/esgrpc/GrpcProjectionAdminEventStoreTest.java b/esgrpc/src/test/java/org/fuin/esc/esgrpc/GrpcProjectionAdminEventStoreTest.java
new file mode 100644
index 00000000..bf6c4338
--- /dev/null
+++ b/esgrpc/src/test/java/org/fuin/esc/esgrpc/GrpcProjectionAdminEventStoreTest.java
@@ -0,0 +1,13 @@
+package org.fuin.esc.esgrpc;
+
+import org.fuin.utils4j.TestOmitted;
+
+/**
+ * Test for the {@link GrpcProjectionAdminEventStore} class.
+ */
+@TestOmitted("Tested in the 'test' project")
+public class GrpcProjectionAdminEventStoreTest {
+
+ // No code by intention
+
+}
diff --git a/esgrpc/src/test/java/org/fuin/esc/esgrpc/MyEvent.java b/esgrpc/src/test/java/org/fuin/esc/esgrpc/MyEvent.java
index 9f57bd94..2ac27819 100644
--- a/esgrpc/src/test/java/org/fuin/esc/esgrpc/MyEvent.java
+++ b/esgrpc/src/test/java/org/fuin/esc/esgrpc/MyEvent.java
@@ -1,54 +1,52 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.esgrpc;
-import java.io.Serializable;
-import java.nio.charset.Charset;
-import java.util.UUID;
-
-import jakarta.json.Json;
+import com.tngtech.archunit.junit.ArchIgnore;
import jakarta.json.JsonObject;
-import jakarta.json.JsonStructure;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
-
-import org.fuin.esc.api.TypeName;
-import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.api.JsonDeSerializer;
-import org.fuin.esc.api.SerDeserializer;
import org.fuin.esc.api.SerializedDataType;
-import org.fuin.esc.api.ToJsonCapable;
+import org.fuin.esc.api.TypeName;
import org.fuin.objects4j.common.Contract;
+import java.io.Serializable;
+import java.util.UUID;
+
/**
* Something interesting happened. Equals and hash code are based on the UUID.
*/
+@ArchIgnore
@XmlRootElement(name = "MyEvent")
-public final class MyEvent implements Serializable, ToJsonCapable {
+public final class MyEvent implements Serializable {
private static final long serialVersionUID = 100L;
- /** Unique name of the event. */
+ /**
+ * Unique name of the event.
+ */
public static final TypeName TYPE = new TypeName("MyEvent");
- /** Unique name of the serialized event. */
+ /**
+ * Unique name of the serialized event.
+ */
public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
private static final String ID = "id";
@@ -70,9 +68,8 @@ protected MyEvent() {
/**
* Constructor with random UUID.
- *
- * @param description
- * The description.
+ *
+ * @param description The description.
*/
public MyEvent(@NotEmpty final String description) {
super();
@@ -83,11 +80,9 @@ public MyEvent(@NotEmpty final String description) {
/**
* Constructor with all mandatory data.
- *
- * @param uuid
- * The unique identifier of the event.
- * @param description
- * The description.
+ *
+ * @param uuid The unique identifier of the event.
+ * @param description The description.
*/
public MyEvent(@NotNull final UUID uuid, @NotEmpty final String description) {
super();
@@ -99,7 +94,7 @@ public MyEvent(@NotNull final UUID uuid, @NotEmpty final String description) {
/**
* Returns the unique identifier.
- *
+ *
* @return UUID string.
*/
@NotNull
@@ -109,7 +104,7 @@ public final String getId() {
/**
* Returns the description.
- *
+ *
* @return The description.
*/
@NotEmpty
@@ -117,7 +112,6 @@ public final String getDescription() {
return description;
}
- // CHECKSTYLE:OFF Generated code
@Override
public int hashCode() {
@@ -149,12 +143,6 @@ public boolean equals(Object obj) {
return true;
}
- // CHECKSTYLE:ON
-
- @Override
- public JsonStructure toJson() {
- return Json.createObjectBuilder().add(ID, id).add(DESCRIPTION, description).build();
- }
@Override
public final String toString() {
@@ -163,10 +151,8 @@ public final String toString() {
/**
* Creates in instance from the given JSON object.
- *
- * @param jsonObj
- * Object to read values from.
- *
+ *
+ * @param jsonObj Object to read values from.
* @return New instance.
*/
public static MyEvent create(final JsonObject jsonObj) {
@@ -175,50 +161,4 @@ public static MyEvent create(final JsonObject jsonObj) {
return new MyEvent(UUID.fromString(id), description);
}
- /**
- * Serializes and deserializes a {@link MyEvent} object as JSON. The content
- * type for serialization is always "application/json".
- */
- public static class MyEventJsonDeSerializer implements SerDeserializer {
-
- private JsonDeSerializer jsonDeSer;
-
- /**
- * Constructor with UTF-8 encoding.
- */
- public MyEventJsonDeSerializer() {
- super();
- this.jsonDeSer = new JsonDeSerializer();
- }
-
- /**
- * Constructor with type and encoding.
- *
- * @param encoding
- * Default encoding to use.
- */
- public MyEventJsonDeSerializer(final Charset encoding) {
- super();
- this.jsonDeSer = new JsonDeSerializer(encoding);
- }
-
- @Override
- public final EnhancedMimeType getMimeType() {
- return jsonDeSer.getMimeType();
- }
-
- @Override
- public final
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.esgrpc;
-import java.io.Serializable;
-import java.nio.charset.Charset;
-
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import jakarta.json.JsonStructure;
+import com.tngtech.archunit.junit.ArchIgnore;
+import jakarta.annotation.Nullable;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
-
-import org.fuin.esc.api.TypeName;
-import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.api.JsonDeSerializer;
-import org.fuin.esc.api.SerDeserializer;
import org.fuin.esc.api.SerializedDataType;
-import org.fuin.esc.api.ToJsonCapable;
-import jakarta.annotation.Nullable;
+import org.fuin.esc.api.TypeName;
+
+import java.io.Serializable;
/**
* Example meta data. .
*/
+@ArchIgnore
@XmlRootElement(name = "MyMeta")
-public final class MyMeta implements Serializable, ToJsonCapable {
+public final class MyMeta implements Serializable {
private static final long serialVersionUID = 100L;
- /** Unique name of the meta type. */
+ /**
+ * Unique name of the meta type.
+ */
public static final TypeName TYPE = new TypeName("MyMeta");
- /** Unique name of the serialized meta type. */
+ /**
+ * Unique name of the serialized meta type.
+ */
public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
private static final String USER = "user";
@@ -62,9 +59,8 @@ protected MyMeta() {
/**
* Constructor with all mandatory data.
- *
- * @param user
- * User ID.
+ *
+ * @param user User ID.
*/
public MyMeta(@Nullable final String user) {
super();
@@ -73,14 +69,13 @@ public MyMeta(@Nullable final String user) {
/**
* Returns the user.
- *
+ *
* @return User ID.
*/
public final String getUser() {
return user;
}
- // CHECKSTYLE:OFF Generated code
@Override
public int hashCode() {
@@ -112,75 +107,4 @@ public boolean equals(Object obj) {
return true;
}
- // CHECKSTYLE:ON
-
- @Override
- public JsonStructure toJson() {
- return Json.createObjectBuilder().add(USER, user).build();
- }
-
- @Override
- public final String toString() {
- return "My meta: " + user;
- }
-
- /**
- * Creates in instance from the given JSON object.
- *
- * @param jsonObj
- * Object to read values from.
- *
- * @return New instance.
- */
- public static MyMeta create(final JsonObject jsonObj) {
- final String user = jsonObj.getString(USER);
- return new MyMeta(user);
- }
-
- /**
- * Serializes and deserializes a {@link MyMeta} object as JSON. The content
- * type for serialization is always "application/json".
- */
- public static class MyMetaJsonDeSerializer implements SerDeserializer {
-
- private JsonDeSerializer jsonDeSer;
-
- /**
- * Constructor with UTF-8 encoding.
- */
- public MyMetaJsonDeSerializer() {
- super();
- this.jsonDeSer = new JsonDeSerializer();
- }
-
- /**
- * Constructor with type and encoding.
- *
- * @param encoding
- * Default encoding to use.
- */
- public MyMetaJsonDeSerializer(final Charset encoding) {
- super();
- this.jsonDeSer = new JsonDeSerializer(encoding);
- }
-
- @Override
- public final EnhancedMimeType getMimeType() {
- return jsonDeSer.getMimeType();
- }
-
- @Override
- public final
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.esgrpc;
-import static org.assertj.core.api.Assertions.assertThat;
+import com.eventstore.dbclient.EventData;
+import com.eventstore.dbclient.Position;
+import com.eventstore.dbclient.RecordedEvent;
+import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.EventId;
+import org.fuin.esc.api.SimpleCommonEvent;
+import org.fuin.esc.api.SimpleSerializedDataTypeRegistry;
+import org.fuin.esc.api.SimpleSerializerDeserializerRegistry;
+import org.fuin.esc.jaxb.XmlDeSerializer;
+import org.fuin.esc.jsonb.EscMeta;
+import org.fuin.esc.jsonb.JsonbDeSerializer;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.fuin.esc.api.CommonEvent;
-import org.fuin.esc.api.EventId;
-import org.fuin.esc.api.SimpleCommonEvent;
-import org.fuin.esc.spi.Base64Data;
-import org.fuin.esc.spi.Base64Data.Base64DataJsonDeSerializer;
-import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.spi.EscMeta;
-import org.fuin.esc.spi.EscMetaJsonDeSerializer;
-import org.fuin.esc.api.SimpleSerializerDeserializerRegistry;
-import org.fuin.esc.spi.XmlDeSerializer;
-import org.junit.jupiter.api.Test;
-
-import com.eventstore.dbclient.EventData;
-import com.eventstore.dbclient.Position;
-import com.eventstore.dbclient.RecordedEvent;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* Test for {@link RecordedEvent2CommonEventConverter} class.
*/
-// CHECKSTYLE:OFF Test code
+
public class RecordedEvent2CommonEventConverterTest {
- private static final Class[] JAXB_CLASSES = new Class[] { EscMeta.class, MyEvent.class, MyMeta.class,
- Base64Data.class };
-
- /**
- * Tests envelope JSON + meta JSON + data JSON
- */
- @Test
- public final void testConvertJsonJsonJson() throws IOException {
-
- // PREPARE
- final EnhancedMimeType envelope = EnhancedMimeType.create("application", "json", Charset.forName("utf-8"));
- final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
- registry.add(EscMeta.SER_TYPE, envelope.getBaseType(), new EscMetaJsonDeSerializer());
- registry.add(MyEvent.SER_TYPE, "application/json", new MyEvent.MyEventJsonDeSerializer());
- registry.add(MyMeta.SER_TYPE, "application/json", new MyMeta.MyMetaJsonDeSerializer());
-
- final MyEvent myEvent = new MyEvent(UUID.randomUUID(), "Hello, JSON!");
- final MyMeta myMeta = new MyMeta("michael");
- final CommonEvent commonEvent = new SimpleCommonEvent(new EventId(myEvent.getId()), MyEvent.TYPE, myEvent,
- MyMeta.TYPE, myMeta);
-
- final CommonEvent2EventDataConverter converter = new CommonEvent2EventDataConverter(registry, envelope);
- final EventData eventData = converter.convert(commonEvent);
-
- final RecordedEvent recordedEvent = recordedEvent("mystream", 1, eventData.getEventId(), new Position(0, 0),
- systemMetadata(eventData.getContentType(), 0, true, eventData.getEventType()), eventData.getEventData(),
- eventData.getUserMetadata());
- final RecordedEvent2CommonEventConverter testee = new RecordedEvent2CommonEventConverter(registry);
-
- // TEST
- final CommonEvent result = testee.convert(recordedEvent);
-
- // VERIFY
- assertThat(result.getId()).isEqualTo(new EventId(myEvent.getId()));
- assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE);
- assertThat(result.getMetaType()).isEqualTo(MyMeta.TYPE);
-
- assertThat(result.getData()).isInstanceOf(MyEvent.class);
- final MyEvent copyMyEvent = (MyEvent) result.getData();
- assertThat(copyMyEvent.getId()).isEqualTo(myEvent.getId());
- assertThat(copyMyEvent.getDescription()).isEqualTo(myEvent.getDescription());
-
- assertThat(result.getMeta()).isInstanceOf(MyMeta.class);
- final MyMeta copyMyMeta = (MyMeta) result.getMeta();
- assertThat(copyMyMeta.getUser()).isEqualTo(myMeta.getUser());
-
- }
-
- /**
- * Tests envelope JSON + meta JSON + data XML (non JSON)
- */
- @Test
- public final void testConvertJsonJsonOther() throws IOException {
-
- // PREPARE
- final EnhancedMimeType envelope = EnhancedMimeType.create("application", "json", Charset.forName("utf-8"));
- final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
- registry.add(EscMeta.SER_TYPE, envelope.getBaseType(), new EscMetaJsonDeSerializer());
- registry.add(Base64Data.SER_TYPE, envelope.getBaseType(), new Base64DataJsonDeSerializer());
- registry.add(MyMeta.SER_TYPE, "application/json", new MyMeta.MyMetaJsonDeSerializer());
- registry.add(MyEvent.SER_TYPE, "application/xml", new XmlDeSerializer(JAXB_CLASSES));
-
- final MyEvent myEvent = new MyEvent(UUID.randomUUID(), "Hello, XML!");
- final MyMeta myMeta = new MyMeta("michael");
- final CommonEvent commonEvent = new SimpleCommonEvent(new EventId(myEvent.getId()), MyEvent.TYPE, myEvent,
- MyMeta.TYPE, myMeta);
-
- final CommonEvent2EventDataConverter converter = new CommonEvent2EventDataConverter(registry, envelope);
- final EventData eventData = converter.convert(commonEvent);
-
- final RecordedEvent recordedEvent = recordedEvent("mystream", 1, eventData.getEventId(), new Position(0, 0),
- systemMetadata(eventData.getContentType(), 0, false, eventData.getEventType()),
- eventData.getEventData(), eventData.getUserMetadata());
- final RecordedEvent2CommonEventConverter testee = new RecordedEvent2CommonEventConverter(registry);
-
- // TEST
- final CommonEvent result = testee.convert(recordedEvent);
-
- // VERIFY
- assertThat(result.getId()).isEqualTo(new EventId(myEvent.getId()));
- assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE);
- assertThat(result.getMetaType()).isEqualTo(MyMeta.TYPE);
-
- assertThat(result.getData()).isInstanceOf(MyEvent.class);
- final MyEvent copyMyEvent = (MyEvent) result.getData();
- assertThat(copyMyEvent.getId()).isEqualTo(myEvent.getId());
- assertThat(copyMyEvent.getDescription()).isEqualTo(myEvent.getDescription());
-
- assertThat(result.getMeta()).isInstanceOf(MyMeta.class);
- final MyMeta copyMyMeta = (MyMeta) result.getMeta();
- assertThat(copyMyMeta.getUser()).isEqualTo(myMeta.getUser());
-
- }
-
- /**
- * Tests envelope JSON + meta JSON + data XML (non JSON)
- */
- @Test
- public final void testConvertJsonOtherOther() throws IOException {
-
- // PREPARE
- final EnhancedMimeType envelope = EnhancedMimeType.create("application", "json", Charset.forName("utf-8"));
- final int json = 1;
- final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
- registry.add(EscMeta.SER_TYPE, envelope.getBaseType(), new EscMetaJsonDeSerializer());
- registry.add(Base64Data.SER_TYPE, envelope.getBaseType(), new Base64DataJsonDeSerializer());
- registry.add(MyMeta.SER_TYPE, "application/xml", new XmlDeSerializer(JAXB_CLASSES));
- registry.add(MyEvent.SER_TYPE, "application/xml", new XmlDeSerializer(JAXB_CLASSES));
-
- final MyEvent myEvent = new MyEvent(UUID.randomUUID(), "Hello, XML!");
- final MyMeta myMeta = new MyMeta("michael");
- final CommonEvent commonEvent = new SimpleCommonEvent(new EventId(myEvent.getId()), MyEvent.TYPE, myEvent,
- MyMeta.TYPE, myMeta);
-
- final CommonEvent2EventDataConverter converter = new CommonEvent2EventDataConverter(registry, envelope);
- final EventData eventData = converter.convert(commonEvent);
-
- final RecordedEvent recordedEvent = recordedEvent("mystream", 1, eventData.getEventId(), new Position(0, 0),
- systemMetadata(eventData.getContentType(), 0, false, eventData.getEventType()),
- eventData.getEventData(), eventData.getUserMetadata());
- final RecordedEvent2CommonEventConverter testee = new RecordedEvent2CommonEventConverter(registry);
-
- // TEST
- final CommonEvent result = testee.convert(recordedEvent);
-
- // VERIFY
- assertThat(result.getId()).isEqualTo(new EventId(myEvent.getId()));
- assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE);
- assertThat(result.getMetaType()).isEqualTo(MyMeta.TYPE);
-
- assertThat(result.getData()).isInstanceOf(MyEvent.class);
- final MyEvent copyMyEvent = (MyEvent) result.getData();
- assertThat(copyMyEvent.getId()).isEqualTo(myEvent.getId());
- assertThat(copyMyEvent.getDescription()).isEqualTo(myEvent.getDescription());
-
- assertThat(result.getMeta()).isInstanceOf(MyMeta.class);
- final MyMeta copyMyMeta = (MyMeta) result.getMeta();
- assertThat(copyMyMeta.getUser()).isEqualTo(myMeta.getUser());
-
- }
-
- /**
- * Tests envelope XML + meta XML + data XML
- */
- @Test
- public final void testConvertXmlXmlXml() throws IOException {
-
- // PREPARE
- final EnhancedMimeType envelope = EnhancedMimeType.create("application", "xml", Charset.forName("utf-8"));
- final int json = 0;
- final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
- registry.add(EscMeta.SER_TYPE, envelope.getBaseType(), new XmlDeSerializer(JAXB_CLASSES));
- registry.add(MyEvent.SER_TYPE, "application/xml", new XmlDeSerializer(JAXB_CLASSES));
- registry.add(MyMeta.SER_TYPE, "application/xml", new XmlDeSerializer(JAXB_CLASSES));
-
- final MyEvent myEvent = new MyEvent(UUID.randomUUID(), "Hello, JSON!");
- final MyMeta myMeta = new MyMeta("michael");
- final CommonEvent commonEvent = new SimpleCommonEvent(new EventId(myEvent.getId()), MyEvent.TYPE, myEvent,
- MyMeta.TYPE, myMeta);
-
- final CommonEvent2EventDataConverter converter = new CommonEvent2EventDataConverter(registry, envelope);
- final EventData eventData = converter.convert(commonEvent);
-
- final RecordedEvent recordedEvent = recordedEvent("mystream", 1, eventData.getEventId(), new Position(0, 0),
- systemMetadata(eventData.getContentType(), 0, false, eventData.getEventType()),
- eventData.getEventData(), eventData.getUserMetadata());
- final RecordedEvent2CommonEventConverter testee = new RecordedEvent2CommonEventConverter(registry);
-
- // TEST
- final CommonEvent result = testee.convert(recordedEvent);
-
- // VERIFY
- assertThat(result.getId()).isEqualTo(new EventId(myEvent.getId()));
- assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE);
- assertThat(result.getMetaType()).isEqualTo(MyMeta.TYPE);
-
- assertThat(result.getData()).isInstanceOf(MyEvent.class);
- final MyEvent copyMyEvent = (MyEvent) result.getData();
- assertThat(copyMyEvent.getId()).isEqualTo(myEvent.getId());
- assertThat(copyMyEvent.getDescription()).isEqualTo(myEvent.getDescription());
-
- assertThat(result.getMeta()).isInstanceOf(MyMeta.class);
- final MyMeta copyMyMeta = (MyMeta) result.getMeta();
- assertThat(copyMyMeta.getUser()).isEqualTo(myMeta.getUser());
-
- }
-
- /**
- * Tests envelope XML + meta XML + data JSON (non XML)
- */
- @Test
- public final void testConvertXmlXmlOther() throws IOException {
-
- // PREPARE
- final EnhancedMimeType envelope = EnhancedMimeType.create("application", "xml", Charset.forName("utf-8"));
- final int json = 0;
- final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
- registry.add(EscMeta.SER_TYPE, envelope.getBaseType(), new XmlDeSerializer(JAXB_CLASSES));
- registry.add(Base64Data.SER_TYPE, envelope.getBaseType(), new XmlDeSerializer(JAXB_CLASSES));
- registry.add(MyMeta.SER_TYPE, "application/xml", new XmlDeSerializer(JAXB_CLASSES));
- registry.add(MyEvent.SER_TYPE, "application/json", new MyEvent.MyEventJsonDeSerializer());
-
- final MyEvent myEvent = new MyEvent(UUID.randomUUID(), "Hello, XML!");
- final MyMeta myMeta = new MyMeta("michael");
- final CommonEvent commonEvent = new SimpleCommonEvent(new EventId(myEvent.getId()), MyEvent.TYPE, myEvent,
- MyMeta.TYPE, myMeta);
-
- final CommonEvent2EventDataConverter converter = new CommonEvent2EventDataConverter(registry, envelope);
- final EventData eventData = converter.convert(commonEvent);
-
- final RecordedEvent recordedEvent = recordedEvent("mystream", 1, eventData.getEventId(), new Position(0, 0),
- systemMetadata(eventData.getContentType(), 0, true, eventData.getEventType()), eventData.getEventData(),
- eventData.getUserMetadata());
- final RecordedEvent2CommonEventConverter testee = new RecordedEvent2CommonEventConverter(registry);
-
- // TEST
- final CommonEvent result = testee.convert(recordedEvent);
-
- // VERIFY
- assertThat(result.getId()).isEqualTo(new EventId(myEvent.getId()));
- assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE);
- assertThat(result.getMetaType()).isEqualTo(MyMeta.TYPE);
-
- assertThat(result.getData()).isInstanceOf(MyEvent.class);
- final MyEvent copyMyEvent = (MyEvent) result.getData();
- assertThat(copyMyEvent.getId()).isEqualTo(myEvent.getId());
- assertThat(copyMyEvent.getDescription()).isEqualTo(myEvent.getDescription());
-
- assertThat(result.getMeta()).isInstanceOf(MyMeta.class);
- final MyMeta copyMyMeta = (MyMeta) result.getMeta();
- assertThat(copyMyMeta.getUser()).isEqualTo(myMeta.getUser());
-
- }
-
- /**
- * Tests envelope XML + meta JSON + data JSON (non XML)
- */
- @Test
- public final void testConvertXmlOtherOther() throws IOException {
-
- // PREPARE
- final EnhancedMimeType envelope = EnhancedMimeType.create("application", "xml", Charset.forName("utf-8"));
- final int json = 0;
- final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
- registry.add(EscMeta.SER_TYPE, envelope.getBaseType(), new XmlDeSerializer(JAXB_CLASSES));
- registry.add(Base64Data.SER_TYPE, envelope.getBaseType(), new XmlDeSerializer(JAXB_CLASSES));
- registry.add(MyMeta.SER_TYPE, "application/json", new MyMeta.MyMetaJsonDeSerializer());
- registry.add(MyEvent.SER_TYPE, "application/json", new MyEvent.MyEventJsonDeSerializer());
-
- final MyEvent myEvent = new MyEvent(UUID.randomUUID(), "Hello, JSON!");
- final MyMeta myMeta = new MyMeta("michael");
- final CommonEvent commonEvent = new SimpleCommonEvent(new EventId(myEvent.getId()), MyEvent.TYPE, myEvent,
- MyMeta.TYPE, myMeta);
-
- final CommonEvent2EventDataConverter converter = new CommonEvent2EventDataConverter(registry, envelope);
- final EventData eventData = converter.convert(commonEvent);
-
- final RecordedEvent recordedEvent = recordedEvent("mystream", 1, eventData.getEventId(), new Position(0, 0),
- systemMetadata(eventData.getContentType(), 0, true, eventData.getEventType()), eventData.getEventData(),
- eventData.getUserMetadata());
- final RecordedEvent2CommonEventConverter testee = new RecordedEvent2CommonEventConverter(registry);
-
- // TEST
- final CommonEvent result = testee.convert(recordedEvent);
-
- // VERIFY
- assertThat(result.getId()).isEqualTo(new EventId(myEvent.getId()));
- assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE);
- assertThat(result.getMetaType()).isEqualTo(MyMeta.TYPE);
-
- assertThat(result.getData()).isInstanceOf(MyEvent.class);
- final MyEvent copyMyEvent = (MyEvent) result.getData();
- assertThat(copyMyEvent.getId()).isEqualTo(myEvent.getId());
- assertThat(copyMyEvent.getDescription()).isEqualTo(myEvent.getDescription());
-
- assertThat(result.getMeta()).isInstanceOf(MyMeta.class);
- final MyMeta copyMyMeta = (MyMeta) result.getMeta();
- assertThat(copyMyMeta.getUser()).isEqualTo(myMeta.getUser());
-
- }
-
- private static Map
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlValue;
+import org.fuin.esc.api.HasSerializedDataTypeConstant;
+import org.fuin.esc.api.IBase64Data;
+import org.fuin.objects4j.common.Contract;
+
+import java.util.Base64;
+
+/**
+ * Contains some Base64 encoded data.
+ */
+@HasSerializedDataTypeConstant
+@XmlRootElement(name = Base64Data.EL_ROOT_NAME)
+public final class Base64Data implements IBase64Data {
+
+ @XmlValue
+ private String base64Str;
+
+ @XmlTransient
+ private byte[] binaryData;
+
+ /**
+ * Default constructor for JAXB.
+ */
+ protected Base64Data() {
+ super();
+ }
+
+ /**
+ * Constructor with Base64 encoded string.
+ *
+ * @param base64Str Base64 encoded data.
+ */
+ public Base64Data(@NotNull final String base64Str) {
+ super();
+ Contract.requireArgNotNull("base64Str", base64Str);
+ this.base64Str = base64Str;
+ this.binaryData = Base64.getDecoder().decode(base64Str);
+ }
+
+ /**
+ * Constructor with binary data that will be Base64 encoded.
+ *
+ * @param binaryData Binary data.
+ */
+ public Base64Data(@NotNull final byte[] binaryData) {
+ super();
+ Contract.requireArgNotNull("binaryData", binaryData);
+ this.base64Str = Base64.getEncoder().encodeToString(binaryData);
+ this.binaryData = binaryData;
+ }
+
+ /**
+ * Returns the Base64 encoded data.
+ *
+ * @return Base64 string.
+ */
+ public String getEncoded() {
+ return base64Str;
+ }
+
+ /**
+ * Returns the decoded data.
+ *
+ * @return Binary data.
+ */
+ public byte[] getDecoded() {
+ if (binaryData == null) {
+ binaryData = Base64.getDecoder().decode(base64Str);
+ }
+ return binaryData;
+ }
+
+}
diff --git a/jaxb/src/main/java/org/fuin/esc/jaxb/BaseTypeFactory.java b/jaxb/src/main/java/org/fuin/esc/jaxb/BaseTypeFactory.java
new file mode 100644
index 00000000..ad376866
--- /dev/null
+++ b/jaxb/src/main/java/org/fuin/esc/jaxb/BaseTypeFactory.java
@@ -0,0 +1,29 @@
+package org.fuin.esc.jaxb;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.IBaseTypeFactory;
+import org.fuin.esc.api.IBase64Data;
+import org.fuin.esc.api.IEscMeta;
+
+/**
+ * Creates necessary implementations in the JAX-B module.
+ */
+public final class BaseTypeFactory implements IBaseTypeFactory {
+
+ @Override
+ public IBase64Data createBase64Data(@NotNull byte[] binaryData) {
+ return new Base64Data(binaryData);
+ }
+
+ @Override
+ public IEscMeta createEscMeta(@NotNull String dataType,
+ @NotNull EnhancedMimeType dataContentType,
+ @Nullable String metaType,
+ @Nullable EnhancedMimeType metaContentType,
+ @Nullable Object meta) {
+ return new EscMeta(dataType, dataContentType, metaType, metaContentType, meta);
+ }
+
+}
diff --git a/jaxb/src/main/java/org/fuin/esc/jaxb/Data.java b/jaxb/src/main/java/org/fuin/esc/jaxb/Data.java
new file mode 100644
index 00000000..fd8494b7
--- /dev/null
+++ b/jaxb/src/main/java/org/fuin/esc/jaxb/Data.java
@@ -0,0 +1,165 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlValue;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.IData;
+import org.fuin.objects4j.common.Contract;
+import org.fuin.objects4j.common.ValueObject;
+import org.fuin.utils4j.jaxb.CDataXmlAdapter;
+
+import javax.annotation.concurrent.Immutable;
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * Helper class that allows sending the data of an event as XML directly to the
+ * event store. Represents a block of data in a serialized form. This class
+ * might be useful for tests. It's not used in the 'esc-spi' code itself
+ */
+@Immutable
+@XmlRootElement(name = Data.EL_ROOT_NAME)
+public final class Data implements IData, ValueObject, Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1000L;
+
+ /**
+ * Unique type of the data.
+ */
+ @NotNull
+ @XmlAttribute(name = EL_TYPE)
+ private String type;
+
+ /**
+ * Internet Media Type that classifies the raw event data.
+ */
+ @NotNull
+ @XmlAttribute(name = EL_MIME_TYPE)
+ private String mimeType;
+
+ /**
+ * Raw event data in format defined by the mime type and encoding.
+ */
+ @NotNull
+ @XmlValue
+ @XmlJavaTypeAdapter(CDataXmlAdapter.class)
+ private String content;
+
+ /**
+ * Protected constructor for deserialization.
+ */
+ protected Data() { //NOSONAR Ignore uninitialized fields
+ super();
+ }
+
+ /**
+ * Creates a data object.
+ *
+ * @param type Unique identifier for the type of data.
+ * @param mimeType Internet Media Type with encoding and version that classifies
+ * the data.
+ * @param content Content.
+ */
+ public Data(@NotNull final String type,
+ @NotNull final EnhancedMimeType mimeType,
+ @NotNull final String content) {
+ super();
+
+ Contract.requireArgNotNull("type", type);
+ Contract.requireArgNotNull("mimeType", mimeType);
+ Contract.requireArgNotNull("content", content);
+
+ this.type = type;
+ this.mimeType = mimeType.toString();
+ this.content = content;
+
+ }
+
+ /**
+ * Returns the unique identifier for the type of data.
+ *
+ * @return Unique and never changing type name.
+ */
+ @NotNull
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Returns the Internet Media Type that classifies the data.
+ *
+ * @return Mime type.
+ */
+ @NotNull
+ public EnhancedMimeType getMimeType() {
+ return EnhancedMimeType.create(mimeType);
+ }
+
+ /**
+ * Returns the raw data block.
+ *
+ * @return Raw data.
+ */
+ @NotNull
+ public String getContent() {
+ return content;
+ }
+
+ /**
+ * Returns the information if the content is XML.
+ *
+ * @return TRUE if the mime type is 'application/xml' else FALSE.
+ */
+ public boolean isXml() {
+ return getMimeType().getBaseType().equals("application/xml");
+ }
+
+ /**
+ * Returns the information if the content is JSON.
+ *
+ * @return TRUE if the mime type is 'application/json' else FALSE.
+ */
+ public boolean isJson() {
+ return getMimeType().getBaseType().equals("application/json");
+ }
+
+ /**
+ * Returns the information if the content is TEXT.
+ *
+ * @return TRUE if the mime type is 'text/plain' else FALSE.
+ */
+ public boolean isText() {
+ return getMimeType().getBaseType().equals("text/plain");
+ }
+
+ @Override
+ public String toString() {
+ return "Data{" +
+ "type='" + type + '\'' +
+ ", mimeType='" + mimeType + '\'' +
+ ", content='" + content + '\'' +
+ '}';
+ }
+
+}
diff --git a/spi/src/main/java/org/fuin/esc/spi/DataWrapper.java b/jaxb/src/main/java/org/fuin/esc/jaxb/DataWrapper.java
similarity index 62%
rename from spi/src/main/java/org/fuin/esc/spi/DataWrapper.java
rename to jaxb/src/main/java/org/fuin/esc/jaxb/DataWrapper.java
index f7348f9b..d0aafb5a 100644
--- a/spi/src/main/java/org/fuin/esc/spi/DataWrapper.java
+++ b/jaxb/src/main/java/org/fuin/esc/jaxb/DataWrapper.java
@@ -1,37 +1,33 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
-package org.fuin.esc.spi;
+package org.fuin.esc.jaxb;
-import jakarta.json.JsonStructure;
import jakarta.validation.constraints.NotNull;
import jakarta.xml.bind.annotation.XmlAnyElement;
import jakarta.xml.bind.annotation.XmlRootElement;
-import org.fuin.esc.api.ToJsonCapable;
+import org.fuin.esc.api.IDataWrapper;
import org.fuin.objects4j.common.Contract;
/**
* A structure that wraps another object of different types.
*/
-@XmlRootElement(name = DataWrapper.EL_ROOT)
-public final class DataWrapper implements ToJsonCapable {
-
- /** Unique name of the type. */
- protected static final String EL_ROOT = "Wrapper";
+@XmlRootElement(name = IDataWrapper.EL_ROOT)
+public final class DataWrapper implements IDataWrapper {
@XmlAnyElement(lax = true)
private Object obj;
@@ -45,7 +41,7 @@ protected DataWrapper() {
/**
* Constructor with mandatory data.
- *
+ *
* @param obj
* Object to wrap.
*/
@@ -57,23 +53,12 @@ public DataWrapper(@NotNull final Object obj) {
/**
* Returns the wrapped object.
- *
+ *
* @return Inner object.
*/
@NotNull
- public final Object getObj() {
+ public Object getObj() {
return obj;
}
- @Override
- public final JsonStructure toJson() {
- if (obj instanceof ToJsonCapable) {
- return ((ToJsonCapable) obj).toJson();
- } else if (obj instanceof JsonStructure) {
- return (JsonStructure) obj;
- }
- throw new IllegalStateException("Wrapped object is not an instance of '" + ToJsonCapable.class.getSimpleName()
- + "' or 'JsonStructure': " + obj + " [" + obj.getClass().getName() + "]");
- }
-
}
diff --git a/jaxb/src/main/java/org/fuin/esc/jaxb/EscEvent.java b/jaxb/src/main/java/org/fuin/esc/jaxb/EscEvent.java
new file mode 100644
index 00000000..527db7f4
--- /dev/null
+++ b/jaxb/src/main/java/org/fuin/esc/jaxb/EscEvent.java
@@ -0,0 +1,135 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import org.fuin.esc.api.HasSerializedDataTypeConstant;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.TypeName;
+import org.fuin.esc.api.IEscEvent;
+import org.fuin.objects4j.common.Contract;
+
+import java.util.UUID;
+
+/**
+ * An event structure.
+ */
+@HasSerializedDataTypeConstant
+@XmlRootElement(name = EscEvent.EL_ROOT_NAME)
+public final class EscEvent implements IEscEvent {
+
+ /**
+ * Unique name of the type.
+ */
+ public static final TypeName TYPE = new TypeName(EL_ROOT_NAME);
+
+ /**
+ * Unique name of the serialized type.
+ */
+ public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
+
+ @XmlElement(name = EL_EVENT_ID)
+ private String eventId;
+
+ @XmlElement(name = EL_EVENT_TYPE)
+ private String eventType;
+
+ @XmlElement(name = EL_DATA)
+ private DataWrapper data;
+
+ @XmlElement(name = EL_META_DATA)
+ private DataWrapper meta;
+
+ /**
+ * Default constructor for JAXB.
+ */
+ protected EscEvent() {
+ super();
+ }
+
+ /**
+ * Constructor with mandatory data.
+ *
+ * @param eventId Unique event identifier.
+ * @param eventType Unique type name of the event.
+ * @param data The data.
+ */
+ public EscEvent(@NotNull final UUID eventId, @NotNull final String eventType, @NotNull final DataWrapper data) {
+ this(eventId, eventType, data, null);
+ }
+
+ /**
+ * Constructor with all data.
+ *
+ * @param eventId Unique event identifier.
+ * @param eventType Unique type name of the event.
+ * @param data The data.
+ * @param meta The meta data if available.
+ */
+ public EscEvent(@NotNull final UUID eventId, @NotNull final String eventType, @NotNull final DataWrapper data,
+ @Nullable final DataWrapper meta) {
+ super();
+ Contract.requireArgNotNull("eventId", eventId);
+ Contract.requireArgNotNull("eventType", eventType);
+ Contract.requireArgNotNull("data", data);
+ this.eventId = eventId.toString();
+ this.eventType = eventType;
+ this.data = data;
+ this.meta = meta;
+ }
+
+ /**
+ * Returns the unique event identifier.
+ *
+ * @return Event ID.
+ */
+ public String getEventId() {
+ return eventId;
+ }
+
+ /**
+ * Returns the unique type name of the event.
+ *
+ * @return Event type.
+ */
+ public String getEventType() {
+ return eventType;
+ }
+
+ /**
+ * Returns the data.
+ *
+ * @return Data.
+ */
+ public DataWrapper getData() {
+ return data;
+ }
+
+ /**
+ * Returns the metadata.
+ *
+ * @return Metadata.
+ */
+ public DataWrapper getMeta() {
+ return meta;
+ }
+
+}
diff --git a/jaxb/src/main/java/org/fuin/esc/jaxb/EscEvents.java b/jaxb/src/main/java/org/fuin/esc/jaxb/EscEvents.java
new file mode 100644
index 00000000..a74d3086
--- /dev/null
+++ b/jaxb/src/main/java/org/fuin/esc/jaxb/EscEvents.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import org.fuin.esc.api.HasSerializedDataTypeConstant;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.TypeName;
+import org.fuin.esc.api.IEscEvent;
+import org.fuin.esc.api.IEscEvents;
+import org.fuin.objects4j.common.Contract;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A list of events.
+ */
+@HasSerializedDataTypeConstant
+@XmlRootElement(name = EscEvents.EL_ROOT_NAME)
+public final class EscEvents implements IEscEvents {
+
+ /**
+ * Unique name of the type.
+ */
+ public static final TypeName TYPE = new TypeName(EL_ROOT_NAME);
+
+ /**
+ * Unique name of the serialized type.
+ */
+ public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
+
+ @XmlElement(name = EL_EVENT)
+ private List
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.HasSerializedDataTypeConstant;
+import org.fuin.esc.api.IEscMeta;
+import org.fuin.objects4j.common.Contract;
+
+/**
+ * A structure that contains the user's metadata and the system's meta information.
+ */
+@HasSerializedDataTypeConstant
+@XmlRootElement(name = EscMeta.EL_ROOT_NAME)
+public final class EscMeta implements IEscMeta {
+
+ @XmlElement(name = EL_DATA_TYPE)
+ private String dataType;
+
+ @XmlElement(name = EL_DATA_CONTENT_TYPE)
+ private String dataContentTypeStr;
+
+ @XmlElement(name = EL_META_TYPE)
+ private String metaType;
+
+ @XmlElement(name = EL_META_CONTENT_TYPE)
+ private String metaContentTypeStr;
+
+ @XmlAnyElement(lax = true)
+ private Object meta;
+
+ @XmlTransient
+ private EnhancedMimeType dataContentType;
+
+ @XmlTransient
+ private EnhancedMimeType metaContentType;
+
+ /**
+ * Default constructor for JAXB.
+ */
+ protected EscMeta() {
+ super();
+ }
+
+ /**
+ * Constructor with all mandatory data.
+ *
+ * @param dataType Type of the data.
+ * @param dataContentType Content type of the data.
+ */
+ public EscMeta(@NotNull final String dataType, @NotNull final EnhancedMimeType dataContentType) {
+ this(dataType, dataContentType, null, null, null);
+ }
+
+ /**
+ * Constructor with all data.
+ *
+ * @param dataType Type of the data.
+ * @param dataContentType Type of the data.
+ * @param metaType Unique name of the meta data type if available.
+ * @param metaContentType Type of the meta data if meta data is available.
+ * @param meta Meta data object if available.
+ */
+ public EscMeta(@NotNull final String dataType, @NotNull final EnhancedMimeType dataContentType, @Nullable final String metaType,
+ @Nullable final EnhancedMimeType metaContentType, @Nullable final Object meta) {
+ super();
+ Contract.requireArgNotNull("dataType", dataType);
+ Contract.requireArgNotNull("dataContentType", dataContentType);
+
+ this.dataType = dataType;
+ this.dataContentType = dataContentType;
+ this.dataContentTypeStr = dataContentType.toString();
+ this.metaType = metaType;
+ this.metaContentType = metaContentType;
+ if (metaContentType != null) {
+ this.metaContentTypeStr = metaContentType.toString();
+ }
+ this.meta = meta;
+ }
+
+ /**
+ * Returns the unique name of the data type.
+ *
+ * @return Data type.
+ */
+ @Nullable
+ public String getDataType() {
+ return dataType;
+ }
+
+ /**
+ * Returns the type of the data.
+ *
+ * @return Data type.
+ */
+ @NotNull
+ public EnhancedMimeType getDataContentType() {
+ if (dataContentType == null) {
+ dataContentType = EnhancedMimeType.create(dataContentTypeStr);
+ }
+ return dataContentType;
+ }
+
+ /**
+ * Returns the unique name of the meta data type if available.
+ *
+ * @return Meta type.
+ */
+ @Nullable
+ public String getMetaType() {
+ return metaType;
+ }
+
+ /**
+ * Returns the type of the metadata, if available.
+ *
+ * @return Meta type.
+ */
+ @Nullable
+ public EnhancedMimeType getMetaContentType() {
+ if ((metaContentType == null) && (metaContentTypeStr != null)) {
+ metaContentType = EnhancedMimeType.create(metaContentTypeStr);
+ }
+ return metaContentType;
+ }
+
+ /**
+ * Returns the meta data object.
+ *
+ * @return Meta data object.
+ */
+ @NotNull
+ public Object getMeta() {
+ return meta;
+ }
+
+}
diff --git a/spi/src/main/java/org/fuin/esc/spi/XmlDeSerializer.java b/jaxb/src/main/java/org/fuin/esc/jaxb/XmlDeSerializer.java
similarity index 57%
rename from spi/src/main/java/org/fuin/esc/spi/XmlDeSerializer.java
rename to jaxb/src/main/java/org/fuin/esc/jaxb/XmlDeSerializer.java
index 405a9ec0..307c39ce 100644
--- a/spi/src/main/java/org/fuin/esc/spi/XmlDeSerializer.java
+++ b/jaxb/src/main/java/org/fuin/esc/jaxb/XmlDeSerializer.java
@@ -1,181 +1,179 @@
-/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
- * http://www.fuin.org/
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option) any
- * later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see http://www.gnu.org/licenses/.
- */
-package org.fuin.esc.spi;
-
-import jakarta.xml.bind.*;
-import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-import org.fuin.esc.api.EnhancedMimeType;
-import org.fuin.esc.api.SerDeserializer;
-import org.fuin.esc.api.SerializedDataType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Node;
-
-import java.io.*;
-import java.nio.charset.Charset;
-
-/**
- * Serializes and deserializes an object from/to XML using JAXB. The content type for serialization is always
- * "application/xml". This implementation supports {@link Node} and
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.*;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.SerDeserializer;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.objects4j.common.Contract;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+
+import java.io.*;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Serializes and deserializes an object from/to XML using JAXB. The content type for serialization is always
+ * "application/xml". This implementation supports {@link Node} and
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
-package org.fuin.esc.spi;
+package org.fuin.esc.jaxb;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
@@ -31,13 +31,12 @@
/**
* Base class for XML marshal/unmarshal tests.
*/
-// CHECKSTYLE:OFF Test
public abstract class AbstractXmlTest {
/**
* Marshals the given data. A
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
-package org.fuin.esc.spi;
+package org.fuin.esc.jaxb;
import org.junit.jupiter.api.Test;
@@ -54,7 +54,7 @@ public final void testUnmarshal() throws Exception {
assertThat(testee).isNotNull();
assertThat(testee.getEncoded()).isEqualTo("SGVsbG8gd29ybGQh");
assertThat(testee.getDecoded()).isEqualTo(
- new byte[] { 72, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 33 });
+ new byte[]{72, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 33});
}
diff --git a/jaxb/src/test/java/org/fuin/esc/jaxb/BaseTest.java b/jaxb/src/test/java/org/fuin/esc/jaxb/BaseTest.java
new file mode 100644
index 00000000..2a30550f
--- /dev/null
+++ b/jaxb/src/test/java/org/fuin/esc/jaxb/BaseTest.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (C) 2013 Future Invent Informationsmanagement GmbH. All rights
+ * reserved.
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
-package org.fuin.esc.spi;
+package org.fuin.esc.jaxb;
import jakarta.activation.MimeTypeParseException;
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
-import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
import org.fuin.esc.api.EnhancedMimeType;
import org.fuin.utils4j.jaxb.JaxbUtils;
@@ -33,15 +30,17 @@
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.diff.Diff;
+import java.util.Base64;
+
import static org.assertj.core.api.Assertions.assertThat;
import static org.fuin.utils4j.Utils4J.deserialize;
import static org.fuin.utils4j.Utils4J.serialize;
+import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
/**
* Tests the {@link Data} class.
*/
-// CHECKSTYLE:OFF Test
public class DataTest extends AbstractXmlTest {
private static final String TYPE = "MyEvent";
@@ -125,9 +124,8 @@ public final void testIcon() throws Exception {
// PREPARE
final String type = "Icon";
final EnhancedMimeType mimeType = EnhancedMimeType.create("image/png");
- final byte[] png = IOUtils
- .toByteArray(getClass().getResourceAsStream("/ok.png"));
- final String content = Base64.encodeBase64String(png);
+ final byte[] png = IOUtils.toByteArray(getClass().getResourceAsStream("/ok.png"));
+ final String content = Base64.getEncoder().encodeToString(png);
final Data original = new Data(type, mimeType, content);
// TEST
@@ -146,8 +144,7 @@ public final void testIcon() throws Exception {
public void testUnmarshalXmlContent() throws JAXBException {
// TEST
- final BookAddedEvent event = testee.unmarshalContent(
- JAXBContext.newInstance(BookAddedEvent.class));
+ final BookAddedEvent event = unmarshal(JAXBContext.newInstance(BookAddedEvent.class), testee.getContent(), null);
// VERIFY
assertThat(event).isNotNull();
@@ -156,32 +153,16 @@ public void testUnmarshalXmlContent() throws JAXBException {
}
- @Test
- public void testUnmarshalJsonContent() throws MimeTypeParseException {
-
- // PREPARE
- final Data data = new Data("BookAddedEvent",
- new EnhancedMimeType("application/json; encoding=utf-8"),
- "{\"name\":\"Shining\",\"author\":\"Stephen King\"}");
-
- // TEST
- final JsonObject event = data.unmarshalContent(null);
-
- // VERIFY
- assertThat(event.getString("name")).isEqualTo("Shining");
- assertThat(event.getString("author")).isEqualTo("Stephen King");
-
- }
-
@Test
public void testValueOfXml() throws MimeTypeParseException {
// PREPARE
- final BookAddedEvent event = new BookAddedEvent("Shining",
- "Stephen King");
+ final BookAddedEvent event = new BookAddedEvent("Shining", "Stephen King");
// TEST
- final Data data = Data.valueOf("BookAddedEvent", event);
+
+ final String dataXml = marshal(event, event.getClass());
+ final Data data = new Data("BookAddedEvent", EnhancedMimeType.create("application/xml; encoding=utf-8"), dataXml);
// VERIFY
assertThat(data.getType()).isEqualTo("BookAddedEvent");
@@ -194,30 +175,9 @@ public void testValueOfXml() throws MimeTypeParseException {
}
- @Test
- public void testValueOfJson() throws MimeTypeParseException {
-
- // PREPARE
- final JsonObject event = Json.createObjectBuilder()
- .add("name", "Shining").add("author", "Stephen King").build();
-
- // TEST
- final Data data = Data.valueOf("BookAddedEvent", event);
-
- // VERIFY
- assertThat(data.getType()).isEqualTo("BookAddedEvent");
- assertThat(data.getMimeType()).isEqualTo(
- new EnhancedMimeType("application/json; encoding=utf-8"));
- assertThat(data.getContent()).isEqualTo(
- "{\"name\":\"Shining\",\"author\":\"Stephen King\"}");
- assertThat(data.isXml()).isFalse();
- assertThat(data.isJson()).isTrue();
-
- }
-
private XmlAdapter[] createXmlAdapter() {
- return new XmlAdapter[] {};
+ return new XmlAdapter[]{};
}
}
-// CHECKSTYLE:ON
+
diff --git a/spi/src/test/java/org/fuin/esc/spi/DataWrapperTest.java b/jaxb/src/test/java/org/fuin/esc/jaxb/DataWrapperTest.java
similarity index 89%
rename from spi/src/test/java/org/fuin/esc/spi/DataWrapperTest.java
rename to jaxb/src/test/java/org/fuin/esc/jaxb/DataWrapperTest.java
index 568ae2bd..bd11dbb7 100644
--- a/spi/src/test/java/org/fuin/esc/spi/DataWrapperTest.java
+++ b/jaxb/src/test/java/org/fuin/esc/jaxb/DataWrapperTest.java
@@ -1,21 +1,21 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
-package org.fuin.esc.spi;
+package org.fuin.esc.jaxb;
import org.junit.jupiter.api.Test;
@@ -50,7 +50,7 @@ public final void testUnmarshal() throws Exception {
// TEST
final DataWrapper testee = unmarshal(XML_PREFIX
- + "
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.Test;
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.diff.Diff;
+
+import java.nio.charset.StandardCharsets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
+
+/**
+ * Test for {@link EscEvent} class.
+ */
+public class EscEventTest {
+
+ @Test
+ public final void testMarshalUnmarshalJaxb() throws Exception {
+
+ // PREPARE
+ final String expectedXml = """
+
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
-package org.fuin.esc.spi;
+package org.fuin.esc.jaxb;
import jakarta.activation.MimeTypeParseException;
-import jakarta.json.bind.Jsonb;
import org.apache.commons.io.IOUtils;
-import org.eclipse.yasson.FieldAccessStrategy;
-import org.fuin.esc.api.*;
+import org.fuin.esc.api.EnhancedMimeType;
import org.junit.jupiter.api.Test;
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.diff.Diff;
@@ -31,7 +29,6 @@
import java.util.Map;
import java.util.UUID;
-import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
import static org.assertj.core.api.Assertions.assertThat;
import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
@@ -39,14 +36,56 @@
/**
* Test for {@link EscEvents} class.
*/
-// CHECKSTYLE:OFF Test
public class EscEventsTest {
@Test
public final void testMarshalUnmarshalJaxb() throws Exception {
// PREPARE
- final String expectedXml = IOUtils.toString(this.getClass().getResourceAsStream("/esc-events.xml"), StandardCharsets.UTF_8);
+ final String expectedXml = """
+
+
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.Test;
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.diff.Diff;
+
+import java.nio.charset.StandardCharsets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.fuin.utils4j.jaxb.JaxbUtils.marshal;
+import static org.fuin.utils4j.jaxb.JaxbUtils.unmarshal;
+
+/**
+ * Test for {@link EscMeta} class.
+ */
+public class EscMetaTest {
+
+ @Test
+ public final void testMarshalUnmarshalJaxb() throws Exception {
+
+ // PREPARE
+ final String expectedXml = """
+
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import jakarta.activation.MimeTypeParseException;
+import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.Deserializer;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.EventId;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.Serializer;
+import org.fuin.esc.api.SimpleCommonEvent;
+import org.fuin.esc.api.SimpleSerializerDeserializerRegistry;
+import org.fuin.esc.spi.EscSpiUtils;
+import org.fuin.esc.api.IEscMeta;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests the {@link EscSpiUtils} class together with {@link EscMeta} implementation of this module.
+ */
+public class EscSpiUtilsTest {
+
+ @Test
+ public void testCreateEscMetaTargetXmlDataXmlMetaNull() {
+
+ // PREPARE
+ final String description = "Whatever";
+ final UUID uuid = UUID.randomUUID();
+ final MyEvent myEvent = new MyEvent(uuid, description);
+ final EventId eventId = new EventId();
+ final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
+ registry.addSerializer(MyEvent.SER_TYPE, new XmlDeSerializer(MyEvent.class));
+ final CommonEvent commonEvent = new SimpleCommonEvent(eventId, MyEvent.TYPE, myEvent);
+
+ // TEST
+ final IEscMeta result = EscSpiUtils.createEscMeta(registry, new BaseTypeFactory(),
+ EnhancedMimeType.create("application/xml; encoding=UTF-8"), commonEvent);
+
+ // VERIFY
+ assertThat(result).isNotNull();
+ assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE.asBaseType());
+ assertThat(result.getDataContentType()).isEqualTo(
+ EnhancedMimeType.create("application/xml; encoding=UTF-8"));
+ assertThat(result.getMetaType()).isNull();
+ assertThat(result.getMetaContentType()).isNull();
+ assertThat(result.getMeta()).isNull();
+
+ }
+
+ @Test
+ public void testCreateEscMetaTargetJsonDataXmlMetaNull() {
+
+ // PREPARE
+ final String description = "Whatever";
+ final UUID uuid = UUID.randomUUID();
+ final MyEvent myEvent = new MyEvent(uuid, description);
+ final EventId eventId = new EventId();
+ final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
+ registry.addSerializer(MyEvent.SER_TYPE, new XmlDeSerializer(MyEvent.class));
+ final CommonEvent commonEvent = new SimpleCommonEvent(eventId, MyEvent.TYPE, myEvent);
+
+ // TEST
+ final IEscMeta result = EscSpiUtils.createEscMeta(registry, new BaseTypeFactory(),
+ EnhancedMimeType.create("application/json"), commonEvent);
+
+ // VERIFY
+ assertThat(result).isNotNull();
+ assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE.asBaseType());
+ assertThat(result.getDataContentType()).isEqualTo(
+ EnhancedMimeType.create("application/xml; transfer-encoding=base64; encoding=UTF-8"));
+ assertThat(result.getMetaType()).isNull();
+ assertThat(result.getMetaContentType()).isNull();
+ assertThat(result.getMeta()).isNull();
+
+ }
+
+ @Test
+ public void testCreateEscMetaTargetXmlDataXmlMetaXml() {
+
+ // PREPARE
+ final MyEvent myEvent = new MyEvent(UUID.randomUUID(), "Whatever");
+ final EventId eventId = new EventId();
+ final MyMeta myMeta = new MyMeta("peter");
+ final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
+ registry.addSerializer(MyEvent.SER_TYPE, new XmlDeSerializer(MyEvent.class));
+ registry.addSerializer(MyMeta.SER_TYPE, new XmlDeSerializer(MyMeta.class));
+ final CommonEvent commonEvent = new SimpleCommonEvent(eventId, MyEvent.TYPE, myEvent, MyMeta.TYPE,
+ myMeta);
+
+ // TEST
+ final IEscMeta result = EscSpiUtils.createEscMeta(registry, new BaseTypeFactory(),
+ EnhancedMimeType.create("application/xml; encoding=UTF-8"), commonEvent);
+
+ // VERIFY
+ assertThat(result).isNotNull();
+ assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE.asBaseType());
+ assertThat(result.getDataContentType()).isEqualTo(
+ EnhancedMimeType.create("application/xml; encoding=UTF-8"));
+ assertThat(result.getMetaType()).isEqualTo(MyMeta.TYPE.asBaseType());
+ assertThat(result.getMetaContentType()).isEqualTo(
+ EnhancedMimeType.create("application/xml; encoding=UTF-8"));
+ assertThat(result.getMeta()).isEqualTo(myMeta);
+
+ }
+
+ @Test
+ public void testCreateEscMetaTargetJsonDataXmlMetaXml() {
+
+ // PREPARE
+ final String description = "Whatever";
+ final UUID uuid = UUID.randomUUID();
+ final MyEvent myEvent = new MyEvent(uuid, description);
+ final EventId eventId = new EventId();
+ final MyMeta myMeta = new MyMeta("peter");
+ final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
+ registry.addSerializer(MyEvent.SER_TYPE, new XmlDeSerializer(MyEvent.class));
+ registry.addSerializer(MyMeta.SER_TYPE, new XmlDeSerializer(MyMeta.class));
+ final CommonEvent commonEvent = new SimpleCommonEvent(eventId, MyEvent.TYPE, myEvent, MyMeta.TYPE,
+ myMeta);
+
+ // TEST
+ final IEscMeta result = EscSpiUtils.createEscMeta(registry, new BaseTypeFactory(),
+ EnhancedMimeType.create("application/json"), commonEvent);
+
+ // VERIFY
+ assertThat(result).isNotNull();
+ assertThat(result.getDataType()).isEqualTo(MyEvent.TYPE.asBaseType());
+ assertThat(result.getDataContentType()).isEqualTo(
+ EnhancedMimeType.create("application/xml; transfer-encoding=base64; encoding=UTF-8"));
+ assertThat(result.getMetaType()).isEqualTo(MyMeta.TYPE.asBaseType());
+ assertThat(result.getMetaContentType()).isEqualTo(
+ EnhancedMimeType.create("application/xml; transfer-encoding=base64; encoding=UTF-8"));
+ assertThat(result.getMeta()).isInstanceOf(Base64Data.class);
+ final Base64Data base64Meta = (Base64Data) result.getMeta();
+ assertThat(new String(base64Meta.getDecoded(), StandardCharsets.UTF_8)).isEqualTo(
+ "
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import com.tngtech.archunit.junit.ArchIgnore;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.TypeName;
+import org.fuin.objects4j.common.Contract;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+/**
+ * Something interesting happened. Equals and hash code are based on the UUID.
+ */
+@ArchIgnore
+@XmlRootElement(name = "MyEvent")
+public final class MyEvent implements Serializable {
+
+ private static final long serialVersionUID = 100L;
+
+ /** Unique name of the event. */
+ public static final TypeName TYPE = new TypeName("MyEvent");
+
+ /** Unique name of the serialized event. */
+ public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
+
+ @XmlElement(name = "id")
+ private String id;
+
+ @XmlElement(name = "description")
+ private String description;
+
+ /**
+ * Protected default constructor for JAXB.
+ */
+ protected MyEvent() {
+ super();
+ }
+
+ /**
+ * Constructor with random UUID.
+ *
+ * @param description
+ * The description.
+ */
+ public MyEvent(@NotEmpty final String description) {
+ super();
+ Contract.requireArgNotEmpty("description", description);
+ this.id = UUID.randomUUID().toString();
+ this.description = description;
+ }
+
+ /**
+ * Constructor with all mandatory data.
+ *
+ * @param uuid
+ * The unique identifier of the event.
+ * @param description
+ * The description.
+ */
+ public MyEvent(@NotNull final UUID uuid, @NotEmpty final String description) {
+ super();
+ Contract.requireArgNotNull("uuid", uuid);
+ Contract.requireArgNotEmpty("description", description);
+ this.id = uuid.toString();
+ this.description = description;
+ }
+
+ /**
+ * Returns the unique identifier.
+ *
+ * @return UUID string.
+ */
+ @NotNull
+ public final String getId() {
+ return id;
+ }
+
+ /**
+ * Returns the description.
+ *
+ * @return The description.
+ */
+ @NotEmpty
+ public final String getDescription() {
+ return description;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ MyEvent other = (MyEvent) obj;
+ if (id == null) {
+ if (other.id != null) {
+ return false;
+ }
+ } else if (!id.equals(other.id)) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public final String toString() {
+ return "My event: " + description;
+ }
+
+}
diff --git a/jaxb/src/test/java/org/fuin/esc/jaxb/MyMeta.java b/jaxb/src/test/java/org/fuin/esc/jaxb/MyMeta.java
new file mode 100644
index 00000000..5f9e2792
--- /dev/null
+++ b/jaxb/src/test/java/org/fuin/esc/jaxb/MyMeta.java
@@ -0,0 +1,114 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jaxb;
+
+import com.tngtech.archunit.junit.ArchIgnore;
+import jakarta.annotation.Nullable;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.TypeName;
+
+import java.io.Serializable;
+
+/**
+ * Example meta data. .
+ */
+@ArchIgnore
+@XmlRootElement(name = "MyMeta")
+public final class MyMeta implements Serializable {
+
+ private static final long serialVersionUID = 100L;
+
+ /**
+ * Unique name of the meta type.
+ */
+ public static final TypeName TYPE = new TypeName("MyMeta");
+
+ /**
+ * Unique name of the serialized meta type.
+ */
+ public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
+
+ @XmlElement(name = "user")
+ private String user;
+
+ /**
+ * Protected default constructor for JAXB.
+ */
+ protected MyMeta() {
+ super();
+ }
+
+ /**
+ * Constructor with all mandatory data.
+ *
+ * @param user User ID.
+ */
+ public MyMeta(@Nullable final String user) {
+ super();
+ this.user = user;
+ }
+
+ /**
+ * Returns the user.
+ *
+ * @return User ID.
+ */
+ public final String getUser() {
+ return user;
+ }
+
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((user == null) ? 0 : user.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ MyMeta other = (MyMeta) obj;
+ if (user == null) {
+ if (other.user != null) {
+ return false;
+ }
+ } else if (!user.equals(other.user)) {
+ return false;
+ }
+ return true;
+ }
+
+
+ @Override
+ public final String toString() {
+ return "My meta: " + user;
+ }
+
+}
diff --git a/spi/src/test/java/org/fuin/esc/spi/XmlDeSerializerTest.java b/jaxb/src/test/java/org/fuin/esc/jaxb/XmlDeSerializerTest.java
similarity index 63%
rename from spi/src/test/java/org/fuin/esc/spi/XmlDeSerializerTest.java
rename to jaxb/src/test/java/org/fuin/esc/jaxb/XmlDeSerializerTest.java
index c166dc98..3554cd49 100644
--- a/spi/src/test/java/org/fuin/esc/spi/XmlDeSerializerTest.java
+++ b/jaxb/src/test/java/org/fuin/esc/jaxb/XmlDeSerializerTest.java
@@ -1,27 +1,39 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
-package org.fuin.esc.spi;
+package org.fuin.esc.jaxb;
import org.fuin.utils4j.TestOmitted;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-// CHECKSTYLE:OFF Test code
-@TestOmitted("Class will be moved later to utility library")
-public class XmlDeSerializerTest { //NOSONAR
+import static org.junit.jupiter.api.Assertions.fail;
+
+
+/**
+ * Test for the {@link XmlDeSerializer}.
+ */
+class XmlDeSerializerTest {
+
+ @Disabled("TODO Implement!")
+ @Test
+ void testX() {
+ fail("Implement!");
+ }
}
-// CHECKSTYLE:ON
+
diff --git a/spi/src/test/resources/ok.png b/jaxb/src/test/resources/ok.png
similarity index 100%
rename from spi/src/test/resources/ok.png
rename to jaxb/src/test/resources/ok.png
diff --git a/jpa/META-INF/persistence.xml b/jpa/META-INF/persistence.xml
index fd657fef..4645936d 100644
--- a/jpa/META-INF/persistence.xml
+++ b/jpa/META-INF/persistence.xml
@@ -1,5 +1,7 @@
-byte[], Node
* (XML), JsonArray or JsonObject. The possible input depends on the
@@ -35,12 +35,12 @@ public interface Deserializer {
* Unique name of the data type.
* @param mimeType
* Type of the data in the byte array.
- *
+ *
* @return Deserialized object.
- *
+ *
* @param null if not available.
*/
@Nullable
- public final String getVersion() {
+ public String getVersion() {
return getParameter(VERSION);
}
/**
* Returns the encoding from the parameters.
- *
+ *
* @return Encoding or null as default if not available.
*/
@Nullable
- public final Charset getEncoding() {
+ public Charset getEncoding() {
final String parameter = getParameter(ENCODING);
if (parameter == null) {
return null;
@@ -188,42 +188,42 @@ public final Charset getEncoding() {
/**
* Returns the information if the base type is "application/json".
- *
+ *
* @return TRUE if it's JSON content, else FALSE:
*/
- public final boolean isJson() {
+ public boolean isJson() {
return getBaseType().equals("application/json");
}
/**
* Returns the information if the base type is "application/xml".
- *
+ *
* @return TRUE if it's XML content, else FALSE:
*/
- public final boolean isXml() {
+ public boolean isXml() {
return getBaseType().equals("application/xml");
}
/**
- * Determine if the primary, sub type and encoding of this object is the same as what is in the given
+ * Determine if the primary, subtype and encoding of this object is the same as what is in the given
* type.
- *
+ *
* @param other
* The MimeType object to compare with.
- *
+ *
* @return True if they match.
*/
- public final boolean matchEncoding(final EnhancedMimeType other) {
+ public boolean matchEncoding(final EnhancedMimeType other) {
return match(other) && Objects.equals(getEncoding(), other.getEncoding());
}
/**
* Creates an instance with all data. Exceptions are wrapped to runtime exceptions.
- *
+ *
* @param str
- * Contains base type, sub type, version and parameters.
- *
+ * Contains base type, subtype, version and parameters.
+ *
* @return New instance.
*/
@Nullable
@@ -239,14 +239,14 @@ public static EnhancedMimeType create(@Nullable final String str) {
}
/**
- * Creates an instance with primary and sub type (no version, no parameters). Exceptions are wrapped to
+ * Creates an instance with primary and subtype (no version, no parameters). Exceptions are wrapped to
* runtime exceptions.
- *
+ *
* @param primary
* Primary type.
* @param sub
- * Sub type.
- *
+ * Subtype.
+ *
* @return New instance.
*/
@NotNull
@@ -255,64 +255,64 @@ public static EnhancedMimeType create(@NotNull final String primary, @NotNull fi
}
/**
- * Creates an instance with primary, sub type and encoding (no version). Exceptions are wrapped to runtime
+ * Creates an instance with primary, subtype and encoding (no version). Exceptions are wrapped to runtime
* exceptions.
- *
+ *
* @param primary
* Primary type.
* @param sub
- * Sub type.
+ * Subtype.
* @param encoding
* Encoding.
- *
+ *
* @return New instance.
*/
@NotNull
public static EnhancedMimeType create(@NotNull final String primary, @NotNull final String sub,
- final Charset encoding) {
+ final Charset encoding) {
return create(primary, sub, encoding, null, null);
}
/**
- * Creates an instance with primary, sub type, encoding and version. Exceptions are wrapped to runtime
+ * Creates an instance with primary, subtype, encoding and version. Exceptions are wrapped to runtime
* exceptions.
- *
+ *
* @param primary
* Primary type.
* @param sub
- * Sub type.
+ * Subtype.
* @param encoding
* Encoding.
* @param version
* Version.
- *
+ *
* @return New instance.
*/
@NotNull
public static EnhancedMimeType create(@NotNull final String primary, @NotNull final String sub,
- final Charset encoding, final String version) {
+ final Charset encoding, final String version) {
return create(primary, sub, encoding, version, new HashMapasBaseType() to be sure this is initialized.
@@ -59,7 +57,7 @@ public EventId() {
/**
* Creates a new event ID using the given string.
- *
+ *
* @param value
* String that represents a UUID.
*/
@@ -69,7 +67,7 @@ public EventId(@NotNull @UUIDStr final String value) {
/**
* Creates a new event ID using the given value.
- *
+ *
* @param value
* UUID to use.
*/
@@ -82,12 +80,12 @@ public EventId(@NotNull final UUID value) {
}
@Override
- public final Classnull the enum
* {@link #ANY} will be returned.
- *
+ *
* @return Value.
*/
public static long no(@Nullable final String name) {
diff --git a/api/src/main/java/org/fuin/esc/api/HasSerializedDataTypeConstant.java b/api/src/main/java/org/fuin/esc/api/HasSerializedDataTypeConstant.java
index 6a4d1820..f0231099 100644
--- a/api/src/main/java/org/fuin/esc/api/HasSerializedDataTypeConstant.java
+++ b/api/src/main/java/org/fuin/esc/api/HasSerializedDataTypeConstant.java
@@ -3,7 +3,12 @@
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* A class that has a public static constant of type {@link SerializedDataType}.
@@ -13,7 +18,7 @@
@Target(ElementType.TYPE)
@Inherited
@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy = { HasSerializedDataTypeConstantValidator.class })
+@Constraint(validatedBy = {HasSerializedDataTypeConstantValidator.class})
public @interface HasSerializedDataTypeConstant {
/**
diff --git a/api/src/main/java/org/fuin/esc/api/HasSerializedDataTypeConstantValidator.java b/api/src/main/java/org/fuin/esc/api/HasSerializedDataTypeConstantValidator.java
index c050aa18..d67886e8 100644
--- a/api/src/main/java/org/fuin/esc/api/HasSerializedDataTypeConstantValidator.java
+++ b/api/src/main/java/org/fuin/esc/api/HasSerializedDataTypeConstantValidator.java
@@ -4,13 +4,12 @@
import jakarta.validation.ConstraintValidatorContext;
import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
/**
* Determines if the annotated class has a public static constant with the given name and {@link SerializedDataType} type.
*/
-public class HasSerializedDataTypeConstantValidator implements ConstraintValidatorbyte[] for unmarshalling content. Type
- * {@link JsonStructure} will simply return the input without any change.
- */
-public final class JsonDeSerializer implements SerDeserializer {
-
- private final EnhancedMimeType mimeType;
-
- /**
- * Constructor with UTF-8 encoding.
- */
- public JsonDeSerializer() {
- this(Charset.forName("utf-8"));
- }
-
- /**
- * Constructor with type and encoding.
- *
- * @param encoding
- * Default encoding to use.
- */
- public JsonDeSerializer(final Charset encoding) {
- super();
- this.mimeType = EnhancedMimeType.create("application", "json", encoding);
- }
-
- @Override
- public final EnhancedMimeType getMimeType() {
- return mimeType;
- }
-
- @Override
- public final byte[] marshal(final Object obj, final SerializedDataType type) {
-
- final JsonStructure struct;
- if (obj instanceof ToJsonCapable) {
- struct = ((ToJsonCapable) obj).toJson();
- } else if (obj instanceof JsonStructure) {
- struct = (JsonStructure) obj;
- } else {
- throw new IllegalArgumentException("Can only handle instances of type '"
- + ToJsonCapable.class.getSimpleName() + "' or '" + JsonStructure.class.getSimpleName()
- + "', but not: " + obj.getClass());
- }
-
- final ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
- final Writer writer = new OutputStreamWriter(bos, mimeType.getEncoding());
- final JsonWriter jsonWriter = Json.createWriter(writer);
- try {
- jsonWriter.write(struct);
- } finally {
- jsonWriter.close();
- }
- return bos.toByteArray();
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public final false).
* @param eventType
* Unique type names of events to select.
- *
+ *
* @throws StreamAlreadyExistsException
* The given projection could not be created because it already
* exists.
*/
- public void createProjection(@NotNull StreamId projectionId, boolean enable,
- @NotNull TypeName... eventType) throws StreamAlreadyExistsException;
+ void createProjection(@NotNull StreamId projectionId, boolean enable,
+ @NotNull TypeName... eventType) throws StreamAlreadyExistsException;
/**
* Creates a new projection that selects a list of events by their type.
- *
+ *
* @param projectionId
* Unique name of the projection to create.
* @param enable
@@ -102,24 +102,24 @@ public void createProjection(@NotNull StreamId projectionId, boolean enable,
* (false).
* @param eventTypes
* Unique type names of events to select.
- *
+ *
* @throws StreamAlreadyExistsException
* The given projection could not be created because it already
* exists.
*/
- public void createProjection(@NotNull StreamId projectionId, boolean enable,
- @NotNull Listnull, but may be an empty list.
- *
+ *
* @throws StreamNotFoundException
* A stream with the given name does not exist in the
* repository.
@@ -47,23 +47,23 @@ public interface ReadableEventStore extends EventStoreBasics {
* deleted.
*/
@NotNull
- public StreamEventsSlice readEventsForward(@NotNull StreamId streamId,
- long start, int count);
+ StreamEventsSlice readEventsForward(@NotNull StreamId streamId,
+ long start, int count);
/**
* Reads count Events from an Event Stream backwards (e.g. newest to oldest)
* starting from position start.
- *
+ *
* @param streamId
* The stream to read from.
* @param start
* The starting point to read from.
* @param count
* The count of items to read.
- *
+ *
* @return A slice containing the results of the read operation. Never
* null, but may be an empty list.
- *
+ *
* @throws StreamNotFoundException
* A stream with the given name does not exist in the
* repository.
@@ -72,19 +72,19 @@ public StreamEventsSlice readEventsForward(@NotNull StreamId streamId,
* deleted.
*/
@NotNull
- public StreamEventsSlice readEventsBackward(@NotNull StreamId streamId,
- long start, int count);
+ StreamEventsSlice readEventsBackward(@NotNull StreamId streamId,
+ long start, int count);
/**
* Reads a single event from a stream.
- *
+ *
* @param streamId
* The stream to read from.
* @param eventNumber
* The event number to read.
- *
+ *
* @return A result containing the results of the read operation.
- *
+ *
* @throws EventNotFoundException
* An event with the given number was not found in the stream.
* @throws StreamNotFoundException
@@ -95,32 +95,32 @@ public StreamEventsSlice readEventsBackward(@NotNull StreamId streamId,
* deleted.
*/
@NotNull
- public CommonEvent readEvent(@NotNull StreamId streamId, long eventNumber);
+ CommonEvent readEvent(@NotNull StreamId streamId, long eventNumber);
/**
* Determines if a stream exists.
- *
+ *
* @param streamId
* Unique identifier of the stream.
- *
+ *
* @return TRUE if the stream exists, else FALSE.
*/
- public boolean streamExists(@NotNull StreamId streamId);
+ boolean streamExists(@NotNull StreamId streamId);
/**
* Returns the state of the stream.
- *
+ *
* @param streamId
* Unique identifier of the stream.
- *
+ *
* @return State.
- *
+ *
* @throws StreamNotFoundException
* A stream with the given name does not exist in the
* repository.
*/
@NotNull
- public StreamState streamState(@NotNull StreamId streamId);
+ StreamState streamState(@NotNull StreamId streamId);
/**
* Reads all events until the end of the stream. A stream that does not
@@ -130,7 +130,7 @@ public StreamEventsSlice readEventsBackward(@NotNull StreamId streamId,
* application exceptions using the "ejb-jar.xml" (If you don't know what
* this is, just google for "ejb-jar.xml assembly-descriptor
* application-exception").
- *
+ *
* @param streamId
* Unique identifier of the stream.
* @param startingAtEventNumber
@@ -139,27 +139,27 @@ public StreamEventsSlice readEventsBackward(@NotNull StreamId streamId,
* Number of events to read in a single operation.
* @param handler
* Handler to pass a read chunk to.
- *
+ *
* @throws StreamDeletedException
* A stream with the given name previously existed but was
* deleted.
*/
- public void readAllEventsForward(StreamId streamId,
- long startingAtEventNumber, int chunkSize,
- ChunkEventHandler handler);
+ void readAllEventsForward(StreamId streamId,
+ long startingAtEventNumber, int chunkSize,
+ ChunkEventHandler handler);
/**
* Handles a number of events.
*/
- public interface ChunkEventHandler {
+ interface ChunkEventHandler {
/**
* List of events to handle.
- *
+ *
* @param currentSlice
* Slice with events to handle.
*/
- public void handle(StreamEventsSlice currentSlice);
+ void handle(StreamEventsSlice currentSlice);
}
diff --git a/api/src/main/java/org/fuin/esc/api/ReadableEventStoreAsync.java b/api/src/main/java/org/fuin/esc/api/ReadableEventStoreAsync.java
index 6fe59e32..dbabd88a 100644
--- a/api/src/main/java/org/fuin/esc/api/ReadableEventStoreAsync.java
+++ b/api/src/main/java/org/fuin/esc/api/ReadableEventStoreAsync.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ * null, but may be an empty list.
- *
+ *
* @throws StreamNotFoundException
* A stream with the given name does not exist in the
* repository.
@@ -49,23 +49,23 @@ public interface ReadableEventStoreAsync extends EventStoreBasicsAsync {
* deleted.
*/
@NotNull
- public CompletableFuturenull, but may be an empty list.
- *
+ *
* @throws StreamNotFoundException
* A stream with the given name does not exist in the
* repository.
@@ -74,19 +74,19 @@ public CompletableFuturenull if the event store didn't
* tell us what version it expected.
*/
@Nullable
- public final Long getActual() {
+ public Long getActual() {
return actual;
}
diff --git a/api/src/test/java/org/fuin/esc/api/ArchitectureTest.java b/api/src/test/java/org/fuin/esc/api/ArchitectureTest.java
new file mode 100644
index 00000000..c2e55594
--- /dev/null
+++ b/api/src/test/java/org/fuin/esc/api/ArchitectureTest.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright (C) 2013 Future Invent Informationsmanagement GmbH. All rights
+ * reserved. byte[] for unmarshalling
- * content.
- */
-public final class XmlDeSerializer implements SerDeserializer {
-
- private static final Logger LOG = LoggerFactory.getLogger(XmlDeSerializer.class);
-
- private final EnhancedMimeType mimeType;
-
- private final Marshaller marshaller;
-
- private final Unmarshaller unmarshaller;
-
- /**
- * Constructor that creates a JAXB context internally and uses UTF-8 encoding.
- *
- * @param classesToBeBound
- * Classes to use for the JAXB context.
- */
- public XmlDeSerializer(final Class... classesToBeBound) {
- this(Charset.forName("utf-8"), true, classesToBeBound);
- }
-
- /**
- * Constructor that creates a JAXB context internally and uses UTF-8 encoding.
- *
- * @param jaxbFragment
- * Generate the XML fragment or not.
- * @param classesToBeBound
- * Classes to use for the JAXB context.
- */
- public XmlDeSerializer(final boolean jaxbFragment, final Class... classesToBeBound) {
- this(Charset.forName("utf-8"), jaxbFragment, classesToBeBound);
- }
-
- /**
- * Constructor that creates a JAXB context internally.
- *
- * @param encoding
- * Encoding to use.
- * @param classesToBeBound
- * Classes to use for the JAXB context.
- */
- public XmlDeSerializer(final Charset encoding, final Class... classesToBeBound) {
- this(encoding, null, true, classesToBeBound);
- }
-
- /**
- * Constructor that creates a JAXB context internally.
- *
- * @param encoding
- * Encoding to use.
- * @param jaxbFragment
- * Generate the XML fragment or not.
- * @param classesToBeBound
- * Classes to use for the JAXB context.
- */
- public XmlDeSerializer(final Charset encoding, final boolean jaxbFragment,
- final Class... classesToBeBound) {
- this(encoding, null, true, classesToBeBound);
- }
-
- /**
- * Constructor with JAXB context classes.
- *
- * @param encoding
- * Encoding to use.
- * @param adapters
- * Adapters to associate with the JAXB context or null.
- * @param jaxbFragment
- * Generate the XML fragment or not.
- * @param classesToBeBound
- * Classes to use for the JAXB context.
- */
- public XmlDeSerializer(final Charset encoding, final XmlAdapter[] adapters,
- final boolean jaxbFragment, final Class... classesToBeBound) {
- super();
- this.mimeType = EnhancedMimeType.create("application", "xml", encoding);
- try {
- final JAXBContext ctx = JAXBContext.newInstance(classesToBeBound);
- marshaller = ctx.createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_FRAGMENT, jaxbFragment);
- unmarshaller = ctx.createUnmarshaller();
- if ((adapters == null) || (adapters.length == 0)) {
- LOG.debug("No adapters set");
- } else {
- for (XmlAdapter adapter : adapters) {
- LOG.debug("Set adapter : " + adapter);
- marshaller.setAdapter(adapter);
- unmarshaller.setAdapter(adapter);
- }
- }
- unmarshaller.setEventHandler(new ValidationEventHandler() {
- @Override
- public boolean handleEvent(final ValidationEvent event) {
- if (event.getSeverity() > 0) {
- if (event.getLinkedException() == null) {
- throw new RuntimeException("Error unmarshalling the data: " + event.getMessage());
- }
- throw new RuntimeException("Error unmarshalling " + "the data", event
- .getLinkedException());
- }
- return true;
- }
- });
- } catch (final JAXBException ex) {
- throw new RuntimeException("Error initializing JAXB helper classes", ex);
- }
- }
-
- @Override
- public final EnhancedMimeType getMimeType() {
- return mimeType;
- }
-
- @Override
- public final byte[] marshal(final Object obj, final SerializedDataType type) {
- try {
- final ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
- final Writer writer = new OutputStreamWriter(bos, mimeType.getEncoding());
- marshaller.marshal(obj, writer);
- return bos.toByteArray();
- } catch (final JAXBException ex) {
- throw new RuntimeException("Error serializing data", ex);
- }
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public final byte[] for unmarshalling
+ * content.
+ */
+public final class XmlDeSerializer implements SerDeserializer {
+
+ private static final Logger LOG = LoggerFactory.getLogger(XmlDeSerializer.class);
+
+ @NotNull
+ private final EnhancedMimeType mimeType;
+
+ @NotNull
+ private final Marshaller marshaller;
+
+ @NotNull
+ private final Unmarshaller unmarshaller;
+
+ /**
+ * Constructor that creates a JAXB context internally and uses UTF-8 encoding.
+ *
+ * @param classesToBeBound Classes to use for the JAXB context.
+ */
+ public XmlDeSerializer(@NotNull final Class... classesToBeBound) {
+ this(StandardCharsets.UTF_8, true, classesToBeBound);
+ }
+
+ /**
+ * Constructor that creates a JAXB context internally and uses UTF-8 encoding.
+ *
+ * @param jaxbFragment Generate the XML fragment or not.
+ * @param classesToBeBound Classes to use for the JAXB context.
+ */
+ public XmlDeSerializer(final boolean jaxbFragment,
+ @NotNull final Class... classesToBeBound) {
+ this(StandardCharsets.UTF_8, jaxbFragment, classesToBeBound);
+ }
+
+ /**
+ * Constructor that creates a JAXB context internally.
+ *
+ * @param encoding Encoding to use.
+ * @param classesToBeBound Classes to use for the JAXB context.
+ */
+ public XmlDeSerializer(@NotNull final Charset encoding,
+ @NotNull final Class... classesToBeBound) {
+ this(encoding, null, true, classesToBeBound);
+ }
+
+ /**
+ * Constructor that creates a JAXB context internally.
+ *
+ * @param encoding Encoding to use.
+ * @param jaxbFragment Generate the XML fragment or not.
+ * @param classesToBeBound Classes to use for the JAXB context.
+ */
+ public XmlDeSerializer(@NotNull final Charset encoding,
+ final boolean jaxbFragment,
+ @NotNull final Class... classesToBeBound) {
+ this(encoding, null, jaxbFragment, classesToBeBound);
+ }
+
+ /**
+ * Constructor with JAXB context classes.
+ *
+ * @param encoding Encoding to use.
+ * @param adapters Adapters to associate with the JAXB context or null.
+ * @param jaxbFragment Generate the XML fragment or not.
+ * @param classesToBeBound Classes to use for the JAXB context.
+ */
+ public XmlDeSerializer(@NotNull final Charset encoding,
+ @Nullable final XmlAdapter[] adapters,
+ final boolean jaxbFragment,
+ @NotNull final Class... classesToBeBound) {
+ super();
+ this.mimeType = EnhancedMimeType.create("application", "xml", encoding);
+ try {
+ final JAXBContext ctx = JAXBContext.newInstance(classesToBeBound);
+ marshaller = ctx.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FRAGMENT, jaxbFragment);
+ unmarshaller = ctx.createUnmarshaller();
+ if ((adapters == null) || (adapters.length == 0)) {
+ LOG.debug("No adapters set");
+ } else {
+ for (XmlAdapter adapter : adapters) {
+ LOG.debug("Set adapter : {}", adapter);
+ marshaller.setAdapter(adapter);
+ unmarshaller.setAdapter(adapter);
+ }
+ }
+ unmarshaller.setEventHandler(event -> {
+ if (event.getSeverity() > 0) {
+ if (event.getLinkedException() == null) {
+ throw new RuntimeException("Error unmarshalling the data: " + event.getMessage());
+ }
+ throw new RuntimeException("Error unmarshalling " + "the data", event
+ .getLinkedException());
+ }
+ return true;
+ });
+ } catch (final JAXBException ex) {
+ throw new RuntimeException("Error initializing JAXB helper classes", ex);
+ }
+ }
+
+ @Override
+ public EnhancedMimeType getMimeType() {
+ return mimeType;
+ }
+
+ @Override
+ public byte[] marshal(@NotNull final Object obj, @NotNull final SerializedDataType type) {
+ Contract.requireArgNotNull("obj", obj);
+ Contract.requireArgNotNull("type", type);
+ try {
+ final ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
+ final Writer writer = new OutputStreamWriter(bos, mimeType.getEncoding());
+ marshaller.marshal(obj, writer);
+ return bos.toByteArray();
+ } catch (final JAXBException ex) {
+ throw new RuntimeException("Error serializing data", ex);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public null data argument returns
* null. Handles CDATA sections correctly. T
- *
+ *
* @param data
* Data to serialize or null.
* @param adapters
@@ -46,14 +45,14 @@ public abstract class AbstractXmlTest {
* @param classesToBeBound
* List of java classes to be recognized by the
* {@link JAXBContext}.
- *
+ *
* @return XML data or null.
- *
+ *
* @param
* This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation; either version 3 of the License, or (at your option) any * later version. - * + *
* This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. - * + *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -23,8 +23,21 @@
import jakarta.persistence.TypedQuery;
import jakarta.persistence.metamodel.EntityType;
import jakarta.validation.constraints.NotNull;
-import org.fuin.esc.api.*;
-import org.fuin.esc.spi.*;
+import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.DeserializerRegistry;
+import org.fuin.esc.api.EventNotFoundException;
+import org.fuin.esc.api.ReadableEventStore;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.SerializerRegistry;
+import org.fuin.esc.api.SimpleCommonEvent;
+import org.fuin.esc.api.StreamDeletedException;
+import org.fuin.esc.api.StreamEventsSlice;
+import org.fuin.esc.api.StreamId;
+import org.fuin.esc.api.StreamNotFoundException;
+import org.fuin.esc.api.StreamState;
+import org.fuin.esc.spi.AbstractReadableEventStore;
+import org.fuin.esc.spi.EscSpiUtils;
+import org.fuin.esc.spi.SerializedData;
import org.fuin.objects4j.common.ConstraintViolationException;
import org.fuin.objects4j.common.Contract;
import org.fuin.objects4j.core.KeyValue;
@@ -59,7 +72,7 @@ public abstract class AbstractJpaEventStore extends AbstractReadableEventStore i
/**
* Constructor with all mandatory data.
- *
+ *
* @param em
* Entity manager.
* @param serRegistry
@@ -68,7 +81,7 @@ public abstract class AbstractJpaEventStore extends AbstractReadableEventStore i
* Registry used to locate deserializers.
*/
public AbstractJpaEventStore(@NotNull final EntityManager em,
- @NotNull final SerializerRegistry serRegistry, @NotNull final DeserializerRegistry desRegistry) {
+ @NotNull final SerializerRegistry serRegistry, @NotNull final DeserializerRegistry desRegistry) {
super();
Contract.requireArgNotNull("em", em);
Contract.requireArgNotNull("serRegistry", serRegistry);
@@ -81,7 +94,7 @@ public AbstractJpaEventStore(@NotNull final EntityManager em,
/**
* Returns the entity manager.
- *
+ *
* @return Entity manager.
*/
protected final EntityManager getEm() {
@@ -90,7 +103,7 @@ protected final EntityManager getEm() {
/**
* Returns a registry of serializers.
- *
+ *
* @return Registry with known serializers.
*/
@NotNull
@@ -100,7 +113,7 @@ protected final SerializerRegistry getSerializerRegistry() {
/**
* Returns a registry of deserializers.
- *
+ *
* @return Registry with known deserializers.
*/
@NotNull
@@ -155,7 +168,7 @@ public final CommonEvent readEvent(final StreamId streamId, final long eventNumb
@SuppressWarnings("unchecked")
@Override
public final StreamEventsSlice readEventsForward(final StreamId streamId, final long start,
- final int count) {
+ final int count) {
Contract.requireArgNotNull("streamId", streamId);
Contract.requireArgMin("start", start, 0);
@@ -170,7 +183,7 @@ public final StreamEventsSlice readEventsForward(final StreamId streamId, final
}
if (!projection.isEnabled()) {
// The projection does exist, but is not ready yet
- return new StreamEventsSlice(start, new ArrayList
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -21,14 +21,13 @@
import jakarta.persistence.Embeddable;
import jakarta.persistence.Lob;
import jakarta.validation.constraints.NotNull;
-import jakarta.xml.bind.annotation.XmlInlineBinaryData;
-import org.fuin.esc.api.TypeName;
import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.TypeName;
import org.fuin.esc.spi.SerializedData;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
import org.fuin.objects4j.common.ValueObject;
+import javax.annotation.concurrent.Immutable;
import java.io.Serializable;
import java.util.Arrays;
@@ -54,7 +53,6 @@ public class JpaData implements ValueObject, Serializable {
/** Raw event data in format defined by the mime type and encoding. */
@Lob
@Column(name = "DATA_RAW", nullable = false)
- @XmlInlineBinaryData
private byte[] raw;
/**
@@ -66,7 +64,7 @@ protected JpaData() { //NOSONAR Ignore uninitialized fields
/**
* Creates a data object.
- *
+ *
* @param typeName
* Unique identifier for the type of data.
* @param mimeType
@@ -75,7 +73,7 @@ protected JpaData() { //NOSONAR Ignore uninitialized fields
* Raw data block.
*/
public JpaData(@NotNull final TypeName typeName,
- @NotNull final EnhancedMimeType mimeType, @NotNull final byte[] raw) {
+ @NotNull final EnhancedMimeType mimeType, @NotNull final byte[] raw) {
super();
Contract.requireArgNotNull("type", typeName);
@@ -91,7 +89,7 @@ public JpaData(@NotNull final TypeName typeName,
* Copies a given SPI data object. Caution: To avoid performance problems
* this will just copy the reference to the by array, means it does not copy
* the bytes in the array itself.
- *
+ *
* @param data
* Data to copy.
*/
@@ -105,7 +103,7 @@ public JpaData(@NotNull final SerializedData data) {
/**
* Returns the unique identifier for the type of data.
- *
+ *
* @return Unique and never changing type name.
*/
@NotNull
@@ -115,7 +113,7 @@ public final TypeName getTypeName() {
/**
* Returns the Internet Media Type that classifies the data.
- *
+ *
* @return Mime type.
*/
@NotNull
@@ -125,7 +123,7 @@ public final EnhancedMimeType getMimeType() {
/**
* Returns the raw data block.
- *
+ *
* @return Raw data.
*/
@NotNull
@@ -133,7 +131,6 @@ public final byte[] getRaw() {
return raw;
}
- // CHECKSTYLE:OFF Generated code
@Override
public final int hashCode() {
final int prime = 31;
@@ -151,9 +148,8 @@ public final boolean equals(Object obj) {
return true;
if (obj == null)
return false;
- if (!(obj instanceof JpaData))
+ if (!(obj instanceof JpaData other))
return false;
- JpaData other = (JpaData) obj;
if (mimeType == null) {
if (other.mimeType != null)
return false;
@@ -162,13 +158,9 @@ public final boolean equals(Object obj) {
if (!Arrays.equals(raw, other.raw))
return false;
if (type == null) {
- if (other.type != null)
- return false;
- } else if (!type.equals(other.type))
- return false;
- return true;
+ return other.type == null;
+ } else return type.equals(other.type);
}
- // CHECKSTYLE:ON
}
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/JpaEvent.java b/jpa/src/main/java/org/fuin/esc/jpa/JpaEvent.java
index fdb86869..c916266c 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/JpaEvent.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/JpaEvent.java
@@ -1,27 +1,35 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.jpa;
-import io.github.threetenjaxb.core.ZonedDateTimeXmlAdapter;
import jakarta.annotation.Nullable;
-import jakarta.persistence.*;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
import jakarta.validation.constraints.NotNull;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.fuin.esc.api.EventId;
import java.time.ZonedDateTime;
@@ -52,7 +60,6 @@ public class JpaEvent {
@Column(name = COLUMN_EVENT_ID, length = 36, nullable = false, columnDefinition = "VARCHAR(36)")
private String eventId;
- @XmlJavaTypeAdapter(ZonedDateTimeXmlAdapter.class)
@Column(name = "created", nullable = false)
private ZonedDateTime created;
@@ -61,9 +68,9 @@ public class JpaEvent {
private JpaData data;
@Embedded
- @AttributeOverrides({ @AttributeOverride(name = "type", column = @Column(name = "META_TYPE")),
+ @AttributeOverrides({@AttributeOverride(name = "type", column = @Column(name = "META_TYPE")),
@AttributeOverride(name = "mimeType", column = @Column(name = "META_MIME_TYPE")),
- @AttributeOverride(name = "raw", column = @Column(name = "META_RAW")) })
+ @AttributeOverride(name = "raw", column = @Column(name = "META_RAW"))})
private JpaData meta;
/**
@@ -74,8 +81,8 @@ protected JpaEvent() { //NOSONAR Ignore uninitialized fields
}
/**
- * Constructor without meta data.
- *
+ * Constructor without metadata.
+ *
* @param eventId
* Unique identifier of the event. Generated on the client and
* used to achieve idempotence when trying to append the same
@@ -89,7 +96,7 @@ public JpaEvent(@NotNull final EventId eventId, @NotNull final JpaData data) {
/**
* Constructor with all data.
- *
+ *
* @param eventId
* Unique identifier of the event. Generated on the client and
* used to achieve idempotence when trying to append the same
@@ -100,7 +107,7 @@ public JpaEvent(@NotNull final EventId eventId, @NotNull final JpaData data) {
* Meta data (Optional).
*/
public JpaEvent(@NotNull final EventId eventId, @NotNull final JpaData data,
- @Nullable final JpaData meta) {
+ @Nullable final JpaData meta) {
super();
this.eventId = eventId.asBaseType().toString();
this.data = data;
@@ -109,7 +116,7 @@ public JpaEvent(@NotNull final EventId eventId, @NotNull final JpaData data,
/**
* Returns the unique identifier of the entry.
- *
+ *
* @return Unique entry ID.
*/
public Long getId() {
@@ -120,7 +127,7 @@ public Long getId() {
* Returns the unique identifier of the event. Generated on the client and
* used to achieve idempotence when trying to append the same event multiple
* times.
- *
+ *
* @return Unique event ID.
*/
@NotNull
@@ -130,7 +137,7 @@ public EventId getEventId() {
/**
* Returns the time when the event was created.
- *
+ *
* @return Date, time and zone of event's creation.
*/
@NotNull
@@ -140,7 +147,7 @@ public ZonedDateTime getCreated() {
/**
* Returns the data of the event.
- *
+ *
* @return The event.
*/
@NotNull
@@ -149,9 +156,9 @@ public JpaData getData() {
}
/**
- * Returns the meta data of the event (Optional).
- *
- * @return The event's meta data or NULL.
+ * Returns the metadata of the event (Optional).
+ *
+ * @return The event's metadata or NULL.
*/
public JpaData getMeta() {
return meta;
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/JpaEventStore.java b/jpa/src/main/java/org/fuin/esc/jpa/JpaEventStore.java
index 99f29e4a..c3697c27 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/JpaEventStore.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/JpaEventStore.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -21,8 +21,21 @@
import jakarta.persistence.LockModeType;
import jakarta.persistence.TypedQuery;
import jakarta.validation.constraints.NotNull;
-import org.fuin.esc.api.*;
-import org.fuin.esc.spi.*;
+import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.DeserializerRegistry;
+import org.fuin.esc.api.EventStore;
+import org.fuin.esc.api.ExpectedVersion;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.SerializerRegistry;
+import org.fuin.esc.api.StreamAlreadyExistsException;
+import org.fuin.esc.api.StreamDeletedException;
+import org.fuin.esc.api.StreamEventsSlice;
+import org.fuin.esc.api.StreamId;
+import org.fuin.esc.api.StreamReadOnlyException;
+import org.fuin.esc.api.StreamState;
+import org.fuin.esc.api.WrongExpectedVersionException;
+import org.fuin.esc.spi.EscSpiUtils;
+import org.fuin.esc.spi.SerializedData;
import org.fuin.objects4j.common.Contract;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,11 +51,11 @@ public final class JpaEventStore extends AbstractJpaEventStore implements EventS
private static final Logger LOG = LoggerFactory.getLogger(JpaEventStore.class);
- private JpaIdStreamFactory streamFactory;
+ private final JpaIdStreamFactory streamFactory;
/**
* Constructor with all mandatory data.
- *
+ *
* @param em
* Entity manager.
* @param streamFactory
@@ -53,41 +66,41 @@ public final class JpaEventStore extends AbstractJpaEventStore implements EventS
* Registry used to locate deserializers.
*/
public JpaEventStore(@NotNull final EntityManager em, @NotNull final JpaIdStreamFactory streamFactory,
- @NotNull final SerializerRegistry serRegistry, @NotNull final DeserializerRegistry desRegistry) {
+ @NotNull final SerializerRegistry serRegistry, @NotNull final DeserializerRegistry desRegistry) {
super(em, serRegistry, desRegistry);
Contract.requireArgNotNull("streamFactory", streamFactory);
this.streamFactory = streamFactory;
}
@Override
- public final void createStream(final StreamId streamId) throws StreamAlreadyExistsException {
+ public void createStream(final StreamId streamId) throws StreamAlreadyExistsException {
// Do nothing as the operation is not supported
}
@Override
- public final boolean isSupportsCreateStream() {
+ public boolean isSupportsCreateStream() {
return false;
}
-
+
@Override
- public final long appendToStream(final StreamId streamId, final CommonEvent... events) {
+ public long appendToStream(final StreamId streamId, final CommonEvent... events) {
return appendToStream(streamId, ANY.getNo(), EscSpiUtils.asList(events));
}
@Override
- public final long appendToStream(final StreamId streamId, final long expectedVersion,
- final CommonEvent... events) {
+ public long appendToStream(final StreamId streamId, final long expectedVersion,
+ final CommonEvent... events) {
return appendToStream(streamId, expectedVersion, EscSpiUtils.asList(events));
}
@Override
- public final long appendToStream(final StreamId streamId, final List
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -27,22 +27,22 @@ public interface JpaIdStreamFactory {
/**
* Checks if the factory can create a stream based on a given stream
* identifier.
- *
+ *
* @param streamId
* Identifier to create a stream for.
- *
+ *
* @return TRUE if a stream can be created using the identifier.
*/
- public boolean containsType(StreamId streamId);
+ boolean containsType(StreamId streamId);
/**
* Creates a new stream instance (without persisting it).
- *
+ *
* @param streamId
* Stream identifier to create an instance for.
- *
+ *
* @return New object.
*/
- public JpaStream createStream(StreamId streamId);
+ JpaStream createStream(StreamId streamId);
}
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/JpaProjection.java b/jpa/src/main/java/org/fuin/esc/jpa/JpaProjection.java
index e749e22a..d437ea06 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/JpaProjection.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/JpaProjection.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -48,7 +48,7 @@ protected JpaProjection() { //NOSONAR Ignore uninitialized fields
/**
* Constructor with all mandatory data.
- *
+ *
* @param name
* Unique name for the projection.
*/
@@ -60,7 +60,7 @@ public JpaProjection(@NotNull final String name) {
/**
* Constructor with all data.
- *
+ *
* @param name
* Unique name for the projection.
* @param enabled
@@ -75,14 +75,13 @@ public JpaProjection(@NotNull final String name, final boolean enabled) {
/**
* Returns the information if the query is enabled.
- *
+ *
* @return FALSE if the query is being created, else TRUE.
*/
public boolean isEnabled() {
return enabled;
}
- // CHECKSTYLE:OFF Generated code
@Override
public int hashCode() {
final int prime = 31;
@@ -97,18 +96,13 @@ public boolean equals(final Object obj) {
return true;
if (obj == null)
return false;
- if (!(obj instanceof JpaProjection))
+ if (!(obj instanceof JpaProjection other))
return false;
- JpaProjection other = (JpaProjection) obj;
if (name == null) {
- if (other.name != null)
- return false;
- } else if (!name.equals(other.name))
- return false;
- return true;
+ return other.name == null;
+ } else return name.equals(other.name);
}
- // CHECKSTYLE:ON
@Override
public String toString() {
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/JpaStream.java b/jpa/src/main/java/org/fuin/esc/jpa/JpaStream.java
index 23d0d1a9..4b3f82b1 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/JpaStream.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/JpaStream.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -37,7 +37,7 @@ public abstract class JpaStream {
/**
* Returns the state of the stream.
- *
+ *
* @return State.
*/
public StreamState getState() {
@@ -46,7 +46,7 @@ public StreamState getState() {
/**
* Returns the information if the stream was deleted.
- *
+ *
* @return TRUE if soft or hard deleted.
*/
public boolean isDeleted() {
@@ -55,7 +55,7 @@ public boolean isDeleted() {
/**
* Marks the stream as deleted.
- *
+ *
* @param hardDelete
* Hard or soft deletion.
*/
@@ -69,7 +69,7 @@ public void delete(final boolean hardDelete) {
/**
* Returns the current version of the stream.
- *
+ *
* @return Version.
*/
public long getVersion() {
@@ -78,7 +78,7 @@ public long getVersion() {
/**
* Increments the version of the stream by one.
- *
+ *
* @return New version.
*/
public long incVersion() {
@@ -92,7 +92,7 @@ public long incVersion() {
* The unique identifier of the stream to create an event for.
* @param eventEntry
* Event entry to convert into a JPA variant.
- *
+ *
* @return JPA entity.
*/
public abstract JpaStreamEvent createEvent(@NotNull StreamId streamId, @NotNull JpaEvent eventEntry);
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/JpaStreamEvent.java b/jpa/src/main/java/org/fuin/esc/jpa/JpaStreamEvent.java
index 128382f6..22edf564 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/JpaStreamEvent.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/JpaStreamEvent.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -31,11 +31,11 @@ public abstract class JpaStreamEvent {
/** SQL EVENT ID column name. */
public static final String COLUMN_EVENTS_ID = "events_id";
-
- /** Column event number - Defined in sub classes as part of the composite identifier. */
+
+ /** Column event number - Defined in subclasses as part of the composite identifier. */
public static final String COLUMN_EVENT_NUMBER = "event_number";
-
-
+
+
@NotNull
@ManyToOne(optional = false)
@JoinColumn(name = COLUMN_EVENTS_ID, nullable = false, updatable = false)
@@ -50,7 +50,7 @@ protected JpaStreamEvent() { //NOSONAR Ignore uninitialized fields
/**
* Constructs a stream event.
- *
+ *
* @param event
* Event to be connected with this event stream.
*/
@@ -62,7 +62,7 @@ public JpaStreamEvent(@NotNull final JpaEvent event) {
/**
* Returns the actual event.
- *
+ *
* @return Event connected with this stream
*/
@NotNull
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/JpaStreamId.java b/jpa/src/main/java/org/fuin/esc/jpa/JpaStreamId.java
index 011e1a5f..397c74ea 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/JpaStreamId.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/JpaStreamId.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -26,16 +26,16 @@ public interface JpaStreamId extends StreamId {
/**
* Returns the name of the entity class.
- *
+ *
* @return Name of the entity that has the {@link jakarta.persistence.Table} JPA annotation.
*/
- public String getEntityName();
+ String getEntityName();
/**
* Returns the name of the database table to use for the stream.
- *
+ *
* @return Name that is configured in the {@link jakarta.persistence.Table} JPA annotation.
*/
- public String getNativeTableName();
+ String getNativeTableName();
}
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/JpaUtils.java b/jpa/src/main/java/org/fuin/esc/jpa/JpaUtils.java
index cf233ae1..b1de1c4a 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/JpaUtils.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/JpaUtils.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -31,10 +31,10 @@ private JpaUtils() {
/**
* Returns the name of the stream entity for a given stream.
- *
+ *
* @param streamId
* Identifier of the stream to return a stream entity name for.
- *
+ *
* @return Name of the entity (simple class name).
*/
public static String streamEntityName(final StreamId streamId) {
@@ -47,40 +47,39 @@ public static String streamEntityName(final StreamId streamId) {
if (streamId.isProjection()) {
return streamId.getName();
}
- if (streamId.getParameters().size() == 0) {
+ if (streamId.getParameters().isEmpty()) {
return NoParamsStream.class.getSimpleName();
}
return streamId.getName() + "Stream";
}
-
+
/**
* Returns a native database events table name.
- *
+ *
* @param streamId Unique stream identifier.
- *
+ *
* @return Name that is configured in the {@link jakarta.persistence.Table} JPA annotation.
*/
public static String nativeEventsTableName(final StreamId streamId) {
// User defined ID
- if (streamId instanceof JpaStreamId) {
- final JpaStreamId jpaId = (JpaStreamId) streamId;
+ if (streamId instanceof JpaStreamId jpaId) {
return jpaId.getNativeTableName();
}
// Default ID
if (streamId.isProjection()) {
return camel2Underscore(streamId.getName());
}
- if (streamId.getParameters().size() == 0) {
+ if (streamId.getParameters().isEmpty()) {
return NoParamsEvent.NO_PARAMS_EVENTS_TABLE;
}
return camel2Underscore(streamId.getName()) + "_events";
}
-
+
/**
* Converts the given camel case name into a name with underscores.
- *
+ *
* @param name Name to convert.
- *
+ *
* @return Camel case replaced with underscores.
*/
public static String camel2Underscore(@Nullable final String name) {
@@ -90,6 +89,5 @@ public static String camel2Underscore(@Nullable final String name) {
return name.replaceAll("(.)(\\p{Upper})", "$1_$2").toLowerCase();
}
-
-
+
}
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/NativeSqlCondition.java b/jpa/src/main/java/org/fuin/esc/jpa/NativeSqlCondition.java
index 6685fea5..a34e2e0d 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/NativeSqlCondition.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/NativeSqlCondition.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -34,7 +34,7 @@ public final class NativeSqlCondition {
/**
* Constructor with all mandatory data.
- *
+ *
* @param column
* Name of the DB column.
* @param operator
@@ -48,7 +48,7 @@ public NativeSqlCondition(final String column, final String operator, final Obje
/**
* Constructor with all possible data.
- *
+ *
* @param table
* Optional table prefix.
* @param column
@@ -59,7 +59,7 @@ public NativeSqlCondition(final String column, final String operator, final Obje
* Value of the attribute.
*/
public NativeSqlCondition(final String table, final String column, final String operator,
- final Object value) {
+ final Object value) {
Contract.requireArgNotNull("column", column);
Contract.requireArgNotNull("operator", operator);
Contract.requireArgNotNull("value", value);
@@ -68,49 +68,49 @@ public NativeSqlCondition(final String table, final String column, final String
this.operator = operator;
this.value = value;
}
-
+
/**
* Returns the table name.
- *
+ *
* @return Optional table name or prefix.
*/
- public final String getTable() {
+ public String getTable() {
return table;
}
/**
* Returns the name of the table column.
- *
+ *
* @return Column name.
*/
- public final String getColumn() {
+ public String getColumn() {
return column;
}
-/**
+ /**
* Returns the operator for comparing the value.
- *
+ *
* @return Operator like '=' or '<'.
*/
- public final String getOperator() {
+ public String getOperator() {
return operator;
}
/**
* Returns the value to compare with.
- *
+ *
* @return Value.
*/
- public final Object getValue() {
+ public Object getValue() {
return value;
}
/**
* Returns the 'where' condition with a parameter.
- *
+ *
* @return Native SQL 'where' with column name as parameter.
*/
- public final String asWhereConditionWithParam() {
+ public String asWhereConditionWithParam() {
if (table == null) {
return column + operator + ":" + column;
}
@@ -118,7 +118,7 @@ public final String asWhereConditionWithParam() {
}
@Override
- public final String toString() {
+ public String toString() {
if (table == null) {
return column + operator + column;
}
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/NoParamsEvent.java b/jpa/src/main/java/org/fuin/esc/jpa/NoParamsEvent.java
index ceb94a9b..3bf13a3e 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/NoParamsEvent.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/NoParamsEvent.java
@@ -1,23 +1,27 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.jpa;
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.IdClass;
+import jakarta.persistence.Table;
import jakarta.validation.constraints.NotNull;
import org.fuin.esc.api.StreamId;
import org.fuin.objects4j.common.Contract;
@@ -55,7 +59,7 @@ protected NoParamsEvent() { //NOSONAR Ignore uninitialized fields
/**
* Constructor with all mandatory data.
- *
+ *
* @param streamId
* Unique identifier of the stream.
* @param version
@@ -64,7 +68,7 @@ protected NoParamsEvent() { //NOSONAR Ignore uninitialized fields
* Event to store.
*/
public NoParamsEvent(@NotNull final StreamId streamId, @NotNull final Long version,
- @NotNull final JpaEvent jpaEvent) {
+ @NotNull final JpaEvent jpaEvent) {
super(jpaEvent);
Contract.requireArgNotNull("streamId", streamId);
Contract.requireArgNotNull("version", version);
@@ -74,7 +78,7 @@ public NoParamsEvent(@NotNull final StreamId streamId, @NotNull final Long versi
/**
* Returns the name of the stream.
- *
+ *
* @return Unique identifier name of the stream.
*/
public String getStreamName() {
@@ -83,14 +87,13 @@ public String getStreamName() {
/**
* Returns the number of the stream.
- *
+ *
* @return Number that is unique in combination with the name.
*/
public Long getEventNumber() {
return eventNumber;
}
- // CHECKSTYLE:OFF Generated code
@Override
public int hashCode() {
@@ -121,16 +124,10 @@ public boolean equals(Object obj) {
return false;
}
if (eventNumber == null) {
- if (other.eventNumber != null) {
- return false;
- }
- } else if (!eventNumber.equals(other.eventNumber)) {
- return false;
- }
- return true;
+ return other.eventNumber == null;
+ } else return eventNumber.equals(other.eventNumber);
}
- // CHECKSTYLE:ON
@Override
public String toString() {
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/NoParamsEventPrimaryKey.java b/jpa/src/main/java/org/fuin/esc/jpa/NoParamsEventPrimaryKey.java
index 75eed2e4..7e76d6a7 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/NoParamsEventPrimaryKey.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/NoParamsEventPrimaryKey.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -43,7 +43,7 @@ public NoParamsEventPrimaryKey() {
/**
* Constructor with all required data.
- *
+ *
* @param streamId
* Unique stream identifier.
* @param eventNumber
@@ -59,27 +59,26 @@ public NoParamsEventPrimaryKey(@NotNull final StreamId streamId, @NotNull final
/**
* Returns the name of the stream.
- *
+ *
* @return Unique stream identifier name.
*/
@NotNull
- public final String getStreamName() {
+ public String getStreamName() {
return streamName;
}
/**
* Returns the number of the event within the stream.
- *
+ *
* @return Order of the event in the stream.
*/
@NotNull
- public final Long getEventNumber() {
+ public Long getEventNumber() {
return eventNumber;
}
- // CHECKSTYLE:OFF Generated code
@Override
- public final int hashCode() {
+ public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((streamName == null) ? 0 : streamName.hashCode());
@@ -88,7 +87,7 @@ public final int hashCode() {
}
@Override
- public final boolean equals(final Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj)
return true;
if (obj == null)
@@ -102,17 +101,13 @@ public final boolean equals(final Object obj) {
} else if (!streamName.equals(other.streamName))
return false;
if (eventNumber == null) {
- if (other.eventNumber != null)
- return false;
- } else if (!eventNumber.equals(other.eventNumber))
- return false;
- return true;
+ return other.eventNumber == null;
+ } else return eventNumber.equals(other.eventNumber);
}
- // CHECKSTYLE:ON
@Override
- public final String toString() {
+ public String toString() {
return streamName + "-" + eventNumber;
}
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/NoParamsStream.java b/jpa/src/main/java/org/fuin/esc/jpa/NoParamsStream.java
index 581cd547..bf2e1cc7 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/NoParamsStream.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/NoParamsStream.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -46,7 +46,7 @@ protected NoParamsStream() { //NOSONAR Ignore uninitialized fields
/**
* Constructor with mandatory data.
- *
+ *
* @param streamId
* Unique stream identifier.
*/
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/ProjectionJpaStreamId.java b/jpa/src/main/java/org/fuin/esc/jpa/ProjectionJpaStreamId.java
index 6b4ce93b..6958444b 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/ProjectionJpaStreamId.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/ProjectionJpaStreamId.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,9 +19,9 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
import org.fuin.objects4j.core.KeyValue;
+import javax.annotation.concurrent.Immutable;
import java.util.Collections;
import java.util.List;
@@ -34,12 +34,12 @@ public final class ProjectionJpaStreamId implements JpaStreamId {
private static final long serialVersionUID = 1L;
private final String entityName;
-
+
private final String nativeTableName;
/**
* Constructor with mandatory data.
- *
+ *
* @param entityName
* Unique entity name (Simple JPA entity class name).
* @param nativeTableName
@@ -53,47 +53,47 @@ public ProjectionJpaStreamId(@NotNull final String entityName, @NotNull final St
}
@Override
- public final String getName() {
+ public String getName() {
return entityName;
}
@Override
- public final boolean isProjection() {
+ public boolean isProjection() {
return true;
}
@Override
- public final String getEntityName() {
+ public String getEntityName() {
return entityName;
}
@Override
- public final String getNativeTableName() {
+ public String getNativeTableName() {
return nativeTableName;
}
-
+
@Override
- public final
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -29,7 +29,7 @@ public final class ReadableJpaEventStore extends AbstractJpaEventStore {
/**
* Constructor with all mandatory data.
- *
+ *
* @param em
* Entity manager.
* @param serRegistry
@@ -38,7 +38,7 @@ public final class ReadableJpaEventStore extends AbstractJpaEventStore {
* Registry used to locate deserializers.
*/
public ReadableJpaEventStore(@NotNull final EntityManager em,
- @NotNull final SerializerRegistry serRegistry, @NotNull final DeserializerRegistry desRegistry) {
+ @NotNull final SerializerRegistry serRegistry, @NotNull final DeserializerRegistry desRegistry) {
super(em, serRegistry, desRegistry);
}
diff --git a/jpa/src/main/java/org/fuin/esc/jpa/SimpleJpaStreamId.java b/jpa/src/main/java/org/fuin/esc/jpa/SimpleJpaStreamId.java
index dece151b..e94061d2 100644
--- a/jpa/src/main/java/org/fuin/esc/jpa/SimpleJpaStreamId.java
+++ b/jpa/src/main/java/org/fuin/esc/jpa/SimpleJpaStreamId.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,9 +19,9 @@
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
import org.fuin.objects4j.core.KeyValue;
+import javax.annotation.concurrent.Immutable;
import java.util.Collections;
import java.util.List;
@@ -34,12 +34,12 @@ public final class SimpleJpaStreamId implements JpaStreamId {
private static final long serialVersionUID = 1L;
private final String entityName;
-
+
private final String nativeTableName;
/**
* Constructor with mandatory data.
- *
+ *
* @param entityName
* Unique entity name (Simple JPA entity class name).
* @param nativeTableName
@@ -53,47 +53,47 @@ public SimpleJpaStreamId(@NotNull final String entityName, @NotNull final String
}
@Override
- public final String getName() {
+ public String getName() {
return entityName;
}
@Override
- public final boolean isProjection() {
+ public boolean isProjection() {
return false;
}
@Override
- public final String getEntityName() {
+ public String getEntityName() {
return entityName;
}
@Override
- public final String getNativeTableName() {
+ public String getNativeTableName() {
return nativeTableName;
}
-
+
@Override
- public final
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see http://www.gnu.org/licenses/.
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -25,7 +25,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF
+
public final class JpaDataTest extends AbstractPersistenceTest {
@Test
@@ -40,7 +40,7 @@ public void testGetter() {
// PREPARE
final TypeName typeName = new TypeName("AnyName");
final EnhancedMimeType mimeType = EnhancedMimeType.create("application", "xml");
- final byte[] raw = new byte[] { 1, 2, 3};
+ final byte[] raw = new byte[]{1, 2, 3};
final JpaData testee = new JpaData(typeName, mimeType, raw);
// TEST
@@ -51,4 +51,4 @@ public void testGetter() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/JpaEventStoreTest.java b/jpa/src/test/java/org/fuin/esc/jpa/JpaEventStoreTest.java
index 370b8f7c..bd2f7270 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/JpaEventStoreTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/JpaEventStoreTest.java
@@ -1,39 +1,59 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.jpa;
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import org.fuin.esc.api.*;
+import jakarta.json.bind.annotation.JsonbProperty;
+import jakarta.json.bind.config.PropertyVisibilityStrategy;
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.EventId;
+import org.fuin.esc.api.EventStore;
+import org.fuin.esc.api.ExpectedVersion;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.SerializedDataTypeRegistry;
+import org.fuin.esc.api.SimpleCommonEvent;
+import org.fuin.esc.api.SimpleSerializedDataTypeRegistry;
+import org.fuin.esc.api.SimpleSerializerDeserializerRegistry;
+import org.fuin.esc.api.SimpleStreamId;
+import org.fuin.esc.api.StreamEventsSlice;
+import org.fuin.esc.api.StreamId;
+import org.fuin.esc.api.StreamState;
+import org.fuin.esc.api.TypeName;
+import org.fuin.esc.jaxb.XmlDeSerializer;
import org.fuin.esc.jpa.examples.AggregateStreamId;
import org.fuin.esc.jpa.examples.VendorCreatedEvent;
import org.fuin.esc.jpa.examples.VendorStream;
-import org.fuin.esc.api.JsonDeSerializer;
-import org.fuin.esc.api.SerializedDataType;
-import org.fuin.esc.api.SimpleSerializerDeserializerRegistry;
-import org.fuin.esc.spi.XmlDeSerializer;
+import org.fuin.esc.jsonb.EscEvent;
+import org.fuin.esc.jsonb.EscEvents;
+import org.fuin.esc.jsonb.EscJsonbUtils;
+import org.fuin.esc.jsonb.EscMeta;
+import org.fuin.esc.jsonb.JsonbDeSerializer;
+import org.fuin.objects4j.common.Contract;
import org.junit.jupiter.api.Test;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
import java.util.UUID;
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF
+
public final class JpaEventStoreTest extends AbstractPersistenceTest {
@Test
@@ -46,7 +66,7 @@ public void testAppendSingleSuccess() throws Exception {
final SerializedDataType serDataType = new SerializedDataType(VendorCreatedEvent.TYPE);
registry.add(serDataType, xmlDeSer.getMimeType().getBaseType(), xmlDeSer);
- final JpaEventStore testee = new JpaEventStore(getEm(), new JpaIdStreamFactory() {
+ try (final JpaEventStore testee = new JpaEventStore(getEm(), new JpaIdStreamFactory() {
@Override
public JpaStream createStream(final StreamId streamId) {
final String vendorId = streamId.getSingleParamValue();
@@ -57,9 +77,9 @@ public JpaStream createStream(final StreamId streamId) {
public boolean containsType(final StreamId streamId) {
return true;
}
- }, registry, registry);
- testee.open();
- try {
+ }, registry, registry)) {
+ testee.open();
+
final String vendorId = UUID.randomUUID().toString();
final VendorCreatedEvent vendorCreatedEvent = new VendorCreatedEvent(vendorId);
final AggregateStreamId streamId = new AggregateStreamId("Vendor", "vendorId", vendorId);
@@ -70,8 +90,6 @@ public boolean containsType(final StreamId streamId) {
// TEST
execute(testee, streamId, eventData, eventId);
- } finally {
- testee.close();
}
}
@@ -80,54 +98,53 @@ public boolean containsType(final StreamId streamId) {
public void testNoParamsStreams() throws Exception {
// PREPARE
- final String EVENT_A = "EventA";
- final String EVENT_B = "EventB";
- final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
- final JsonDeSerializer jsonDeSer = new JsonDeSerializer();
-
- final SerializedDataType serDataTypeA = new SerializedDataType(EVENT_A);
- registry.add(serDataTypeA, "application/json", jsonDeSer);
- final JsonObject eventA = Json.createObjectBuilder().add("a", "John Doe").build();
- final SimpleStreamId streamA = new SimpleStreamId("StreamA");
- final EventId eventIdA = new EventId("84fe8213-ac1b-4cda-8321-703c2e448052");
- final TypeName typeA = new TypeName(EVENT_A);
- final CommonEvent commonEventA = new SimpleCommonEvent(eventIdA, typeA, eventA);
-
- final SerializedDataType serDataTypeB = new SerializedDataType(EVENT_B);
- registry.add(serDataTypeB, "application/json", jsonDeSer);
- final JsonObject eventB = Json.createObjectBuilder().add("b", "Jane Doe").build();
- final SimpleStreamId streamB = new SimpleStreamId("StreamB");
- final EventId eventIdB = new EventId("23962a5e-da10-402f-8560-340745b09b2c");
- final TypeName typeB = new TypeName(EVENT_B);
- final CommonEvent commonEventB = new SimpleCommonEvent(eventIdB, typeB, eventB);
-
- final JpaEventStore testee = new JpaEventStore(getEm(), new JpaIdStreamFactory() {
- @Override
- public JpaStream createStream(final StreamId streamId) {
- return new NoParamsStream(streamId);
- }
- @Override
- public boolean containsType(final StreamId streamId) {
- return true;
- }
- }, registry, registry);
- testee.open();
- try {
+ final SimpleSerializedDataTypeRegistry typeRegistry = new SimpleSerializedDataTypeRegistry();
+ typeRegistry.add(EventA.SER_TYPE, EventA.class);
+ typeRegistry.add(EventB.SER_TYPE, EventB.class);
- // TEST
- execute(testee, streamA, commonEventA, eventIdA);
- execute(testee, streamB, commonEventB, eventIdB);
+ try (final JsonbDeSerializer jsonbDeSer = createJsonbDeSerializer()) {
+ initSerDeserializerRegistry(typeRegistry, jsonbDeSer);
+
+ final SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
+ registry.add(EventA.SER_TYPE, "application/json", jsonbDeSer);
+ registry.add(EventB.SER_TYPE, "application/json", jsonbDeSer);
+
+ final EventA eventA = new EventA("John Doe");
+ final SimpleStreamId streamA = new SimpleStreamId("StreamA");
+ final EventId eventIdA = new EventId("84fe8213-ac1b-4cda-8321-703c2e448052");
+ final CommonEvent commonEventA = new SimpleCommonEvent(eventIdA, EventA.TYPE, eventA);
+
+ final EventB eventB = new EventB("Jane Doe");
+ final SimpleStreamId streamB = new SimpleStreamId("StreamB");
+ final EventId eventIdB = new EventId("23962a5e-da10-402f-8560-340745b09b2c");
+ final CommonEvent commonEventB = new SimpleCommonEvent(eventIdB, EventB.TYPE, eventB);
- } finally {
- testee.close();
+ try (final JpaEventStore testee = new JpaEventStore(getEm(), new JpaIdStreamFactory() {
+ @Override
+ public JpaStream createStream(final StreamId streamId) {
+ return new NoParamsStream(streamId);
+ }
+
+ @Override
+ public boolean containsType(final StreamId streamId) {
+ return true;
+ }
+ }, registry, registry)) {
+ testee.open();
+
+ // TEST
+ execute(testee, streamA, commonEventA, eventIdA);
+ execute(testee, streamB, commonEventB, eventIdB);
+
+ }
}
}
private static void execute(final EventStore eventStore, final StreamId streamId,
- final CommonEvent commonEvent, final EventId eventId) throws Exception {
+ final CommonEvent commonEvent, final EventId eventId) throws Exception {
beginTransaction();
try {
@@ -158,5 +175,93 @@ private static void execute(final EventStore eventStore, final StreamId streamId
}
}
+
+ public static class EventA {
+
+ public static final String EVENT = "EventA";
+
+ public static final TypeName TYPE = new TypeName(EVENT);
+
+ public static final SerializedDataType SER_TYPE = new SerializedDataType(EVENT);
+
+ @JsonbProperty
+ private String a;
+
+ protected EventA() {
+ }
+
+ public EventA(String a) {
+ this.a = a;
+ }
+
+ }
+
+ public static class EventB {
+
+ public static final String EVENT = "EventB";
+
+ public static final TypeName TYPE = new TypeName(EVENT);
+
+ public static final SerializedDataType SER_TYPE = new SerializedDataType(EVENT);
+
+ @JsonbProperty
+ private String b;
+
+ protected EventB() {
+ }
+
+ public EventB(String b) {
+ this.b = b;
+ }
+
+ }
+
+ public static class FieldAccessStrategy implements PropertyVisibilityStrategy {
+
+ public boolean isVisible(Field field) {
+ return true;
+ }
+
+ public boolean isVisible(Method method) {
+ return false;
+ }
+ }
+
+ private static JsonbDeSerializer createJsonbDeSerializer() {
+ return JsonbDeSerializer.builder()
+ .withSerializers(EscJsonbUtils.createEscJsonbSerializers())
+ .withDeserializers(EscJsonbUtils.createEscJsonbDeserializers())
+ .withPropertyVisibilityStrategy(new FieldAccessStrategy())
+ .withEncoding(StandardCharsets.UTF_8)
+ .build();
+ }
+
+ /**
+ * Creates a registry that connects the type with the appropriate serializer and de-serializer.
+ *
+ * @param typeRegistry Type registry (Mapping from type name to class).
+ * @param jsonbDeSer JSON-B serializer/deserializer to use.
+ */
+ public static void initSerDeserializerRegistry(@NotNull SerializedDataTypeRegistry typeRegistry,
+ @NotNull JsonbDeSerializer jsonbDeSer) {
+
+ Contract.requireArgNotNull("typeRegistry", typeRegistry);
+ Contract.requireArgNotNull("jsonbDeSer", jsonbDeSer);
+
+ SimpleSerializerDeserializerRegistry registry = new SimpleSerializerDeserializerRegistry();
+
+ // Base types always needed
+ registry.add(EscEvents.SER_TYPE, jsonbDeSer.getMimeType().getBaseType(), jsonbDeSer);
+ registry.add(EscEvent.SER_TYPE, jsonbDeSer.getMimeType().getBaseType(), jsonbDeSer);
+ registry.add(EscMeta.SER_TYPE, jsonbDeSer.getMimeType().getBaseType(), jsonbDeSer);
+
+ // User defined types
+ registry.add(EventA.SER_TYPE, jsonbDeSer.getMimeType().getBaseType(), jsonbDeSer);
+ registry.add(EventB.SER_TYPE, jsonbDeSer.getMimeType().getBaseType(), jsonbDeSer);
+
+ jsonbDeSer.init(typeRegistry, registry, registry);
+
+ }
+
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/JpaEventTest.java b/jpa/src/test/java/org/fuin/esc/jpa/JpaEventTest.java
index 460579d4..133e5c7c 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/JpaEventTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/JpaEventTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -24,11 +24,12 @@
import org.junit.jupiter.api.Test;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF
+
public final class JpaEventTest extends AbstractPersistenceTest {
@Test
@@ -70,12 +71,11 @@ public void testPersist() {
}
private JpaEvent create(final EventId eventId, final TypeName type, final int version, final String xml) {
- final Charset encoding = Charset.forName("utf-8");
+ final Charset encoding = StandardCharsets.UTF_8;
final EnhancedMimeType mimeType = EnhancedMimeType.create("application", "xml", encoding, ""
+ version, new HashMap
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -26,7 +26,6 @@
/**
* Tests the {@link JpaProjection} class.
*/
-// CHECKSTYLE:OFF Test
public class JpaProjectionTest {
@Test
@@ -68,4 +67,4 @@ public void testConstructorName() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/JpaUtilsTest.java b/jpa/src/test/java/org/fuin/esc/jpa/JpaUtilsTest.java
index 08eaa85d..6bb2f1c4 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/JpaUtilsTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/JpaUtilsTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -27,10 +27,10 @@
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF
+
public final class JpaUtilsTest {
-
+
@Test
public void testCamelCaseToUnderscore() {
@@ -77,7 +77,7 @@ public void testNativeEventsTableNameProjection() {
assertThat(result).isEqualTo("my_own");
}
-
+
@Test
public void testNativeEventsTableNameWithArgs() {
@@ -108,7 +108,7 @@ public void testNativeEventsTableNameNoArgs() {
assertThat(result).isEqualTo(NoParamsEvent.NO_PARAMS_EVENTS_TABLE);
}
-
+
@Test
public void testStreamEntityNameJpaStreamId() {
@@ -139,7 +139,7 @@ public void testStreamEntityNameProjection() {
assertThat(result).isEqualTo(entityName);
}
-
+
@Test
public void testStreamEntityNameWithArgs() {
@@ -169,6 +169,6 @@ public void testStreamEntityNameNoArgs() {
assertThat(result).isEqualTo(NoParamsStream.class.getSimpleName());
}
-
+
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/NativeSqlConditionTest.java b/jpa/src/test/java/org/fuin/esc/jpa/NativeSqlConditionTest.java
index d31ce9d7..8767493e 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/NativeSqlConditionTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/NativeSqlConditionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -21,7 +21,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF
+
public final class NativeSqlConditionTest {
@Test
@@ -55,4 +55,4 @@ public void testAsWhereConditionWithParam() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/NoParamsEventPrimaryKeyTest.java b/jpa/src/test/java/org/fuin/esc/jpa/NoParamsEventPrimaryKeyTest.java
index 2dd071ab..e91dc13b 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/NoParamsEventPrimaryKeyTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/NoParamsEventPrimaryKeyTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -25,7 +25,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF
+
public final class NoParamsEventPrimaryKeyTest {
@Test
@@ -48,4 +48,4 @@ public void testGetter() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/NoParamsEventTest.java b/jpa/src/test/java/org/fuin/esc/jpa/NoParamsEventTest.java
index befac98f..6d451a83 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/NoParamsEventTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/NoParamsEventTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -26,33 +26,33 @@
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF
+
public final class NoParamsEventTest {
- @Test
- public void testEqualsHashCode() {
- EqualsVerifier.forClass(NoParamsEvent.class)
- .withIgnoredAnnotations(Entity.class, Id.class, Embeddable.class, MappedSuperclass.class,
- Transient.class)
- .suppress(Warning.NONFINAL_FIELDS, Warning.STRICT_INHERITANCE, Warning.ALL_FIELDS_SHOULD_BE_USED)
- .verify();
- }
+ @Test
+ public void testEqualsHashCode() {
+ EqualsVerifier.forClass(NoParamsEvent.class)
+ .withIgnoredAnnotations(Entity.class, Id.class, Embeddable.class, MappedSuperclass.class,
+ Transient.class)
+ .suppress(Warning.NONFINAL_FIELDS, Warning.STRICT_INHERITANCE, Warning.ALL_FIELDS_SHOULD_BE_USED)
+ .verify();
+ }
- @Test
- public void testGetter() {
+ @Test
+ public void testGetter() {
- // PREPARE
- final StreamId streamId = new SimpleStreamId("Abc");
- final Long eventNumber = 3L;
- final JpaEvent eventEntry = new JpaEvent();
- final NoParamsEvent testee = new NoParamsEvent(streamId, eventNumber, eventEntry);
+ // PREPARE
+ final StreamId streamId = new SimpleStreamId("Abc");
+ final Long eventNumber = 3L;
+ final JpaEvent eventEntry = new JpaEvent();
+ final NoParamsEvent testee = new NoParamsEvent(streamId, eventNumber, eventEntry);
- // TEST
- assertThat(testee.getStreamName()).isEqualTo(streamId.getName());
- assertThat(testee.getEventNumber()).isEqualTo(eventNumber);
- assertThat(testee.getEvent()).isEqualTo(eventEntry);
+ // TEST
+ assertThat(testee.getStreamName()).isEqualTo(streamId.getName());
+ assertThat(testee.getEventNumber()).isEqualTo(eventNumber);
+ assertThat(testee.getEvent()).isEqualTo(eventEntry);
- }
+ }
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/NoParamsStreamTest.java b/jpa/src/test/java/org/fuin/esc/jpa/NoParamsStreamTest.java
index 358d9c3c..3c33835e 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/NoParamsStreamTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/NoParamsStreamTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -24,41 +24,41 @@
import static org.assertj.core.api.Assertions.assertThat;
-// CHECKSTYLE:OFF
+
public final class NoParamsStreamTest {
-
+
@Test
public void testCreate() {
// PREPARE
final StreamId streamId = new SimpleStreamId("AnyName");
-
+
// TEST
final NoParamsStream testee = new NoParamsStream(streamId);
-
+
// VERIFY
assertThat(testee.toString()).isEqualTo(streamId.toString());
assertThat(testee.getState()).isEqualTo(StreamState.ACTIVE);
assertThat(testee.getVersion()).isEqualTo(-1);
assertThat(testee.isDeleted()).isFalse();
-
+
}
-
+
@Test
public void testSoftDelete() {
// PREPARE
final StreamId streamId = new SimpleStreamId("AnyName");
final NoParamsStream testee = new NoParamsStream(streamId);
-
+
// TEST
testee.delete(false);
-
+
// VERIFY
assertThat(testee.getState()).isEqualTo(StreamState.SOFT_DELETED);
assertThat(testee.isDeleted()).isTrue();
-
+
}
@Test
@@ -67,14 +67,14 @@ public void testHardDelete() {
// PREPARE
final StreamId streamId = new SimpleStreamId("AnyName");
final NoParamsStream testee = new NoParamsStream(streamId);
-
+
// TEST
testee.delete(true);
-
+
// VERIFY
assertThat(testee.getState()).isEqualTo(StreamState.HARD_DELETED);
assertThat(testee.isDeleted()).isTrue();
-
+
}
@Test
@@ -83,14 +83,14 @@ public void testIncVersion() {
// PREPARE
final StreamId streamId = new SimpleStreamId("AnyName");
final NoParamsStream testee = new NoParamsStream(streamId);
-
+
// TEST & VERIFY
assertThat(testee.incVersion()).isEqualTo(0);
assertThat(testee.getVersion()).isEqualTo(0);
-
+
assertThat(testee.incVersion()).isEqualTo(1);
assertThat(testee.getVersion()).isEqualTo(1);
-
+
}
@Test
@@ -101,16 +101,16 @@ public void testCreateEvent() {
final NoParamsStream testee = new NoParamsStream(streamId);
final JpaEvent eventEntry = new JpaEvent();
final long version = testee.getVersion();
-
+
// TEST
final JpaStreamEvent result = testee.createEvent(streamId, eventEntry);
-
+
// VERIFY
assertThat(result).isNotNull();
assertThat(result.getEvent()).isSameAs(eventEntry);
assertThat(testee.getVersion()).isEqualTo(version + 1);
-
+
}
-
+
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/ProjectionJpaStreamIdTest.java b/jpa/src/test/java/org/fuin/esc/jpa/ProjectionJpaStreamIdTest.java
index e6d1d49e..daf042f2 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/ProjectionJpaStreamIdTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/ProjectionJpaStreamIdTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -29,7 +29,6 @@
/**
* Tests the {@link ProjectionJpaStreamId} class.
*/
-// CHECKSTYLE:OFF Test
public class ProjectionJpaStreamIdTest {
private static final String NAME = "MyProjection";
@@ -70,4 +69,4 @@ public void testGetSingleParamValue() {
}).isInstanceOf(UnsupportedOperationException.class);
}
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/ReadableJpaEventStoreTest.java b/jpa/src/test/java/org/fuin/esc/jpa/ReadableJpaEventStoreTest.java
index db466345..56211309 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/ReadableJpaEventStoreTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/ReadableJpaEventStoreTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -19,9 +19,8 @@
import org.fuin.utils4j.TestOmitted;
-// CHECKSTYLE:OFF Test
@TestOmitted("Tested with JpaEventStoreTest and 'esc-test' project")
public class ReadableJpaEventStoreTest { //NOSONAR
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/SimpleJpaStreamIdTest.java b/jpa/src/test/java/org/fuin/esc/jpa/SimpleJpaStreamIdTest.java
index 5004c552..da17a449 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/SimpleJpaStreamIdTest.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/SimpleJpaStreamIdTest.java
@@ -1,17 +1,17 @@
/**
* Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -29,7 +29,6 @@
/**
* Tests the {@link SimpleJpaStreamId} class.
*/
-// CHECKSTYLE:OFF Test
public class SimpleJpaStreamIdTest {
private static final String NAME = "MyStream1";
@@ -69,4 +68,4 @@ public void testGetSingleParamValue() {
}).isInstanceOf(UnsupportedOperationException.class);
}
}
-// CHECKSTYLE:ON
+
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/examples/AggregateStreamId.java b/jpa/src/test/java/org/fuin/esc/jpa/examples/AggregateStreamId.java
index e456d66d..73620ce5 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/examples/AggregateStreamId.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/examples/AggregateStreamId.java
@@ -1,26 +1,30 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.jpa.examples;
+import com.tngtech.archunit.junit.ArchIgnore;
import org.fuin.esc.api.StreamId;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
+
import org.fuin.objects4j.core.KeyValue;
+import java.io.Serial;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -28,22 +32,24 @@
/**
* Unique name of an aggregate stream.
*/
+@ArchIgnore
@Immutable
public final class AggregateStreamId implements StreamId {
+ @Serial
private static final long serialVersionUID = 1000L;
- private String type;
+ private final String type;
- private String paramName;
+ private final String paramName;
- private String aggregateId;
+ private final String aggregateId;
private transient List
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.jpa.examples;
-import jakarta.validation.constraints.NotNull;
+import com.tngtech.archunit.junit.ArchIgnore;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.validation.constraints.NotNull;
/**
* A vendor entity was created.
*/
+@ArchIgnore
@XmlRootElement(name = "vendor-created-event")
public final class VendorCreatedEvent {
@@ -42,7 +44,7 @@ protected VendorCreatedEvent() {
/**
* Constructor with all mandatory data.
- *
+ *
* @param vendorId
* Vendor ID.
*/
@@ -53,7 +55,7 @@ public VendorCreatedEvent(@NotNull final String vendorId) {
/**
* Returns the vendor ID.
- *
+ *
* @return Unique vendor identifier.
*/
@NotNull
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorEvent.java b/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorEvent.java
index 421f3814..b530771c 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorEvent.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorEvent.java
@@ -1,22 +1,23 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.jpa.examples;
+import com.tngtech.archunit.junit.ArchIgnore;
import jakarta.persistence.*;
import jakarta.validation.constraints.NotNull;
import org.fuin.esc.jpa.JpaEvent;
@@ -26,6 +27,7 @@
/**
* Database table for an event of the vendor aggregate.
*/
+@ArchIgnore
@Table(name = "VENDOR_EVENTS")
@Entity
@IdClass(VendorEventPrimaryKey.class)
@@ -50,7 +52,7 @@ protected VendorEvent() {
/**
* Constructor with all mandatory data.
- *
+ *
* @param vendorId
* Unique vendor identifier.
* @param version
@@ -59,7 +61,7 @@ protected VendorEvent() {
* Event entry to connect.
*/
public VendorEvent(@NotNull final String vendorId,
- @NotNull final Long version, final JpaEvent eventEntry) {
+ @NotNull final Long version, final JpaEvent eventEntry) {
super(eventEntry);
Contract.requireArgNotNull("vendorId", vendorId);
Contract.requireArgNotNull("version", version);
@@ -69,7 +71,7 @@ public VendorEvent(@NotNull final String vendorId,
/**
* Returns the unique vendor identifier.
- *
+ *
* @return Vendor identifier.
*/
public final String getVendorId() {
@@ -78,14 +80,13 @@ public final String getVendorId() {
/**
* Returns the number of the stream.
- *
+ *
* @return Number that is unique in combination with the name.
*/
public final Long getEventNumber() {
return eventNumber;
}
- // CHECKSTYLE:OFF Generated code
@Override
public final int hashCode() {
final int prime = 31;
@@ -119,7 +120,6 @@ public final boolean equals(final Object obj) {
return true;
}
- // CHECKSTYLE:ON
@Override
public final String toString() {
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorEventPrimaryKey.java b/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorEventPrimaryKey.java
index 50ac801a..c940622e 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorEventPrimaryKey.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorEventPrimaryKey.java
@@ -1,22 +1,23 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.jpa.examples;
+import com.tngtech.archunit.junit.ArchIgnore;
import jakarta.validation.constraints.NotNull;
import org.fuin.objects4j.common.Contract;
@@ -25,6 +26,7 @@
/**
* Primary key for the vendor event table.
*/
+@ArchIgnore
public class VendorEventPrimaryKey implements Serializable {
private static final long serialVersionUID = 1000L;
@@ -43,14 +45,14 @@ public VendorEventPrimaryKey() {
/**
* Constructor with all required data.
- *
+ *
* @param vendorId
* Unique name.
* @param eventNumber
* Number of the event within the stream.
*/
public VendorEventPrimaryKey(@NotNull final String vendorId,
- @NotNull final Long eventNumber) {
+ @NotNull final Long eventNumber) {
super();
Contract.requireArgNotNull("vendorId", vendorId);
Contract.requireArgNotNull("nueventNumbermber", eventNumber);
@@ -60,7 +62,7 @@ public VendorEventPrimaryKey(@NotNull final String vendorId,
/**
* Returns the vendor ID.
- *
+ *
* @return Unique vendor identifier.
*/
@NotNull
@@ -70,7 +72,7 @@ public final String getVendorId() {
/**
* Returns the number of the event within the stream.
- *
+ *
* @return Order of the event in the stream.
*/
@NotNull
@@ -78,7 +80,6 @@ public final Long getEventNumber() {
return eventNumber;
}
- // CHECKSTYLE:OFF Generated code
@Override
public final int hashCode() {
final int prime = 31;
@@ -112,7 +113,6 @@ public final boolean equals(final Object obj) {
return true;
}
- // CHECKSTYLE:ON
@Override
public final String toString() {
diff --git a/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorStream.java b/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorStream.java
index 6fd47000..482861f9 100644
--- a/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorStream.java
+++ b/jpa/src/test/java/org/fuin/esc/jpa/examples/VendorStream.java
@@ -1,22 +1,23 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.jpa.examples;
+import com.tngtech.archunit.junit.ArchIgnore;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
@@ -33,6 +34,7 @@
*/
@Table(name = "VENDOR_STREAMS")
@Entity
+@ArchIgnore
public class VendorStream extends JpaStream {
@Id
@@ -49,7 +51,7 @@ protected VendorStream() {
/**
* Constructor with mandatory data.
- *
+ *
* @param vendorId
* Unique vendor identifier.
*/
@@ -61,7 +63,7 @@ public VendorStream(@NotNull final String vendorId) {
/**
* Returns the unique vendor identifier as string.
- *
+ *
* @return Vendor identifier.
*/
public final String getVendorId() {
diff --git a/jpa/src/test/resources/META-INF/persistence.xml b/jpa/src/test/resources/META-INF/persistence.xml
index 55cdd5b4..a7c76cce 100644
--- a/jpa/src/test/resources/META-INF/persistence.xml
+++ b/jpa/src/test/resources/META-INF/persistence.xml
@@ -1,53 +1,53 @@
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.HasSerializedDataTypeConstant;
+import org.fuin.esc.api.IBase64Data;
+import org.fuin.objects4j.common.Contract;
+
+import java.util.Base64;
+
+/**
+ * Contains some Base64 encoded data.
+ */
+@HasSerializedDataTypeConstant
+public final class Base64Data implements IBase64Data {
+
+ private String base64Str;
+
+ private byte[] binaryData;
+
+ /**
+ * Default constructor for JAXB.
+ */
+ protected Base64Data() {
+ super();
+ }
+
+ /**
+ * Constructor with Base64 encoded string.
+ *
+ * @param base64Str Base64 encoded data.
+ */
+ public Base64Data(@NotNull final String base64Str) {
+ super();
+ Contract.requireArgNotNull("base64Str", base64Str);
+ this.base64Str = base64Str;
+ this.binaryData = Base64.getDecoder().decode(base64Str);
+ }
+
+ /**
+ * Constructor with binary data that will be Base64 encoded.
+ *
+ * @param binaryData Binary data.
+ */
+ public Base64Data(@NotNull final byte[] binaryData) {
+ super();
+ Contract.requireArgNotNull("binaryData", binaryData);
+ this.base64Str = Base64.getEncoder().encodeToString(binaryData);
+ this.binaryData = binaryData;
+ }
+
+ /**
+ * Returns the Base64 encoded data.
+ *
+ * @return Base64 string.
+ */
+ public String getEncoded() {
+ return base64Str;
+ }
+
+ /**
+ * Returns the decoded data.
+ *
+ * @return Binary data.
+ */
+ public byte[] getDecoded() {
+ if (binaryData == null) {
+ binaryData = Base64.getDecoder().decode(base64Str);
+ }
+ return binaryData;
+ }
+
+}
diff --git a/jsonb/src/main/java/org/fuin/esc/jsonb/BaseTypeFactory.java b/jsonb/src/main/java/org/fuin/esc/jsonb/BaseTypeFactory.java
new file mode 100644
index 00000000..ad6f5aaf
--- /dev/null
+++ b/jsonb/src/main/java/org/fuin/esc/jsonb/BaseTypeFactory.java
@@ -0,0 +1,29 @@
+package org.fuin.esc.jsonb;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.IBase64Data;
+import org.fuin.esc.api.IBaseTypeFactory;
+import org.fuin.esc.api.IEscMeta;
+
+/**
+ * Creates necessary implementations in the JAX-B module.
+ */
+public final class BaseTypeFactory implements IBaseTypeFactory {
+
+ @Override
+ public IBase64Data createBase64Data(@NotNull byte[] binaryData) {
+ return new Base64Data(binaryData);
+ }
+
+ @Override
+ public IEscMeta createEscMeta(@NotNull String dataType,
+ @NotNull EnhancedMimeType dataContentType,
+ @Nullable String metaType,
+ @Nullable EnhancedMimeType metaContentType,
+ @Nullable Object meta) {
+ return new EscMeta(dataType, dataContentType, metaType, metaContentType, meta);
+ }
+
+}
diff --git a/jsonb/src/main/java/org/fuin/esc/jsonb/Data.java b/jsonb/src/main/java/org/fuin/esc/jsonb/Data.java
new file mode 100644
index 00000000..888318ee
--- /dev/null
+++ b/jsonb/src/main/java/org/fuin/esc/jsonb/Data.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.IData;
+import org.fuin.objects4j.common.Contract;
+import org.fuin.objects4j.common.ValueObject;
+
+import javax.annotation.concurrent.Immutable;
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * Helper class that allows sending the data of an event as XML directly to the
+ * event store. Represents a block of data in a serialized form. This class
+ * might be useful for tests. It's not used in the 'esc-spi' code itself
+ */
+@Immutable
+public final class Data implements IData, ValueObject, Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1000L;
+
+ /**
+ * Unique type of the data.
+ */
+ @NotNull
+ private String type;
+
+ /**
+ * Internet Media Type that classifies the raw event data.
+ */
+ @NotNull
+ private String mimeType;
+
+ /**
+ * Raw event data in format defined by the mime type and encoding.
+ */
+ @NotNull
+ private String content;
+
+ /**
+ * Protected constructor for deserialization.
+ */
+ protected Data() { //NOSONAR Ignore uninitialized fields
+ super();
+ }
+
+ /**
+ * Creates a data object.
+ *
+ * @param type Unique identifier for the type of data.
+ * @param mimeType Internet Media Type with encoding and version that classifies
+ * the data.
+ * @param content Content.
+ */
+ public Data(@NotNull final String type,
+ @NotNull final EnhancedMimeType mimeType,
+ @NotNull final String content) {
+ super();
+
+ Contract.requireArgNotNull("type", type);
+ Contract.requireArgNotNull("mimeType", mimeType);
+ Contract.requireArgNotNull("content", content);
+
+ this.type = type;
+ this.mimeType = mimeType.toString();
+ this.content = content;
+
+ }
+
+ /**
+ * Returns the unique identifier for the type of data.
+ *
+ * @return Unique and never changing type name.
+ */
+ @NotNull
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Returns the Internet Media Type that classifies the data.
+ *
+ * @return Mime type.
+ */
+ @NotNull
+ public EnhancedMimeType getMimeType() {
+ return EnhancedMimeType.create(mimeType);
+ }
+
+ /**
+ * Returns the raw data block.
+ *
+ * @return Raw data.
+ */
+ @NotNull
+ public String getContent() {
+ return content;
+ }
+
+ @Override
+ public String toString() {
+ return "Data{" +
+ "type='" + type + '\'' +
+ ", mimeType='" + mimeType + '\'' +
+ ", content='" + content + '\'' +
+ '}';
+ }
+
+}
diff --git a/jsonb/src/main/java/org/fuin/esc/jsonb/DataWrapper.java b/jsonb/src/main/java/org/fuin/esc/jsonb/DataWrapper.java
new file mode 100644
index 00000000..50dc3dbf
--- /dev/null
+++ b/jsonb/src/main/java/org/fuin/esc/jsonb/DataWrapper.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.IDataWrapper;
+import org.fuin.objects4j.common.Contract;
+
+/**
+ * A structure that wraps another object of different types.
+ */
+public final class DataWrapper implements IDataWrapper {
+
+ private Object obj;
+
+ /**
+ * Default constructor for JAXB.
+ */
+ protected DataWrapper() {
+ super();
+ }
+
+ /**
+ * Constructor with mandatory data.
+ *
+ * @param obj
+ * Object to wrap.
+ */
+ public DataWrapper(@NotNull final Object obj) {
+ super();
+ Contract.requireArgNotNull("obj", obj);
+ this.obj = obj;
+ }
+
+ /**
+ * Returns the wrapped object.
+ *
+ * @return Inner object.
+ */
+ @NotNull
+ public Object getObj() {
+ return obj;
+ }
+
+}
diff --git a/jsonb/src/main/java/org/fuin/esc/jsonb/EscEvent.java b/jsonb/src/main/java/org/fuin/esc/jsonb/EscEvent.java
new file mode 100644
index 00000000..852d2492
--- /dev/null
+++ b/jsonb/src/main/java/org/fuin/esc/jsonb/EscEvent.java
@@ -0,0 +1,162 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.HasSerializedDataTypeConstant;
+import org.fuin.esc.api.IDataWrapper;
+import org.fuin.esc.api.IEscEvent;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.TypeName;
+import org.fuin.objects4j.common.Contract;
+
+import java.util.UUID;
+
+/**
+ * An event structure.
+ */
+@HasSerializedDataTypeConstant
+public final class EscEvent implements IEscEvent {
+
+ /** Unique name of the type. */
+ public static final TypeName TYPE = new TypeName(EL_ROOT_NAME);
+
+ /** Unique name of the serialized type. */
+ public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
+
+ private String eventId;
+
+ private String eventType;
+
+ private DataWrapper data;
+
+ private DataWrapper meta;
+
+ /**
+ * Default constructor for JAXB.
+ */
+ protected EscEvent() {
+ super();
+ }
+
+
+ /**
+ * Constructor with all data.
+ *
+ * @param eventId
+ * Unique event identifier.
+ * @param eventType
+ * Unique type name of the event.
+ * @param data
+ * The data.
+ * @param meta
+ * The meta data, if available.
+ */
+ public EscEvent(@NotNull final UUID eventId,
+ @NotNull final String eventType,
+ @NotNull final DataWrapper data,
+ @NotNull final DataWrapper meta) {
+ super();
+ Contract.requireArgNotNull("eventId", eventId);
+ Contract.requireArgNotNull("eventType", eventType);
+ Contract.requireArgNotNull("data", data);
+ Contract.requireArgNotNull("meta", meta);
+ this.eventId = eventId.toString();
+ this.eventType = eventType;
+ this.data = data;
+ this.meta = meta;
+ }
+
+ /**
+ * Returns the unique event identifier.
+ *
+ * @return Event ID.
+ */
+ public String getEventId() {
+ return eventId;
+ }
+
+ /**
+ * Sets the unique event identifier.
+ *
+ * @param eventId Event ID.
+ */
+ void setEventId(@NotNull final String eventId) {
+ Contract.requireArgNotNull("eventId", eventId);
+ this.eventId = eventId;
+ }
+
+ /**
+ * Returns the unique type name of the event.
+ *
+ * @return Event type.
+ */
+ public String getEventType() {
+ return eventType;
+ }
+
+ /**
+ * Sets the unique type name of the event.
+ *
+ * @param eventType Event type.
+ */
+ void setEventType(@NotNull final String eventType) {
+ Contract.requireArgNotNull("eventType", eventType);
+ this.eventType = eventType;
+ }
+
+ /**
+ * Returns the data.
+ *
+ * @return Data.
+ */
+ public IDataWrapper getData() {
+ return data;
+ }
+
+ /**
+ * Sets the data.
+ *
+ * @param data Data.
+ */
+ void setData(DataWrapper data) {
+ Contract.requireArgNotNull("data", data);
+ this.data = data;
+ }
+
+ /**
+ * Returns the metadata.
+ *
+ * @return Metadata.
+ */
+ @NotNull
+ public IDataWrapper getMeta() {
+ return meta;
+ }
+
+ /**
+ * Sets the metadata.
+ *
+ * @param meta Metadata.
+ */
+ void setMeta(@NotNull final DataWrapper meta) {
+ Contract.requireArgNotNull("meta", meta);
+ this.meta = meta;
+ }
+
+}
diff --git a/jsonb/src/main/java/org/fuin/esc/jsonb/EscEventJsonbSerializerDeserializer.java b/jsonb/src/main/java/org/fuin/esc/jsonb/EscEventJsonbSerializerDeserializer.java
new file mode 100644
index 00000000..0ab6d6e7
--- /dev/null
+++ b/jsonb/src/main/java/org/fuin/esc/jsonb/EscEventJsonbSerializerDeserializer.java
@@ -0,0 +1,102 @@
+package org.fuin.esc.jsonb;
+
+import jakarta.json.JsonObject;
+import jakarta.json.bind.serializer.DeserializationContext;
+import jakarta.json.bind.serializer.JsonbDeserializer;
+import jakarta.json.bind.serializer.JsonbSerializer;
+import jakarta.json.bind.serializer.SerializationContext;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonParser;
+import org.fuin.esc.api.Deserializer;
+import org.fuin.esc.api.DeserializerRegistry;
+import org.fuin.esc.api.DeserializerRegistryRequired;
+import org.fuin.esc.api.SerializedDataType;
+
+import java.lang.reflect.Type;
+
+/**
+ * Adapter to use for JSON-B.
+ */
+public final class EscEventJsonbSerializerDeserializer implements JsonbSerializer
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.HasSerializedDataTypeConstant;
+import org.fuin.esc.api.IEscEvent;
+import org.fuin.esc.api.IEscEvents;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.TypeName;
+import org.fuin.objects4j.common.Contract;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A list of events.
+ */
+@HasSerializedDataTypeConstant
+public final class EscEvents implements IEscEvents {
+
+ /**
+ * Unique name of the type.
+ */
+ public static final TypeName TYPE = new TypeName(EL_ROOT_NAME);
+
+ /**
+ * Unique name of the serialized type.
+ */
+ public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
+
+ private List
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.json.bind.serializer.JsonbDeserializer;
+import jakarta.json.bind.serializer.JsonbSerializer;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Utilities for the JSON-B serialization module.
+ */
+public final class EscJsonbUtils {
+
+ /**
+ * Private utility constructor.
+ */
+ private EscJsonbUtils() {
+ throw new UnsupportedOperationException("Creating instances of a utility class is not allowed.");
+ }
+
+ /**
+ * Creates all available JSON-B serializers necessary for the ESC implementation.
+ *
+ * @return New array with serializers.
+ */
+ public static JsonbSerializer[] createEscJsonbSerializers() {
+ return new JsonbSerializer[]{
+ new EscEventsJsonbSerializerDeserializer(),
+ new EscEventJsonbSerializerDeserializer(),
+ new EscMetaJsonbSerializerDeserializer()
+ };
+ }
+
+ /**
+ * Creates all available JSON-B serializers necessary for the ESC implementation.
+ *
+ * @return New array with serializers.
+ */
+ public static JsonbSerializer[] joinJsonbSerializers(final JsonbSerializer[] serializersA,
+ final JsonbSerializer... serializersB) {
+ return joinJsonbSerializerArrays(serializersA, serializersB);
+ }
+
+ /**
+ * Creates all available JSON-B serializers necessary for the ESC implementation.
+ *
+ * @return New array with serializers.
+ */
+ public static JsonbSerializer[] joinJsonbSerializerArrays(final JsonbSerializer[]... serializerArrays) {
+ final List
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.HasSerializedDataTypeConstant;
+import org.fuin.esc.api.IEscMeta;
+import org.fuin.objects4j.common.Contract;
+
+/**
+ * A structure that contains the user's metadata and the system's meta information.
+ */
+@HasSerializedDataTypeConstant
+public final class EscMeta implements IEscMeta {
+
+ private String dataType;
+
+ private String dataContentTypeStr;
+
+ private String metaType;
+
+ private String metaContentTypeStr;
+
+ private Object meta;
+
+ private transient EnhancedMimeType dataContentType;
+
+ private transient EnhancedMimeType metaContentType;
+
+ /**
+ * Default constructor for JAXB.
+ */
+ protected EscMeta() {
+ super();
+ }
+
+ /**
+ * Constructor with all mandatory data.
+ *
+ * @param dataType Type of the data.
+ * @param dataContentType Content type of the data.
+ */
+ public EscMeta(@NotNull final String dataType, @NotNull final EnhancedMimeType dataContentType) {
+ this(dataType, dataContentType, null, null, null);
+ }
+
+ /**
+ * Constructor with all data.
+ *
+ * @param dataType Type of the data.
+ * @param dataContentType Type of the data.
+ * @param metaType Unique name of the metadata. Must be non-null if 'meta' is not null.
+ * @param metaContentType Type of the metadata. Must be non-null if 'meta' is not null.
+ * @param meta Metadata object, if available.
+ */
+ public EscMeta(@NotNull final String dataType, @NotNull final EnhancedMimeType dataContentType, @Nullable final String metaType,
+ @Nullable final EnhancedMimeType metaContentType, @Nullable final Object meta) {
+ super();
+ Contract.requireArgNotNull("dataType", dataType);
+ Contract.requireArgNotNull("dataContentType", dataContentType);
+ if (meta != null) {
+ Contract.requireArgNotNull("metaType", metaType);
+ Contract.requireArgNotNull("metaContentType", metaContentType);
+ }
+
+ this.dataType = dataType;
+ this.dataContentType = dataContentType;
+ this.dataContentTypeStr = dataContentType.toString();
+ this.metaType = metaType;
+ this.metaContentType = metaContentType;
+ if (metaContentType != null) {
+ this.metaContentTypeStr = metaContentType.toString();
+ }
+ this.meta = meta;
+ }
+
+ /**
+ * Returns the unique name of the data type.
+ *
+ * @return Data type.
+ */
+ @NotNull
+ public String getDataType() {
+ return dataType;
+ }
+
+ /**
+ * Sets the unique name of the data type.
+ *
+ * @param dataType Data type.
+ */
+ void setDataType(@NotNull final String dataType) {
+ Contract.requireArgNotNull("dataType", dataType);
+ this.dataType = dataType;
+ }
+
+ /**
+ * Returns the type of the data.
+ *
+ * @return Data type.
+ */
+ @NotNull
+ public EnhancedMimeType getDataContentType() {
+ if (dataContentType == null) {
+ dataContentType = EnhancedMimeType.create(dataContentTypeStr);
+ }
+ return dataContentType;
+ }
+
+ /**
+ * Sets the type of the data.
+ *
+ * @param dataContentType Data type.
+ */
+ void setDataContentType(EnhancedMimeType dataContentType) {
+ Contract.requireArgNotNull("dataContentType", dataContentType);
+ this.dataContentType = dataContentType;
+ this.dataContentTypeStr = dataContentType.toString();
+ }
+
+ /**
+ * Returns the unique name of the meta data type if available.
+ *
+ * @return Meta type.
+ */
+ @Nullable
+ public String getMetaType() {
+ return metaType;
+ }
+
+ /**
+ * Sets the unique name of the meta data type if available.
+ *
+ * @param metaType Meta type.
+ */
+ public void setMetaType(@Nullable final String metaType) {
+ this.metaType = metaType;
+ }
+
+ /**
+ * Returns the type of the metadata, if available.
+ *
+ * @return Meta type.
+ */
+ @Nullable
+ public EnhancedMimeType getMetaContentType() {
+ if ((metaContentType == null) && (metaContentTypeStr != null)) {
+ metaContentType = EnhancedMimeType.create(metaContentTypeStr);
+ }
+ return metaContentType;
+ }
+
+ /**
+ * Sets the type of the metadata, if available.
+ *
+ * @param metaContentType Meta content type.
+ */
+ public void setMetaContentType(@Nullable final EnhancedMimeType metaContentType) {
+ this.metaContentType = metaContentType;
+ if (metaContentType == null) {
+ this.metaContentTypeStr = null;
+ } else {
+ this.metaContentTypeStr = metaContentType.toString();
+ }
+ }
+
+ /**
+ * Returns the meta data object.
+ *
+ * @return Meta data object.
+ */
+ @NotNull
+ public Object getMeta() {
+ return meta;
+ }
+
+ /**
+ * Sets the meta data object.
+ *
+ * @param meta Meta data object.
+ */
+ void setMeta(@Nullable final Object meta) {
+ this.meta = meta;
+ }
+
+}
diff --git a/jsonb/src/main/java/org/fuin/esc/jsonb/EscMetaJsonbSerializerDeserializer.java b/jsonb/src/main/java/org/fuin/esc/jsonb/EscMetaJsonbSerializerDeserializer.java
new file mode 100644
index 00000000..a7b73adc
--- /dev/null
+++ b/jsonb/src/main/java/org/fuin/esc/jsonb/EscMetaJsonbSerializerDeserializer.java
@@ -0,0 +1,83 @@
+package org.fuin.esc.jsonb;
+
+import jakarta.json.bind.serializer.DeserializationContext;
+import jakarta.json.bind.serializer.JsonbDeserializer;
+import jakarta.json.bind.serializer.JsonbSerializer;
+import jakarta.json.bind.serializer.SerializationContext;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonParser;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.SerializedDataTypeRegistry;
+import org.fuin.esc.api.SerializedDataTypeRegistryRequired;
+
+import java.lang.reflect.Type;
+
+/**
+ * Adapter to use for JSON-B.
+ */
+public final class EscMetaJsonbSerializerDeserializer
+ implements JsonbSerializer
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
-package org.fuin.esc.api;
+package org.fuin.esc.jsonb;
+import jakarta.annotation.Nullable;
import jakarta.json.JsonStructure;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
@@ -27,9 +28,27 @@
import jakarta.json.bind.config.PropertyVisibilityStrategy;
import jakarta.json.bind.serializer.JsonbDeserializer;
import jakarta.json.bind.serializer.JsonbSerializer;
-
-import java.io.*;
+import jakarta.validation.constraints.NotNull;
+import org.fuin.esc.api.DeserializerRegistry;
+import org.fuin.esc.api.DeserializerRegistryRequired;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.SerDeserializer;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.SerializedDataTypeRegistry;
+import org.fuin.esc.api.SerializedDataTypeRegistryRequired;
+import org.fuin.esc.api.SerializerRegistry;
+import org.fuin.esc.api.SerializerRegistryRequired;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -37,8 +56,7 @@
/**
* Serializes and deserializes an object from/to JSON using JSON-B. The content type for serialization is always "application/json". This
- * implementation supports only
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test for {@link Base64Data} class.
+ */
+class Base64DataTest {
+
+ @Test
+ void testCreateBytes() {
+
+ // PREPARE
+ final byte[] data = "Hello world!".getBytes(StandardCharsets.UTF_8);
+ final String base64 = "SGVsbG8gd29ybGQh";
+
+ // TEST
+ final Base64Data testee = new Base64Data(data);
+
+ // VERIFY
+ assertThat(testee.getDecoded()).isEqualTo(data);
+ assertThat(testee.getEncoded()).isEqualTo(base64);
+
+ }
+
+ @Test
+ void testCreateBase64() {
+
+ // PREPARE
+ final byte[] data = new byte[]{72, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 33};
+ final String base64 = "SGVsbG8gd29ybGQh";
+
+ // TEST
+ final Base64Data testee = new Base64Data(base64);
+
+ // VERIFY
+ assertThat(testee.getDecoded()).isEqualTo(data);
+ assertThat(testee.getEncoded()).isEqualTo(base64);
+
+ }
+
+}
diff --git a/jsonb/src/test/java/org/fuin/esc/jsonb/BaseTest.java b/jsonb/src/test/java/org/fuin/esc/jsonb/BaseTest.java
new file mode 100644
index 00000000..c803d9e8
--- /dev/null
+++ b/jsonb/src/test/java/org/fuin/esc/jsonb/BaseTest.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (C) 2013 Future Invent Informationsmanagement GmbH. All rights
+ * reserved.
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import org.fuin.esc.api.EnhancedMimeType;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests the {@link Data} class.
+ */
+public class DataTest {
+
+ @Test
+ public void testCreate() {
+
+ final Data testee = new Data("MyEvent", EnhancedMimeType
+ .create("text/plain; version=1; encoding=utf-8"), "Hello, world!");
+
+ assertThat(testee.getType()).isEqualTo("MyEvent");
+ assertThat(testee.getMimeType()).isEqualTo(EnhancedMimeType
+ .create("text/plain; version=1; encoding=utf-8"));
+ assertThat(testee.getContent()).isEqualTo("Hello, world!");
+
+ }
+
+}
+
diff --git a/jsonb/src/test/java/org/fuin/esc/jsonb/DataWrapperTest.java b/jsonb/src/test/java/org/fuin/esc/jsonb/DataWrapperTest.java
new file mode 100644
index 00000000..0a854b33
--- /dev/null
+++ b/jsonb/src/test/java/org/fuin/esc/jsonb/DataWrapperTest.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test for {@link DataWrapper} class.
+ */
+public class DataWrapperTest {
+
+ @Test
+ public final void testCreate() throws Exception {
+
+ final Base64Data base64 = new Base64Data("Hello world!".getBytes(StandardCharsets.UTF_8));
+ final DataWrapper testee = new DataWrapper(base64);
+ assertThat(testee.getObj()).isEqualTo(base64);
+
+ }
+
+}
diff --git a/jsonb/src/test/java/org/fuin/esc/jsonb/EscEventJsonbSerializerDeserializerTest.java b/jsonb/src/test/java/org/fuin/esc/jsonb/EscEventJsonbSerializerDeserializerTest.java
new file mode 100644
index 00000000..d13a54a0
--- /dev/null
+++ b/jsonb/src/test/java/org/fuin/esc/jsonb/EscEventJsonbSerializerDeserializerTest.java
@@ -0,0 +1,16 @@
+package org.fuin.esc.jsonb;
+
+import org.fuin.utils4j.TestOmitted;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Test for the {@link EscEventJsonbSerializerDeserialize} class.
+ */
+@TestOmitted("Already tested along with the other tests in this package")
+public class EscEventJsonbSerializerDeserializerTest {
+
+ // Nothing to test in addition
+
+}
diff --git a/jsonb/src/test/java/org/fuin/esc/jsonb/EscEventTest.java b/jsonb/src/test/java/org/fuin/esc/jsonb/EscEventTest.java
new file mode 100644
index 00000000..454df4ae
--- /dev/null
+++ b/jsonb/src/test/java/org/fuin/esc/jsonb/EscEventTest.java
@@ -0,0 +1,275 @@
+/**
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * http://www.fuin.org/
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.activation.MimeTypeParseException;
+import jakarta.json.bind.Jsonb;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.SimpleSerializedDataTypeRegistry;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test for {@link EscEvent} class.
+ */
+public class EscEventTest {
+
+ @Test
+ public void testMarshalJsonB() throws Exception {
+
+ // PREPARE
+ final String expectedJson = """
+ {
+ "EventId":"b2a936ce-d479-414f-b67f-3df4da383d47",
+ "EventType":"MyEvent",
+ "Data":{
+ "id":"b2a936ce-d479-414f-b67f-3df4da383d47",
+ "description":"Hello, JSON!"
+ },
+ "MetaData":{
+ "data-type":"MyEvent",
+ "data-content-type":"application/json; version=1; encoding=UTF-8",
+ "meta-type":"MyMeta",
+ "meta-content-type":"application/json; version=1; encoding=UTF-8",
+ "MyMeta":{
+ "user":"abc"
+ }
+ }
+ }
+ """;
+
+ final SimpleSerializedDataTypeRegistry typeRegistry = new SimpleSerializedDataTypeRegistry();
+ typeRegistry.add(MyEvent.SER_TYPE, MyEvent.class);
+ typeRegistry.add(MyMeta.SER_TYPE, MyMeta.class);
+
+ final UUID eventId = UUID.fromString("b2a936ce-d479-414f-b67f-3df4da383d47");
+ final MyEvent myEvent = new MyEvent(UUID.fromString("b2a936ce-d479-414f-b67f-3df4da383d47"), "Hello, JSON!");
+ final MyMeta myMeta = new MyMeta("abc");
+
+ final EnhancedMimeType dataContentType = EnhancedMimeType.create("application/json; version=1; encoding=UTF-8");
+ final EnhancedMimeType metaContentType = EnhancedMimeType.create("application/json; version=1; encoding=UTF-8");
+ final EscMeta escMeta = new EscMeta(MyEvent.SER_TYPE.asBaseType(), dataContentType, MyMeta.SER_TYPE.asBaseType(), metaContentType,
+ myMeta);
+ final DataWrapper dataWrapper = new DataWrapper(myEvent);
+ final DataWrapper metaWrapper = new DataWrapper(escMeta);
+ final EscEvent event = new EscEvent(eventId, MyEvent.TYPE.asBaseType(), dataWrapper, metaWrapper);
+
+ try (final JsonbDeSerializer jsonbDeSer = TestUtils.createJsonbDeSerializer()) {
+ TestUtils.initSerDeserializerRegistry(typeRegistry, jsonbDeSer);
+
+ try (final Jsonb jsonb = jsonbDeSer.getJsonb()) {
+
+ // TEST
+ final String currentJson = jsonb.toJson(event);
+
+ // VERIFY
+ assertThatJson(currentJson).isEqualTo(expectedJson);
+
+ }
+ }
+
+ }
+
+ @Test
+ public final void testUnmarshalJsonB() throws Exception {
+
+ // PREPARE
+ final String expectedJson = """
+ {
+ "EventId":"b2a936ce-d479-414f-b67f-3df4da383d47",
+ "EventType":"MyEvent",
+ "Data":{
+ "id":"b2a936ce-d479-414f-b67f-3df4da383d47",
+ "description":"Hello, JSON!"
+ },
+ "MetaData":{
+ "data-type":"MyEvent",
+ "data-content-type":"application/json; version=1; encoding=UTF-8",
+ "meta-type":"MyMeta",
+ "meta-content-type":"application/json; version=1; encoding=UTF-8",
+ "MyMeta":{
+ "user":"abc"
+ }
+ }
+ }
+ """;
+
+ final SimpleSerializedDataTypeRegistry typeRegistry = new SimpleSerializedDataTypeRegistry();
+ typeRegistry.add(MyEvent.SER_TYPE, MyEvent.class);
+ typeRegistry.add(MyMeta.SER_TYPE, MyMeta.class);
+
+ try (final JsonbDeSerializer jsonbDeSer = TestUtils.createJsonbDeSerializer()) {
+ TestUtils.initSerDeserializerRegistry(typeRegistry, jsonbDeSer);
+
+ try (final Jsonb jsonb = jsonbDeSer.getJsonb()) {
+
+ // TEST
+ final EscEvent testee = jsonb.fromJson(expectedJson, EscEvent.class);
+
+ // VERIFY
+ assertThat(testee.getEventId()).isEqualTo("b2a936ce-d479-414f-b67f-3df4da383d47");
+ assertThat(testee.getEventType()).isEqualTo("MyEvent");
+ assertThat(testee.getData().getObj()).isInstanceOf(MyEvent.class);
+ final MyEvent myEvent = (MyEvent) testee.getData().getObj();
+ assertThat(myEvent.getId()).isEqualTo("b2a936ce-d479-414f-b67f-3df4da383d47");
+ assertThat(myEvent.getDescription()).isEqualTo("Hello, JSON!");
+ assertThat(testee.getMeta().getObj()).isInstanceOf(EscMeta.class);
+ final EscMeta escMeta = (EscMeta) testee.getMeta().getObj();
+ assertThat(escMeta.getDataType()).isEqualTo("MyEvent");
+ assertThat(escMeta.getDataContentType()).isEqualTo(EnhancedMimeType.create("application/json; version=1; encoding=UTF-8"));
+ assertThat(escMeta.getMetaType()).isEqualTo("MyMeta");
+ assertThat(escMeta.getMetaContentType()).isEqualTo(EnhancedMimeType.create("application/json; version=1; encoding=UTF-8"));
+ assertThat(escMeta.getMeta()).isInstanceOf(MyMeta.class);
+ final MyMeta myMeta = (MyMeta) escMeta.getMeta();
+ assertThat(myMeta.getUser()).isEqualTo("abc");
+
+ }
+
+ }
+ }
+
+ @Test
+ public void testMarshalJsonBBase64() throws Exception {
+
+ // PREPARE
+ final String expectedJson = """
+ {
+ "EventId": "68616d90-cf72-4c2a-b913-32bf6e6506ed",
+ "EventType": "MyEvent",
+ "Data": {
+ "Base64": "eyAibXktZXZlbnQiOiB7ICJpZCI6ICAiNjg2MTZkOTAtY2Y3Mi00YzJhLWI5MTMtMzJiZjZlNjUwNmVkIiwgImRlc2NyaXB0aW9uIjogIkhlbGxvLCBKU09OISIgfSB9"
+ },
+ "MetaData": {
+ "data-type": "MyEvent",
+ "data-content-type": "application/json; version=1; transfer-encoding=base64; encoding=UTF-8",
+ "meta-type": "MyMeta",
+ "meta-content-type": "application/json; version=1; encoding=UTF-8",
+ "MyMeta": {
+ "user": "abc"
+ }
+ }
+ }
+ """;
+
+ final SimpleSerializedDataTypeRegistry typeRegistry = new SimpleSerializedDataTypeRegistry();
+ typeRegistry.add(MyEvent.SER_TYPE, MyEvent.class);
+ typeRegistry.add(MyMeta.SER_TYPE, MyMeta.class);
+
+ final EscEvent event = createEventBase64();
+
+ try (final JsonbDeSerializer jsonbDeSer = TestUtils.createJsonbDeSerializer()) {
+ TestUtils.initSerDeserializerRegistry(typeRegistry, jsonbDeSer);
+
+ try (final Jsonb jsonb = jsonbDeSer.getJsonb()) {
+
+ // TEST
+ final String currentJson = jsonb.toJson(event);
+
+ // VERIFY
+ assertThatJson(currentJson).isEqualTo(expectedJson);
+
+ }
+ }
+
+ }
+
+ @Test
+ public final void testUnmarshalJsonBBase64() throws Exception {
+
+ // PREPARE
+ final String expectedJson = """
+ {
+ "EventId": "68616d90-cf72-4c2a-b913-32bf6e6506ed",
+ "EventType": "MyEvent",
+ "Data": {
+ "Base64": "eyAibXktZXZlbnQiOiB7ICJpZCI6ICAiNjg2MTZkOTAtY2Y3Mi00YzJhLWI5MTMtMzJiZjZlNjUwNmVkIiwgImRlc2NyaXB0aW9uIjogIkhlbGxvLCBKU09OISIgfSB9"
+ },
+ "MetaData": {
+ "data-type": "MyEvent",
+ "data-content-type": "application/json; version=1; transfer-encoding=base64; encoding=UTF-8",
+ "meta-type": "MyMeta",
+ "meta-content-type": "application/json; version=1; encoding=UTF-8",
+ "MyMeta": {
+ "user": "abc"
+ }
+ }
+ }
+ """;
+
+ final EscEvent expectedEvent = createEventBase64();
+
+ final SimpleSerializedDataTypeRegistry typeRegistry = new SimpleSerializedDataTypeRegistry();
+ typeRegistry.add(MyEvent.SER_TYPE, MyEvent.class);
+ typeRegistry.add(MyMeta.SER_TYPE, MyMeta.class);
+
+ try (final JsonbDeSerializer jsonbDeSer = TestUtils.createJsonbDeSerializer()) {
+ TestUtils.initSerDeserializerRegistry(typeRegistry, jsonbDeSer);
+
+ try (final Jsonb jsonb = jsonbDeSer.getJsonb()) {
+
+ // TEST
+ final EscEvent testee = jsonb.fromJson(expectedJson, EscEvent.class);
+
+ // VERIFY
+ assertThat(testee.getEventId()).isEqualTo(expectedEvent.getEventId());
+ assertThat(testee.getEventType()).isEqualTo(expectedEvent.getEventType());
+ assertThat(testee.getData().getObj()).isInstanceOf(Base64Data.class);
+ final Base64Data base64Data = (Base64Data) testee.getData().getObj();
+ assertThat(base64Data.getEncoded()).isEqualTo(((Base64Data) expectedEvent.getData().getObj()).getEncoded());
+ assertThat(testee.getMeta().getObj()).isInstanceOf(EscMeta.class);
+ final EscMeta actualEscMeta = (EscMeta) testee.getMeta().getObj();
+ final EscMeta expectedEscMeta = (EscMeta) expectedEvent.getMeta().getObj();
+ assertThat(actualEscMeta.getDataType()).isEqualTo(expectedEscMeta.getDataType());
+ assertThat(actualEscMeta.getDataContentType()).isEqualTo(expectedEscMeta.getDataContentType());
+ assertThat(actualEscMeta.getMetaType()).isEqualTo(expectedEscMeta.getMetaType());
+ assertThat(actualEscMeta.getMetaContentType()).isEqualTo(expectedEscMeta.getMetaContentType());
+ assertThat(actualEscMeta.getMeta()).isInstanceOf(MyMeta.class);
+ final MyMeta actualMyMeta = (MyMeta) actualEscMeta.getMeta();
+ final MyMeta expectedMyMeta = (MyMeta) expectedEscMeta.getMeta();
+ assertThat(actualMyMeta.getUser()).isEqualTo(expectedMyMeta.getUser());
+
+ }
+ }
+
+ }
+
+ private EscEvent createEventBase64() throws MimeTypeParseException {
+ final UUID eventId = UUID.fromString("68616d90-cf72-4c2a-b913-32bf6e6506ed");
+ final Base64Data data = new Base64Data(
+ "eyAibXktZXZlbnQiOiB7ICJpZCI6ICAiNjg2MTZkOTAtY2Y3Mi00YzJhLWI5MTMtMzJiZjZlNjUwNmVkIiwgImRlc2NyaXB0aW9uIjogIkhlbGxvLCBKU09OISIgfSB9");
+
+ final MyMeta myMeta = new MyMeta("abc");
+
+ final Map
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.activation.MimeTypeParseException;
+import jakarta.json.bind.Jsonb;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.SimpleSerializedDataTypeRegistry;
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test for {@link EscEvents} class.
+ */
+public class EscEventsTest {
+
+ @Test
+ public void testMarshalJsonB() throws Exception {
+
+ // PREPARE
+ final String expectedJson = """
+ [
+ {
+ "EventId": "b2a936ce-d479-414f-b67f-3df4da383d47",
+ "EventType": "MyEvent",
+ "Data": {
+ "id": "b2a936ce-d479-414f-b67f-3df4da383d47",
+ "description": "Hello, JSON!"
+ },
+ "MetaData": {
+ "data-type": "MyEvent",
+ "data-content-type": "application/json; version=1; encoding=UTF-8",
+ "meta-type": "MyMeta",
+ "meta-content-type": "application/json; version=1; encoding=UTF-8",
+ "MyMeta": {
+ "user": "abc"
+ }
+ }
+ },
+ {
+ "EventId": "68616d90-cf72-4c2a-b913-32bf6e6506ed",
+ "EventType": "MyEvent",
+ "Data": {
+ "Base64": "eyAibXktZXZlbnQiOiB7ICJpZCI6ICAiNjg2MTZkOTAtY2Y3Mi00YzJhLWI5MTMtMzJiZjZlNjUwNmVkIiwgImRlc2NyaXB0aW9uIjogIkhlbGxvLCBKU09OISIgfSB9"
+ },
+ "MetaData": {
+ "data-type": "MyEvent",
+ "data-content-type": "application/json; version=1; transfer-encoding=base64; encoding=UTF-8",
+ "meta-type": "MyMeta",
+ "meta-content-type": "application/json; version=1; encoding=UTF-8",
+ "MyMeta": {
+ "user": "abc"
+ }
+ }
+ }
+ ]
+ """;
+
+ final SimpleSerializedDataTypeRegistry typeRegistry = new SimpleSerializedDataTypeRegistry();
+ typeRegistry.add(MyEvent.SER_TYPE, MyEvent.class);
+ typeRegistry.add(MyMeta.SER_TYPE, MyMeta.class);
+
+ final EscEvents events = new EscEvents(createEvent1(), createEvent2());
+
+ try (final JsonbDeSerializer jsonbDeSer = TestUtils.createJsonbDeSerializer()) {
+ TestUtils.initSerDeserializerRegistry(typeRegistry, jsonbDeSer);
+
+ try (final Jsonb jsonb = jsonbDeSer.getJsonb()) {
+
+ // TEST
+ final String currentJson = jsonb.toJson(events);
+
+ // VERIFY
+ assertThatJson(currentJson).isEqualTo(expectedJson);
+
+ }
+ }
+
+ }
+
+ @Test
+ public final void testUnmarshalJsonB() throws Exception {
+
+ // PREPARE
+ final String expectedJson = """
+ [
+ {
+ "EventId": "b2a936ce-d479-414f-b67f-3df4da383d47",
+ "EventType": "MyEvent",
+ "Data": {
+ "id": "b2a936ce-d479-414f-b67f-3df4da383d47",
+ "description": "Hello, JSON!"
+ },
+ "MetaData": {
+ "data-type": "MyEvent",
+ "data-content-type": "application/json; version=1; encoding=UTF-8",
+ "meta-type": "MyMeta",
+ "meta-content-type": "application/json; version=1; encoding=UTF-8",
+ "MyMeta": {
+ "user": "abc"
+ }
+ }
+ },
+ {
+ "EventId": "68616d90-cf72-4c2a-b913-32bf6e6506ed",
+ "EventType": "MyEvent",
+ "Data": {
+ "Base64": "eyAibXktZXZlbnQiOiB7ICJpZCI6ICAiNjg2MTZkOTAtY2Y3Mi00YzJhLWI5MTMtMzJiZjZlNjUwNmVkIiwgImRlc2NyaXB0aW9uIjogIkhlbGxvLCBKU09OISIgfSB9"
+ },
+ "MetaData": {
+ "data-type": "MyEvent",
+ "data-content-type": "application/json; version=1; transfer-encoding=base64; encoding=UTF-8",
+ "meta-type": "MyMeta",
+ "meta-content-type": "application/json; version=1; encoding=UTF-8",
+ "MyMeta": {
+ "user": "abc"
+ }
+ }
+ }
+ ]
+ """;
+
+ final SimpleSerializedDataTypeRegistry typeRegistry = new SimpleSerializedDataTypeRegistry();
+ typeRegistry.add(MyEvent.SER_TYPE, MyEvent.class);
+ typeRegistry.add(MyMeta.SER_TYPE, MyMeta.class);
+
+ try (final JsonbDeSerializer jsonbDeSer = TestUtils.createJsonbDeSerializer()) {
+ TestUtils.initSerDeserializerRegistry(typeRegistry, jsonbDeSer);
+
+ try (final Jsonb jsonb = jsonbDeSer.getJsonb()) {
+
+ // TEST
+ final EscEvents testee = jsonb.fromJson(expectedJson, EscEvents.class);
+
+ // VERIFY
+ assertThat(testee.getList()).hasSize(2);
+ assertThat(testee.getList().get(0).getEventId()).isEqualTo("b2a936ce-d479-414f-b67f-3df4da383d47");
+ assertThat(testee.getList().get(1).getEventId()).isEqualTo("68616d90-cf72-4c2a-b913-32bf6e6506ed");
+
+ }
+ }
+ }
+
+ private EscEvent createEvent1() throws MimeTypeParseException {
+ final UUID eventId = UUID.fromString("b2a936ce-d479-414f-b67f-3df4da383d47");
+ final MyEvent myEvent = new MyEvent(UUID.fromString("b2a936ce-d479-414f-b67f-3df4da383d47"), "Hello, JSON!");
+ final MyMeta myMeta = new MyMeta("abc");
+ final EnhancedMimeType dataContentType = new EnhancedMimeType("application", "json", StandardCharsets.UTF_8, "1");
+ final EnhancedMimeType metaContentType = new EnhancedMimeType("application", "json", StandardCharsets.UTF_8, "1");
+ final EscMeta escMeta = new EscMeta(MyEvent.SER_TYPE.asBaseType(), dataContentType, MyMeta.SER_TYPE.asBaseType(), metaContentType,
+ myMeta);
+ return new EscEvent(eventId, MyEvent.TYPE.asBaseType(), new DataWrapper(myEvent), new DataWrapper(escMeta));
+ }
+
+ private EscEvent createEvent2() throws MimeTypeParseException {
+ final UUID eventId = UUID.fromString("68616d90-cf72-4c2a-b913-32bf6e6506ed");
+ final Base64Data data = new Base64Data(
+ "eyAibXktZXZlbnQiOiB7ICJpZCI6ICAiNjg2MTZkOTAtY2Y3Mi00YzJhLWI5MTMtMzJiZjZlNjUwNmVkIiwgImRlc2NyaXB0aW9uIjogIkhlbGxvLCBKU09OISIgfSB9");
+
+ final MyMeta myMeta = new MyMeta("abc");
+
+ final Map
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+package org.fuin.esc.jsonb;
+
+import jakarta.activation.MimeTypeParseException;
+import jakarta.json.bind.serializer.DeserializationContext;
+import jakarta.json.bind.serializer.JsonbDeserializer;
+import jakarta.json.bind.serializer.JsonbSerializer;
+import jakarta.json.bind.serializer.SerializationContext;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonParser;
+import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.Deserializer;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.Serializer;
+import org.fuin.esc.spi.EscSpiUtils;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests the {@link EscSpiUtils} class together with {@link EscMeta}.
+ */
+public class EscJsonbUtilsTest {
+
+ @Test
+ public void testJoinJsonbSerializers() {
+
+ final JsonbSerializerbyte[] and {@link JsonStructure} for unmarshalling content. Trying to use something else will
- * result in an exception.
+ * implementation supports only byte[] for unmarshalling content. Trying to use something else will result in an exception.
*/
public final class JsonbDeSerializer implements SerDeserializer, Closeable {
@@ -56,7 +74,7 @@ public final class JsonbDeSerializer implements SerDeserializer, Closeable {
/**
* Constructor with JAXB context classes.
- *
+ *
* @param config
* JSON-B configuration to use.
* @param encoding
@@ -66,8 +84,10 @@ public final class JsonbDeSerializer implements SerDeserializer, Closeable {
* @param deserializers
* List of configured JSON-B deserializers.
*/
- private JsonbDeSerializer(final JsonbConfig config, final Charset encoding, final List
* This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation; either version 3 of the License, or (at your option) any * later version. - * + *
* This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. - * + *
* You should have received a copy of the GNU Lesser General Public License * along with this library. If not, see http://www.gnu.org/licenses/. */ diff --git a/mem/src/main/java/org/fuin/esc/mem/InMemoryEventStore.java b/mem/src/main/java/org/fuin/esc/mem/InMemoryEventStore.java index c058e1b5..3255bf6c 100644 --- a/mem/src/main/java/org/fuin/esc/mem/InMemoryEventStore.java +++ b/mem/src/main/java/org/fuin/esc/mem/InMemoryEventStore.java @@ -1,17 +1,17 @@ /** - * Copyright (C) 2015 Michael Schnell. All rights reserved. + * Copyright (C) 2015 Michael Schnell. All rights reserved. * http://www.fuin.org/ - * + *
* This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation; either version 3 of the License, or (at your option) any * later version. - * + *
* This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. - * + *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -32,17 +32,17 @@
*/
public final class InMemoryEventStore extends AbstractReadableEventStore implements IInMemoryEventStore {
- private Executor executor;
+ private final Executor executor;
- private Map
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -33,7 +33,7 @@ public final class InMemorySubscription extends Subscription implements
/**
* Creates a subscription.
- *
+ *
* @param subscriberId
* Uniquely identifies a subscriber.
* @param streamId
@@ -42,22 +42,22 @@ public final class InMemorySubscription extends Subscription implements
* Last event seen on the stream.
*/
public InMemorySubscription(final int subscriberId,
- final StreamId streamId, final Long lastEventNumber) {
+ final StreamId streamId, final Long lastEventNumber) {
super(streamId, lastEventNumber);
this.subscriberId = subscriberId;
}
/**
* Returns the subscriber ID.
- *
+ *
* @return Uniquely identifies a subscriber.
*/
- public final int getSubscriberId() {
+ public int getSubscriberId() {
return subscriberId;
}
@Override
- public final int hashCode() {
+ public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + subscriberId;
@@ -65,7 +65,7 @@ public final int hashCode() {
}
@Override
- public final boolean equals(final Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -80,7 +80,7 @@ public final boolean equals(final Object obj) {
}
@Override
- public final int compareTo(final InMemorySubscription other) {
+ public int compareTo(final InMemorySubscription other) {
if (subscriberId > other.subscriberId) {
return 1;
}
@@ -91,8 +91,8 @@ public final int compareTo(final InMemorySubscription other) {
}
@Override
- public final String toString() {
+ public String toString() {
return this.getClass().getSimpleName() + "#" + subscriberId;
}
-
+
}
diff --git a/mem/src/test/java/org/fuin/esc/mem/ArchitectureTest.java b/mem/src/test/java/org/fuin/esc/mem/ArchitectureTest.java
new file mode 100644
index 00000000..9a2540b9
--- /dev/null
+++ b/mem/src/test/java/org/fuin/esc/mem/ArchitectureTest.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (C) 2013 Future Invent Informationsmanagement GmbH. All rights
+ * reserved.
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see http://www.gnu.org/licenses/.
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -36,7 +36,6 @@
/**
* Tests the {@link InMemoryEventStore} class.
*/
-// CHECKSTYLE:OFF Test
public class InMemoryEventStoreTest {
private InMemoryEventStore testee;
@@ -337,4 +336,4 @@ public final String toString() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/mem/src/test/java/org/fuin/esc/mem/InMemorySubscriptionTest.java b/mem/src/test/java/org/fuin/esc/mem/InMemorySubscriptionTest.java
index 417b3534..b41d3f84 100644
--- a/mem/src/test/java/org/fuin/esc/mem/InMemorySubscriptionTest.java
+++ b/mem/src/test/java/org/fuin/esc/mem/InMemorySubscriptionTest.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -30,7 +30,7 @@
/**
* Tests the class {@link InMemorySubscription}.
*/
-// CHECKSTYLE:OFF Test code
+
public class InMemorySubscriptionTest {
@Test
@@ -57,4 +57,4 @@ public void testEqualsHashCode() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/mem/src/test/java/org/fuin/esc/mem/MyEvent.java b/mem/src/test/java/org/fuin/esc/mem/MyEvent.java
index 32067d7a..446f201a 100644
--- a/mem/src/test/java/org/fuin/esc/mem/MyEvent.java
+++ b/mem/src/test/java/org/fuin/esc/mem/MyEvent.java
@@ -1,9 +1,11 @@
-// CHECKSTYLE:OFF
package org.fuin.esc.mem;
+import com.tngtech.archunit.junit.ArchIgnore;
+
/**
* Example event.
*/
+@ArchIgnore
public class MyEvent {
private String name;
@@ -47,4 +49,4 @@ public String toString() {
}
}
-// CHECKSTYLE:ON
+
diff --git a/pom.xml b/pom.xml
index 1c71aff7..c29809f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,456 +1,478 @@
-
* This library is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation; either version 3 of the License, or (at your option) any * later version. - * + *
* This library is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. - * + *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -34,8 +34,8 @@ public abstract class AbstractReadableEventStore implements ReadableEventStore {
@Override
public final void readAllEventsForward(final StreamId streamId,
- final long startingAtEventNumber, final int chunkSize,
- final ChunkEventHandler handler) {
+ final long startingAtEventNumber, final int chunkSize,
+ final ChunkEventHandler handler) {
long sliceStart = startingAtEventNumber;
StreamEventsSlice currentSlice;
@@ -52,7 +52,7 @@ public final void readAllEventsForward(final StreamId streamId,
LOG.debug(ex.getMessage());
break;
}
- if (currentSlice.getEvents().size() > 0) {
+ if (!currentSlice.getEvents().isEmpty()) {
handler.handle(currentSlice);
}
sliceStart = currentSlice.getNextEventNumber();
diff --git a/spi/src/main/java/org/fuin/esc/spi/Base64Data.java b/spi/src/main/java/org/fuin/esc/spi/Base64Data.java
deleted file mode 100644
index 3c0679f0..00000000
--- a/spi/src/main/java/org/fuin/esc/spi/Base64Data.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
- * http://www.fuin.org/
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option) any
- * later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see http://www.gnu.org/licenses/.
- */
-package org.fuin.esc.spi;
-
-import jakarta.json.Json;
-import jakarta.json.JsonObject;
-import jakarta.validation.constraints.NotNull;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlTransient;
-import jakarta.xml.bind.annotation.XmlValue;
-import org.apache.commons.codec.binary.Base64;
-import org.fuin.esc.api.*;
-import org.fuin.objects4j.common.Contract;
-
-import java.nio.charset.Charset;
-
-/**
- * Contains some Base64 encoded data.
- */
-@HasSerializedDataTypeConstant
-@XmlRootElement(name = Base64Data.EL_ROOT_NAME)
-public final class Base64Data implements ToJsonCapable {
-
- /** Unique XML/JSON root element name of the type. */
- public static final String EL_ROOT_NAME = "Base64";
-
- /** Unique name of the type. */
- public static final TypeName TYPE = new TypeName(EL_ROOT_NAME);
-
- /** Unique name of the serialized type. */
- public static final SerializedDataType SER_TYPE = new SerializedDataType(TYPE.asBaseType());
-
- @XmlValue
- private String base64Str;
-
- @XmlTransient
- private byte[] binaryData;
-
- /**
- * Default constructor for JAXB.
- */
- protected Base64Data() {
- super();
- }
-
- /**
- * Constructor with Base64 encoded string.
- *
- * @param base64Str
- * Base64 encoded data.
- */
- public Base64Data(@NotNull final String base64Str) {
- super();
- Contract.requireArgNotNull("base64Str", base64Str);
- this.base64Str = base64Str;
- this.binaryData = Base64.decodeBase64(base64Str);
- }
-
- /**
- * Constructor with binary data that will be Base64 encoded.
- *
- * @param binaryData
- * Binary data.
- */
- public Base64Data(@NotNull final byte[] binaryData) {
- super();
- Contract.requireArgNotNull("binaryData", binaryData);
- this.base64Str = Base64.encodeBase64String(binaryData);
- this.binaryData = binaryData;
- }
-
- /**
- * Returns the Base64 encoded data.
- *
- * @return Base64 string.
- */
- public final String getEncoded() {
- return base64Str;
- }
-
- /**
- * Returns the decoded data.
- *
- * @return Binary data.
- */
- public final byte[] getDecoded() {
- if (binaryData == null) {
- binaryData = Base64.decodeBase64(base64Str);
- }
- return binaryData;
- }
-
- @Override
- public final JsonObject toJson() {
- return Json.createObjectBuilder().add(EL_ROOT_NAME, base64Str).build();
- }
-
- /**
- * Creates in instance from the given JSON object.
- *
- * @param jsonObj
- * Object to read values from.
- *
- * @return New instance.
- */
- public static Base64Data create(final JsonObject jsonObj) {
- final String base64Str = jsonObj.getString(EL_ROOT_NAME);
- return new Base64Data(base64Str);
- }
-
- /**
- * Serializes and deserializes a {@link Base64Data} object as JSON. The
- * content type for serialization is always "application/json".
- */
- public static class Base64DataJsonDeSerializer implements SerDeserializer {
-
- private final JsonDeSerializer jsonDeSer;
-
- /**
- * Default constructor.
- */
- public Base64DataJsonDeSerializer() {
- super();
- this.jsonDeSer = new JsonDeSerializer();
- }
-
- /**
- * Constructor with encoding.
- *
- * @param encoding
- * Default encoding to use.
- */
- public Base64DataJsonDeSerializer(final Charset encoding) {
- super();
- this.jsonDeSer = new JsonDeSerializer(encoding);
- }
-
- @Override
- public final EnhancedMimeType getMimeType() {
- return jsonDeSer.getMimeType();
- }
-
- @Override
- public final
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.spi;
import jakarta.annotation.Nullable;
-import jakarta.json.bind.serializer.JsonbDeserializer;
-import jakarta.json.bind.serializer.JsonbSerializer;
import jakarta.validation.constraints.NotNull;
-import org.fuin.esc.api.*;
+import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.Deserializer;
+import org.fuin.esc.api.DeserializerRegistry;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.IBaseTypeFactory;
+import org.fuin.esc.api.IEscMeta;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.Serializer;
+import org.fuin.esc.api.SerializerRegistry;
import org.fuin.objects4j.common.Contract;
-import org.w3c.dom.Node;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.StringWriter;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -50,19 +47,19 @@ private EscSpiUtils() {
/**
* Tries to find a serializer for the given type of object and converts it into a storable data block.
- *
+ *
* @param registry
* Registry with known serializers.
* @param type
* Type of event.
* @param data
* Event of the given type.
- *
+ *
* @return Event ready to persist or
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -37,8 +37,8 @@ public final class ProjectionJavaScriptBuilder {
private StringBuilder sb;
/**
- * Constructor for building an tenant based projection.
- *
+ * Constructor for building a tenant based projection.
+ *
* @param tenantStreamId
* Tenant ID to use as category and delegate name as projection name.
*/
@@ -54,7 +54,7 @@ public ProjectionJavaScriptBuilder(@NotNull final TenantStreamId tenantStreamId)
/**
* Constructor for building an 'all' based projection.
- *
+ *
* @param projectionId
* Projection ID to use as projection name.
*/
@@ -66,7 +66,7 @@ public ProjectionJavaScriptBuilder(@NotNull final StreamId projectionId) {
/**
* Constructor for building an 'all' based projection.
- *
+ *
* @param projection
* Projection name.
*/
@@ -78,7 +78,7 @@ public ProjectionJavaScriptBuilder(@NotNull final String projection) {
/**
* Constructor for building a 'category' based projection.
- *
+ *
* @param projectionId
* Projection.
* @param categoryId
@@ -93,7 +93,7 @@ public ProjectionJavaScriptBuilder(@NotNull final StreamId projectionId, @NotNul
/**
* Constructor for building a 'category' based projection.
- *
+ *
* @param projection
* Projection name.
* @param category
@@ -122,13 +122,13 @@ private void initCategory(final String projection, final String category) {
/**
* Adds another type to select.
- *
+ *
* @param eventType
* Unique event type to select from the category of streams.
- *
+ *
* @return this.
*/
- public final ProjectionJavaScriptBuilder type(final String eventType) {
+ public ProjectionJavaScriptBuilder type(final String eventType) {
if (count > 0) {
sb.append(",");
}
@@ -139,25 +139,25 @@ public final ProjectionJavaScriptBuilder type(final String eventType) {
/**
* Adds another type to select. Convenience method to add a {@link TypeName} instead of a string.
- *
+ *
* @param eventType
* Unique event type to select from the category of streams.
- *
+ *
* @return this.
*/
- public final ProjectionJavaScriptBuilder type(final TypeName eventType) {
+ public ProjectionJavaScriptBuilder type(final TypeName eventType) {
return type(eventType.asBaseType());
}
/**
* Adds more types to select. Convenience method to add multiple {@link TypeName} instead of strings.
- *
+ *
* @param eventTypes
* Unique event type list to select from the category of streams.
- *
+ *
* @return this.
*/
- public final ProjectionJavaScriptBuilder types(final List
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -21,9 +21,12 @@
import org.fuin.esc.api.EnhancedMimeType;
import org.fuin.esc.api.SerializedDataType;
import org.fuin.objects4j.common.Contract;
-import org.fuin.objects4j.common.Immutable;
+
+import javax.annotation.concurrent.Immutable;
+
import org.fuin.objects4j.common.ValueObject;
+import java.io.Serial;
import java.io.Serializable;
import java.util.Arrays;
@@ -33,6 +36,7 @@
@Immutable
public class SerializedData implements ValueObject, Serializable {
+ @Serial
private static final long serialVersionUID = 1000L;
/** Unique type of the data. */
@@ -56,7 +60,7 @@ protected SerializedData() { //NOSONAR Ignore uninitialized fields
/**
* Creates a data object.
- *
+ *
* @param type
* Unique identifier for the type of data.
* @param mimeType
@@ -79,7 +83,7 @@ public SerializedData(@NotNull final SerializedDataType type,
/**
* Returns the unique identifier for the type of data.
- *
+ *
* @return Unique and never changing type name.
*/
@NotNull
@@ -89,7 +93,7 @@ public final SerializedDataType getType() {
/**
* Returns the Internet Media Type that classifies the data.
- *
+ *
* @return Mime type.
*/
@NotNull
@@ -99,7 +103,7 @@ public final EnhancedMimeType getMimeType() {
/**
* Returns the raw data block.
- *
+ *
* @return Raw data.
*/
@NotNull
@@ -107,7 +111,6 @@ public final byte[] getRaw() {
return raw;
}
- // CHECKSTYLE:OFF Generated code
@Override
public final int hashCode() {
final int prime = 31;
@@ -136,13 +139,9 @@ public final boolean equals(Object obj) {
if (!Arrays.equals(raw, other.raw))
return false;
if (type == null) {
- if (other.type != null)
- return false;
- } else if (!type.equals(other.type))
- return false;
- return true;
+ return other.type == null;
+ } else return type.equals(other.type);
}
- // CHECKSTYLE:ON
}
diff --git a/spi/src/main/java/org/fuin/esc/spi/TenantStreamId.java b/spi/src/main/java/org/fuin/esc/spi/TenantStreamId.java
index 65b4fe6f..75807d7d 100644
--- a/spi/src/main/java/org/fuin/esc/spi/TenantStreamId.java
+++ b/spi/src/main/java/org/fuin/esc/spi/TenantStreamId.java
@@ -1,17 +1,17 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
@@ -24,6 +24,7 @@
import org.fuin.objects4j.common.Contract;
import org.fuin.objects4j.core.KeyValue;
+import java.io.Serial;
import java.util.List;
/**
@@ -31,6 +32,7 @@
*/
public final class TenantStreamId implements StreamId {
+ @Serial
private static final long serialVersionUID = 1000L;
private final TenantId tenantId;
@@ -81,7 +83,7 @@ public String asString() {
/**
* Returns the tenant identifier.
- *
+ *
* @return Tenant identifier.
*/
@Nullable
@@ -91,7 +93,7 @@ public TenantId getTenantId() {
/**
* Returns the underlying stream identifier.
- *
+ *
* @return Stream identifier.
*/
@NotNull
@@ -100,12 +102,12 @@ public StreamId getDelegate() {
}
@Override
- public final int hashCode() {
+ public int hashCode() {
return asString().hashCode();
}
@Override
- public final boolean equals(final Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -120,7 +122,7 @@ public final boolean equals(final Object obj) {
}
@Override
- public final String toString() {
+ public String toString() {
return asString();
}
diff --git a/spi/src/main/java/org/fuin/esc/spi/TextDeSerializer.java b/spi/src/main/java/org/fuin/esc/spi/TextDeSerializer.java
index 0b744abf..900e8120 100644
--- a/spi/src/main/java/org/fuin/esc/spi/TextDeSerializer.java
+++ b/spi/src/main/java/org/fuin/esc/spi/TextDeSerializer.java
@@ -1,27 +1,29 @@
/**
- * Copyright (C) 2015 Michael Schnell. All rights reserved.
+ * Copyright (C) 2015 Michael Schnell. All rights reserved.
* http://www.fuin.org/
- *
+ *
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.spi;
+import jakarta.validation.constraints.NotNull;
import org.fuin.esc.api.EnhancedMimeType;
import org.fuin.esc.api.SerDeserializer;
import org.fuin.esc.api.SerializedDataType;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
/**
* Serializes and deserializes a String object. The content type for serialization is always "text/plain".
@@ -34,38 +36,37 @@ public final class TextDeSerializer implements SerDeserializer {
* Constructor with UTF-8 encoding.
*/
public TextDeSerializer() {
- this(Charset.forName("utf-8"));
+ this(StandardCharsets.UTF_8);
}
/**
* Constructor with type and encoding.
- *
+ *
* @param encoding
* Default encoding to use.
*/
- public TextDeSerializer(final Charset encoding) {
+ public TextDeSerializer(@NotNull final Charset encoding) {
super();
this.mimeType = EnhancedMimeType.create("text", "plain", encoding);
}
@Override
- public final EnhancedMimeType getMimeType() {
+ public EnhancedMimeType getMimeType() {
return mimeType;
}
@Override
- public final byte[] marshal(final Object obj, final SerializedDataType type) {
- if (!(obj instanceof String)) {
+ public byte[] marshal(@NotNull final Object obj, @NotNull final SerializedDataType type) {
+ if (!(obj instanceof String str)) {
throw new IllegalArgumentException("Can only handle instances of type 'String', but not: "
+ obj.getClass());
}
- final String str = (String) obj;
return str.getBytes(mimeType.getEncoding());
}
@SuppressWarnings("unchecked")
@Override
- public final
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
- * along with this library. If not, see http://www.gnu.org/licenses/.
+ * along with this library. If not, see
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 3 of the License, or (at your option) any
* later version.
- *
+ *
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this library. If not, see http://www.gnu.org/licenses/.
*/
package org.fuin.esc.spi;
import jakarta.activation.MimeTypeParseException;
-import jakarta.json.bind.serializer.DeserializationContext;
-import jakarta.json.bind.serializer.JsonbDeserializer;
-import jakarta.json.bind.serializer.JsonbSerializer;
-import jakarta.json.bind.serializer.SerializationContext;
-import jakarta.json.stream.JsonGenerator;
-import jakarta.json.stream.JsonParser;
-import org.fuin.esc.api.*;
+import org.fuin.esc.api.CommonEvent;
+import org.fuin.esc.api.Deserializer;
+import org.fuin.esc.api.DeserializerRegistry;
+import org.fuin.esc.api.EnhancedMimeType;
+import org.fuin.esc.api.EventId;
+import org.fuin.esc.api.IBaseTypeFactory;
+import org.fuin.esc.api.IEscMeta;
+import org.fuin.esc.api.SerializedDataType;
+import org.fuin.esc.api.Serializer;
+import org.fuin.esc.api.SerializerRegistry;
+import org.fuin.esc.api.SimpleCommonEvent;
+import org.fuin.esc.api.SimpleSerializerDeserializerRegistry;
+import org.fuin.esc.api.TypeName;
import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
-import java.lang.reflect.Type;
-import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.UUID;
@@ -38,7 +44,6 @@
/**
* Tests the {@link EscSpiUtils} class.
*/
-// CHECKSTYLE:OFF Test
public class EscSpiUtilsTest {
@Test
@@ -62,10 +67,10 @@ public void testEventsEqual() {
assertThat(EscSpiUtils.eventsEqual(asList(eventA), asList(eventAa))).isTrue();
assertThat(EscSpiUtils.eventsEqual(asList(eventA), asList(eventA, eventB))).isFalse();
assertThat(EscSpiUtils.eventsEqual(asList(eventA, eventB), asList(eventB))).isFalse();
-
+
}
-
-
+
+
@Test
public void testSerializeNull() {
@@ -193,7 +198,6 @@ public void testMimeTypeDifferent() {
events.add(new SimpleCommonEvent(new EventId(), eventTypeA, "One"));
events.add(new SimpleCommonEvent(new EventId(), eventTypeB, "null if the given data was null.
*/
@Nullable
public static SerializedData serialize(@NotNull final SerializerRegistry registry, @NotNull final SerializedDataType type,
- @Nullable final Object data) {
+ @Nullable final Object data) {
if (data == null) {
return null;
@@ -77,14 +74,14 @@ public static SerializedData serialize(@NotNull final SerializerRegistry registr
/**
* Tries to find a deserializer for the given data block.
- *
+ *
* @param registry
* Registry with known deserializers.
* @param data
* Persisted data.
- *
+ *
* @return Unmarshalled event.
- *
+ *
* @param null if there are events with different mime types.
*/
public static EnhancedMimeType mimeType(@NotNull final SerializerRegistry registry, @NotNull final List