From 480533704fd3a1ed84a12d8f954a4e7e87cbfdb2 Mon Sep 17 00:00:00 2001
From: xiabou <xian.boullosa@ctag.com>
Date: Tue, 16 Apr 2024 19:28:01 +0200
Subject: [PATCH 1/4] wip: Update Mongo driver to latest version

---
 core/pom.xml                                  |  70 ++++----
 .../mongodb/internal/MongoDbManager.java      | 152 +++++++-----------
 .../mongodb/internal/MongoDbPlugin.java       |  18 ++-
 .../java/org/seedstack/mongodb/MongoDbIT.java |   2 +-
 pom.xml                                       |   8 +-
 5 files changed, 112 insertions(+), 138 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index fce6ee6..c321463 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -8,43 +8,43 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.seedstack.addons.mongodb</groupId>
-        <artifactId>mongodb</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-    </parent>
+	<parent>
+		<groupId>org.seedstack.addons.mongodb</groupId>
+		<artifactId>mongodb</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+	</parent>
 
 	<artifactId>mongodb-core</artifactId>
-	
-    <dependencies>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver-legacy</artifactId>
-            <version>${mongodb.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.seedstack.seed</groupId>
-            <artifactId>seed-testing-junit4</artifactId>
-            <version>${seed.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-driver-sync</artifactId>
+			<version>${mongodb.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.seedstack.seed</groupId>
+			<artifactId>seed-testing-junit4</artifactId>
+			<version>${seed.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assertj.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
 </project>
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
index 8ac2e8d..416a119 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
@@ -7,15 +7,12 @@
  */
 package org.seedstack.mongodb.internal;
 
-import com.google.common.base.Preconditions;
-import com.google.inject.Module;
-import com.mongodb.AuthenticationMechanism;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.MongoClientURI;
-import com.mongodb.MongoCredential;
-import com.mongodb.ServerAddress;
-import com.mongodb.client.MongoDatabase;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.seedstack.coffig.BuilderSupplier;
 import org.seedstack.coffig.Coffig;
 import org.seedstack.mongodb.MongoDbConfig;
@@ -23,22 +20,31 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.google.common.base.Preconditions;
+import com.google.inject.Module;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoDatabase;
 
 class MongoDbManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(MongoDbManager.class);
     private final Map<String, MongoClient> mongoClients = new HashMap<>();
     private final Map<String, MongoDatabase> mongoDatabases = new HashMap<>();
 
-    protected MongoClient doCreateClient(String clientName, MongoDbConfig.ClientConfig clientConfig, Coffig coffig) {
+    protected MongoClient doCreateClient(
+            String clientName, MongoDbConfig.ClientConfig clientConfig, Coffig coffig) {
         AllOptions allOptions = coffig.get(AllOptions.class, String.format("mongoDb.clients.%s", clientName));
         if (clientConfig.isConfiguredByUri()) {
-            return new MongoClient(new MongoClientURI(clientConfig.getUri(), allOptions.options.get()));
+            return MongoClients.create(
+                    allOptions.options
+                            .get()
+                            .applyConnectionString(new ConnectionString(clientConfig.getUri()))
+                            .build());
         } else {
-            return createMongoClient(clientName, clientConfig, allOptions.options.get().build());
+            return createMongoClient(clientName, clientConfig, allOptions.options.get());
         }
     }
 
@@ -50,8 +56,10 @@ protected void doClose(MongoClient client) {
         client.close();
     }
 
-    private MongoClient createMongoClient(String clientName, MongoDbConfig.ClientConfig clientConfig,
-                                          MongoClientOptions mongoClientOptions) {
+    private MongoClient createMongoClient(
+            String clientName,
+            MongoDbConfig.ClientConfig clientConfig,
+            MongoClientSettings.Builder mongoClientSettingsBuilder) {
         List<ServerAddress> serverAddresses = buildServerAddresses(clientName, clientConfig.getHosts());
 
         if (serverAddresses.isEmpty()) {
@@ -59,23 +67,15 @@ private MongoClient createMongoClient(String clientName, MongoDbConfig.ClientCon
                     .put("clientName", clientName);
         }
 
-        MongoCredential mongoCredential = buildMongoCredential(clientName, clientConfig.getCredentials());
-        if (mongoCredential == null) {
-            if (serverAddresses.size() == 1) {
-                return new MongoClient(serverAddresses.get(0), mongoClientOptions);
-            } else {
-                return new MongoClient(serverAddresses, mongoClientOptions);
-            }
-        } else {
-            if (serverAddresses.size() == 1) {
-                return new MongoClient(serverAddresses.get(0), mongoCredential, mongoClientOptions);
-            } else {
-                return new MongoClient(serverAddresses, mongoCredential, mongoClientOptions);
-            }
-        }
+        ConnectionString connectionString = buildConnectionString(clientName, serverAddresses,
+                clientConfig.getCredentials());
+
+        return MongoClients.create(mongoClientSettingsBuilder.applyConnectionString(connectionString).build());
+
     }
 
-    public void registerClient(String clientName, MongoDbConfig.ClientConfig clientConfig, Coffig coffig) {
+    public void registerClient(
+            String clientName, MongoDbConfig.ClientConfig clientConfig, Coffig coffig) {
         LOGGER.info("Creating MongoDB client {}", clientName);
         mongoClients.put(clientName, doCreateClient(clientName, clientConfig, coffig));
     }
@@ -93,7 +93,10 @@ public void shutdown() {
                 try {
                     doClose(mongoClientEntry.getValue());
                 } catch (Exception e) {
-                    LOGGER.error(String.format("Unable to properly close MongoDB client %s", mongoClientEntry.getKey()), e);
+                    LOGGER.error(
+                            String.format(
+                                    "Unable to properly close MongoDB client %s", mongoClientEntry.getKey()),
+                            e);
                 }
             }
         } finally {
@@ -103,7 +106,29 @@ public void shutdown() {
     }
 
     public Module getModule() {
-        return new MongoDbModule<>(com.mongodb.MongoClient.class, MongoDatabase.class, mongoClients, mongoDatabases);
+        return new MongoDbModule<>(
+                com.mongodb.client.MongoClient.class, MongoDatabase.class, mongoClients, mongoDatabases);
+    }
+
+    ConnectionString buildConnectionString(String clientName, List<ServerAddress> serverAddresses,
+            String mongoCredential) {
+
+        StringBuilder builder = new StringBuilder();
+        builder.append("mongodb://");
+
+        if (mongoCredential != null) {
+            builder.append(mongoCredential);
+            builder.append("@");
+        }
+        if (serverAddresses.size() == 1) {
+            builder.append(serverAddresses.get(0));
+        } else {
+            builder.append(serverAddresses.stream()
+                    .map(x -> x.toString())
+                    .collect(Collectors.joining(",")));
+        }
+        LOGGER.info("Connection string", builder);
+        return new ConnectionString(builder.toString());
     }
 
     List<ServerAddress> buildServerAddresses(String clientName, List<String> addresses) {
@@ -127,61 +152,8 @@ List<ServerAddress> buildServerAddresses(String clientName, List<String> address
         return serverAddresses;
     }
 
-    MongoCredential buildMongoCredential(String clientName, String credential) {
-        if (credential == null || credential.isEmpty()) {
-            return null;
-        } else {
-            String[] elements = credential.split(":", 3);
-            if (elements.length == 3) {
-                String[] sourceElements = elements[0].split("/", 2);
-                if (sourceElements.length == 2) {
-                    return buildMongoCredential(clientName, elements[1], elements[2], sourceElements[1], sourceElements[0]);
-                } else if (sourceElements.length == 1) {
-                    return buildMongoCredential(clientName, elements[1], elements[2], sourceElements[0], null);
-                } else {
-                    throw SeedException.createNew(MongoDbErrorCode.INVALID_CREDENTIAL_SYNTAX)
-                            .put("credential", credential)
-                            .put("clientName", clientName);
-                }
-            } else {
-                throw SeedException.createNew(MongoDbErrorCode.INVALID_CREDENTIAL_SYNTAX)
-                        .put("credential", credential)
-                        .put("clientName", clientName);
-            }
-        }
-    }
-
-    MongoCredential buildMongoCredential(String clientName, String user, String password, String source, String mechanism) {
-        if (mechanism != null) {
-            AuthenticationMechanism authenticationMechanism = AuthenticationMechanism.fromMechanismName(mechanism);
-            switch (authenticationMechanism) {
-                case PLAIN:
-                    return MongoCredential.createPlainCredential(user, source, password.toCharArray());
-                case SCRAM_SHA_1:
-                    return MongoCredential.createScramSha1Credential(user, source, password.toCharArray());
-                case SCRAM_SHA_256:
-                    return MongoCredential.createScramSha256Credential(user, source, password.toCharArray());
-                case MONGODB_AWS:
-                    return MongoCredential.createAwsCredential(user, password.toCharArray());
-                case MONGODB_X509:
-                    return MongoCredential.createMongoX509Credential(user);
-                case GSSAPI:
-                    return MongoCredential.createGSSAPICredential(user);
-                default:
-                    throw SeedException.createNew(MongoDbErrorCode.UNSUPPORTED_AUTHENTICATION_MECHANISM)
-                            .put("clientName", clientName)
-                            .put("mechanism", authenticationMechanism.getMechanismName());
-            }
-        } else {
-            return MongoCredential.createCredential(
-                    user,
-                    source,
-                    password.toCharArray()
-            );
-        }
-    }
-
     private static class AllOptions {
-        private BuilderSupplier<MongoClientOptions.Builder> options = BuilderSupplier.of(MongoClientOptions.builder());
+        private BuilderSupplier<MongoClientSettings.Builder> options = BuilderSupplier
+                .of(MongoClientSettings.builder());
     }
 }
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
index 72bf828..4006d60 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
@@ -7,19 +7,21 @@
  */
 package org.seedstack.mongodb.internal;
 
-import io.nuun.kernel.api.plugin.InitState;
-import io.nuun.kernel.api.plugin.context.InitContext;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
 import org.seedstack.coffig.Coffig;
 import org.seedstack.mongodb.MongoDbConfig;
+import org.seedstack.mongodb.MongoDbConfig.ClientConfig;
 import org.seedstack.seed.SeedException;
 import org.seedstack.seed.core.internal.AbstractSeedPlugin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import io.nuun.kernel.api.plugin.InitState;
+import io.nuun.kernel.api.plugin.context.InitContext;
 
 public class MongoDbPlugin extends AbstractSeedPlugin {
     private static final Logger LOGGER = LoggerFactory.getLogger(MongoDbPlugin.class);
@@ -47,9 +49,9 @@ public InitState initialize(InitContext initContext) {
 
             MONGO_DB_MANAGER.registerClient(clientName, clientConfig, coffig);
 
-            for (Map.Entry<String, MongoDbConfig.ClientConfig.DatabaseConfig> dbEntry : clientConfig.getDatabases().entrySet()) {
+            for (Map.Entry<String, ClientConfig.DatabaseConfig> dbEntry : clientConfig.getDatabases().entrySet()) {
                 String dbName = dbEntry.getKey();
-                MongoDbConfig.ClientConfig.DatabaseConfig dbConfig = dbEntry.getValue();
+                ClientConfig.DatabaseConfig dbConfig = dbEntry.getValue();
                 String alias = Optional.ofNullable(dbConfig.getAlias()).orElse(dbName);
 
                 if (allDbNames.contains(alias)) {
diff --git a/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java b/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
index d2a54e0..5c57bd9 100644
--- a/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
+++ b/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
@@ -9,7 +9,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoDatabase;
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/pom.xml b/pom.xml
index 3cb5ebb..ed72ff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.poms</groupId>
         <artifactId>parent-internal</artifactId>
-        <version>4.0.1</version>
+        <version>4.0.2</version>
     </parent>
 
     <groupId>org.seedstack.addons.mongodb</groupId>
@@ -23,9 +23,9 @@
     <packaging>pom</packaging>
 
     <properties>
-        <seed.version>3.12.0</seed.version>
-        <mongodb.version>4.1.1</mongodb.version>
-        <morphia.version>1.6.1</morphia.version>
+        <seed.version>3.14.0</seed.version>
+        <mongodb.version>5.0.1</mongodb.version>
+        <morphia.version>2.4.13</morphia.version>
         <business.version>4.4.0</business.version>
 
         <compatibility.skip>true</compatibility.skip>

From 937f324ebce6ff1a6afb2ed1bc01ef94e1bbae87 Mon Sep 17 00:00:00 2001
From: Xian Boullosa <xian.boullosa@ctag.com>
Date: Fri, 26 Apr 2024 18:55:11 +0200
Subject: [PATCH 2/4] wip: Upgrade Morphia to 2.4 and MongoDriver to 5.0.1

fix: prevent exceptions due to collection being droped before indexes

fix: Uses RegexFilter built-in options instead of pattern options (they're ignored by morphia)

fix: Duplicate call to not (provoking a StackOverflowException)

fix: License headers

wip: Validation and Guice integration

fix: ValidatingEntityInterceptor is now working globally
---
 checkstyle.xml                                |   2 +-
 core/pom.xml                                  |   2 +-
 .../org/seedstack/mongodb/MongoDbConfig.java  |   2 +-
 .../mongodb/internal/MongoDbErrorCode.java    |   2 +-
 .../mongodb/internal/MongoDbManager.java      |   2 +-
 .../mongodb/internal/MongoDbModule.java       |   2 +-
 .../mongodb/internal/MongoDbPlugin.java       |   2 +-
 .../mongodb/MongoDbConfig.properties          |   2 +-
 .../internal/MongoDbErrorCode.properties      |   2 +-
 .../java/org/seedstack/mongodb/MongoDbIT.java |   2 +-
 core/src/test/resources/application.yaml      |   2 +-
 morphia/pom.xml                               |  13 +-
 .../morphia/BaseMorphiaRepository.java        | 112 +++++----
 .../seedstack/mongodb/morphia/Morphia.java    |   2 +-
 .../mongodb/morphia/MorphiaConfig.java        |   2 +-
 .../mongodb/morphia/MorphiaDatastore.java     |   2 +-
 .../morphia/internal/DatastoreFactory.java    |  39 ++--
 .../morphia/internal/DatastoreImpl.java       |   2 +-
 .../morphia/internal/DatastoreProvider.java   |   2 +-
 .../morphia/internal/DatastoreWrapper.java    |  18 ++
 .../internal/DefaultMorphiaRepository.java    |   2 +-
 .../morphia/internal/MorphiaErrorCode.java    |   2 +-
 .../morphia/internal/MorphiaModule.java       |  25 +-
 .../morphia/internal/MorphiaPlugin.java       |  68 ++++--
 .../morphia/internal/MorphiaPredicates.java   |  21 +-
 .../morphia/internal/MorphiaUtils.java        |   2 +-
 .../internal/ValidatingEntityInterceptor.java |  28 ++-
 .../specification/MorphiaAndConverter.java    |  23 +-
 .../MorphiaAttributeConverter.java            |  11 +-
 .../specification/MorphiaEqualConverter.java  |  19 +-
 .../specification/MorphiaFalseConverter.java  |  14 +-
 .../MorphiaGreaterThanConverter.java          |  13 +-
 .../MorphiaIdentityConverter.java             |  16 +-
 .../MorphiaLessThanConverter.java             |  12 +-
 .../specification/MorphiaNotConverter.java    |  14 +-
 .../specification/MorphiaOrConverter.java     |  26 ++-
 .../MorphiaSpecificationTranslator.java       |  13 +-
 .../specification/MorphiaStringConverter.java |  34 ++-
 .../MorphiaStringEqualConverter.java          |   3 +-
 .../MorphiaStringMatchingConverter.java       |   2 +-
 .../MorphiaTranslationContext.java            |  28 +--
 .../specification/MorphiaTrueConverter.java   |  14 +-
 .../internal/MorphiaErrorCode.properties      |   2 +-
 .../seedstack/mongodb/morphia/MorphiaIT.java  |  21 +-
 .../mongodb/morphia/MorphiaRepositoryIT.java  |   2 +-
 .../mongodb/morphia/SpecificationIT.java      |   2 +-
 .../morphia/fixtures/dummyobject/Dummy1.java  |   2 +-
 .../morphia/fixtures/dummyobject/Dummy2.java  |   2 +-
 .../morphia/fixtures/dummyobject/Dummy3.java  |   2 +-
 .../morphia/fixtures/dummyobject/Dummy4.java  |   2 +-
 .../morphia/fixtures/dummyobject/Dummy5.java  |   2 +-
 .../morphia/fixtures/dummyobject/Dummy6.java  |   2 +-
 .../morphia/fixtures/product/Picture.java     |  11 +-
 .../morphia/fixtures/product/PictureURL.java  |   8 +-
 .../morphia/fixtures/product/Product.java     |   2 +-
 .../morphia/fixtures/user/Address.java        |   7 +-
 .../mongodb/morphia/fixtures/user/User.java   |   9 +-
 morphia/src/test/resources/application.yaml   |   2 +-
 pom.xml                                       | 217 ++++++++++--------
 59 files changed, 518 insertions(+), 381 deletions(-)
 create mode 100644 morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java

diff --git a/checkstyle.xml b/checkstyle.xml
index 1636763..a43fe73 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/pom.xml b/core/pom.xml
index c321463..4d82784 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java b/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java
index 1a0e7b0..175f8eb 100644
--- a/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java
+++ b/core/src/main/java/org/seedstack/mongodb/MongoDbConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java
index cfd4aab..20a1627 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbErrorCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
index 416a119..87b7a78 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java
index 0e865f2..85facf3 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
index 4006d60..8ec46ac 100644
--- a/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
+++ b/core/src/main/java/org/seedstack/mongodb/internal/MongoDbPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties b/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties
index 5d35148..8e2c8f7 100644
--- a/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties
+++ b/core/src/main/resources/org/seedstack/mongodb/MongoDbConfig.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties b/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties
index ac00c07..b7c3367 100644
--- a/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties
+++ b/core/src/main/resources/org/seedstack/mongodb/internal/MongoDbErrorCode.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java b/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
index 5c57bd9..cc08516 100644
--- a/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
+++ b/core/src/test/java/org/seedstack/mongodb/MongoDbIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/core/src/test/resources/application.yaml b/core/src/test/resources/application.yaml
index 9b3367e..c59b004 100644
--- a/core/src/test/resources/application.yaml
+++ b/core/src/test/resources/application.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/pom.xml b/morphia/pom.xml
index f756567..2830232 100644
--- a/morphia/pom.xml
+++ b/morphia/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -33,18 +33,17 @@
         </dependency>
         <dependency>
             <groupId>dev.morphia.morphia</groupId>
-            <artifactId>core</artifactId>
-            <version>${morphia.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>dev.morphia.morphia</groupId>
-            <artifactId>logging-slf4j</artifactId>
+            <artifactId>morphia-core</artifactId>
             <version>${morphia.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-api</artifactId>
                 </exclusion>
+                <exclusion>
+                  <groupId>org.mongodb</groupId>
+                  <artifactId>mongodb-driver-legacy</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
index 08baf0b..ee307b9 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,22 +10,15 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Spliterators.spliteratorUnknownSize;
 
-import com.mongodb.DBCollection;
-import dev.morphia.Datastore;
-import dev.morphia.query.CountOptions;
-import dev.morphia.query.CriteriaContainer;
-import dev.morphia.query.FindOptions;
-import dev.morphia.query.Query;
-import dev.morphia.query.Sort;
-import dev.morphia.query.internal.MorphiaCursor;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.Spliterator;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+
 import javax.inject.Inject;
+
 import org.seedstack.business.domain.AggregateExistsException;
 import org.seedstack.business.domain.AggregateNotFoundException;
 import org.seedstack.business.domain.AggregateRoot;
@@ -37,18 +30,39 @@
 import org.seedstack.business.spi.SpecificationTranslator;
 import org.seedstack.mongodb.morphia.internal.DatastoreFactory;
 import org.seedstack.mongodb.morphia.internal.specification.MorphiaTranslationContext;
+import org.seedstack.seed.Logging;
+import org.slf4j.Logger;
+
+import com.mongodb.client.MongoCollection;
+
+import dev.morphia.Datastore;
+import dev.morphia.DeleteOptions;
+import dev.morphia.query.CountOptions;
+import dev.morphia.query.FindOptions;
+import dev.morphia.query.MorphiaCursor;
+import dev.morphia.query.Query;
+import dev.morphia.query.Sort;
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
- * This class can serve as a base class for Morphia repositories. It provides methods for common CRUD operations as
- * well as access to the data store through the {@link #getDatastore()} ()} protected method.
+ * This class can serve as a base class for Morphia repositories. It provides methods for common
+ * CRUD operations as well as access to the data store through the {@link #getDatastore()} ()}
+ * protected method.
  *
- * @param <A>  Aggregate root class.
- * @param <ID> Identifier class.
+ * @param <A>
+ *            Aggregate root class.
+ * @param <ID>
+ *            Identifier class.
  */
 public abstract class BaseMorphiaRepository<A extends AggregateRoot<ID>, ID> extends BaseRepository<A, ID> {
     public static final String ID_KEY = "_id";
     private Datastore datastore;
-    private SpecificationTranslator<MorphiaTranslationContext, CriteriaContainer> specificationTranslator;
+    private SpecificationTranslator<MorphiaTranslationContext, Filter> specificationTranslator;
+
+    @Logging
+    private Logger logger;
 
     public BaseMorphiaRepository() {
 
@@ -61,7 +75,7 @@ public BaseMorphiaRepository(Class<A> aggregateRootClass, Class<ID> kClass) {
     @Inject
     @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Called by Guice")
     private void init(DatastoreFactory datastoreFactory,
-            SpecificationTranslator<MorphiaTranslationContext, CriteriaContainer> specificationTranslator) {
+            SpecificationTranslator<MorphiaTranslationContext, Filter> specificationTranslator) {
         this.datastore = datastoreFactory.createDatastore(getAggregateRootClass());
         this.specificationTranslator = specificationTranslator;
     }
@@ -82,14 +96,14 @@ public void add(A aggregate) throws AggregateExistsException {
 
     @Override
     public Stream<A> get(Specification<A> specification, Option... options) {
-        final MorphiaCursor<A> cursor = buildQuery(specification, options).find(buildFindOptions(options));
+        MorphiaCursor<A> cursor = buildQuery(specification).iterator(buildFindOptions(options));
         return StreamSupport.stream(spliteratorUnknownSize(cursor, Spliterator.ORDERED), false)
                 .onClose(cursor::close);
     }
 
     @Override
     public Optional<A> get(ID id) {
-        return Optional.ofNullable(datastore.find(getAggregateRootClass()).filter(ID_KEY, id).first());
+        return Optional.ofNullable(datastore.find(getAggregateRootClass()).filter(Filters.eq(ID_KEY, id)).first());
     }
 
     @Override
@@ -99,7 +113,7 @@ public boolean contains(Specification<A> specification) {
 
     @Override
     public boolean contains(ID id) {
-        return datastore.find(getAggregateRootClass()).filter(ID_KEY, id).count(new CountOptions().limit(1)) > 0;
+        return this.get(id).isPresent();
     }
 
     @Override
@@ -109,22 +123,22 @@ public long count(Specification<A> specification) {
 
     @Override
     public long size() {
-        return datastore.createQuery(getAggregateRootClass()).count();
+        return datastore.find(getAggregateRootClass()).count();
     }
 
     @Override
     public long remove(Specification<A> specification) throws AggregateNotFoundException {
-        return datastore.delete(buildQuery(specification)).getN();
+        return buildQuery(specification).delete(new DeleteOptions().multi(true)).getDeletedCount();
     }
 
     @Override
     public void remove(ID id) throws AggregateNotFoundException {
-        checkExactlyOneAggregateRemoved(
-                datastore.delete(datastore.find(getAggregateRootClass()).filter(ID_KEY, id)).getN(),
-                id);
+        long deletedCount = datastore.find(getAggregateRootClass()).filter(Filters.eq(ID_KEY, id)).delete()
+                .getDeletedCount();
+        checkExactlyOneAggregateRemoved(deletedCount, id);
     }
 
-    private void checkExactlyOneAggregateRemoved(int n, ID id) {
+    private void checkExactlyOneAggregateRemoved(long n, ID id) {
         if (n == 0) {
             throw new AggregateNotFoundException("Non-existent aggregate " + getAggregateRootClass()
                     .getSimpleName() + " identified with " + id + " cannot be removed");
@@ -152,23 +166,18 @@ public A addOrUpdate(A aggregate) {
 
     @Override
     public void clear() {
-        DBCollection collection = datastore.getCollection(getAggregateRootClass());
-        collection.drop();
+        MongoCollection<A> collection = datastore.getCollection(getAggregateRootClass());
         collection.dropIndexes();
+        collection.drop();
     }
 
-    private Query<A> buildQuery(Specification<A> specification, Option... options) {
-        Query<A> query = datastore.createQuery(getAggregateRootClass());
-        specificationTranslator.translate(
+    private Query<A> buildQuery(Specification<A> specification) {
+        Query<A> query = datastore.find(getAggregateRootClass());
+        Filter filter = specificationTranslator.translate(
                 specification,
-                new MorphiaTranslationContext<>(query)
-        );
-        for (Option option : options) {
-            if (option instanceof SortOption) {
-                applySort(query, ((SortOption) option));
-            }
-        }
-        return query;
+                new MorphiaTranslationContext<>(query));
+        logger.info("Querying {} with filter {}",getAggregateRootClass(),filter);
+        return query.filter(filter);
     }
 
     private FindOptions buildFindOptions(Option... options) {
@@ -178,6 +187,8 @@ private FindOptions buildFindOptions(Option... options) {
                 applyOffset(findOptions, ((OffsetOption) option));
             } else if (option instanceof LimitOption) {
                 applyLimit(findOptions, ((LimitOption) option));
+            } else if (option instanceof SortOption) {
+                applySort(findOptions, ((SortOption) option));
             }
         }
         return findOptions;
@@ -197,21 +208,22 @@ private void applyLimit(FindOptions findOptions, LimitOption limitOption) {
         findOptions.limit((int) limit);
     }
 
-    private void applySort(Query<?> query, SortOption sortOption) {
+    private void applySort(FindOptions findOptions, SortOption sortOption) {
         List<Sort> sorts = new ArrayList<>();
         for (SortOption.SortedAttribute sortedAttribute : sortOption.getSortedAttributes()) {
             switch (sortedAttribute.getDirection()) {
-                case ASCENDING:
-                    sorts.add(Sort.ascending(sortedAttribute.getAttribute()));
-                    break;
-                case DESCENDING:
-                    sorts.add(Sort.descending(sortedAttribute.getAttribute()));
-                    break;
-                default:
-                    throw new IllegalArgumentException(
-                            "Unsupported sort direction " + sortedAttribute.getDirection());
+            case ASCENDING:
+                sorts.add(Sort.ascending(sortedAttribute.getAttribute()));
+                break;
+            case DESCENDING:
+                sorts.add(Sort.descending(sortedAttribute.getAttribute()));
+                break;
+            default:
+                throw new IllegalArgumentException(
+                        "Unsupported sort direction " + sortedAttribute.getDirection());
             }
         }
-        query.order(sorts.toArray(new Sort[0]));
+
+        findOptions.sort(sorts.toArray(new Sort[0]));
     }
-}
\ No newline at end of file
+}
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java
index 7bebb4f..a3af8c6 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/Morphia.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaConfig.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaConfig.java
index 3b2eda4..483bff6 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaConfig.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java
index 227f395..aec75a2 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/MorphiaDatastore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
index f374619..50bb987 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,30 +7,34 @@
  */
 package org.seedstack.mongodb.morphia.internal;
 
+import static org.seedstack.mongodb.morphia.internal.MorphiaUtils.createDatastoreAnnotation;
+import static org.seedstack.mongodb.morphia.internal.MorphiaUtils.getMongoClientConfig;
+
+import java.util.Arrays;
+
+import javax.inject.Inject;
+
+import org.seedstack.mongodb.morphia.MorphiaDatastore;
+import org.seedstack.seed.Application;
+
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.name.Names;
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+
 import dev.morphia.Datastore;
 import dev.morphia.Morphia;
-import org.seedstack.mongodb.morphia.MorphiaDatastore;
-import org.seedstack.seed.Application;
-
-import javax.inject.Inject;
-
-import static org.seedstack.mongodb.morphia.internal.MorphiaUtils.createDatastoreAnnotation;
-import static org.seedstack.mongodb.morphia.internal.MorphiaUtils.getMongoClientConfig;
 
 public class DatastoreFactory {
     private final Application application;
     private final Injector injector;
-    private final Morphia morphia;
+    private final ValidatingEntityInterceptor validationInterceptor;
 
     @Inject
-    DatastoreFactory(Application application, Injector injector, Morphia morphia) {
+    DatastoreFactory(Application application, Injector injector, ValidatingEntityInterceptor validationInterceptor) {
         this.application = application;
         this.injector = injector;
-        this.morphia = morphia;
+        this.validationInterceptor = validationInterceptor;
     }
 
     public Datastore createDatastore(Class<?> morphiaClass) {
@@ -42,12 +46,9 @@ public Datastore createDatastore(MorphiaDatastore datastoreAnnotation) {
     }
 
     public Datastore createDatastore(String clientName, String dbName) {
-        return morphia.createDatastore(
-                injector.getInstance(Key.get(MongoClient.class, Names.named(clientName))),
-                MorphiaUtils.resolveDatabaseAlias(
-                        getMongoClientConfig(application, clientName),
-                        dbName
-                )
-        );
+        MongoClient client = injector.getInstance(Key.get(MongoClient.class, Names.named(clientName)));
+        String dbAlias = MorphiaUtils.resolveDatabaseAlias(getMongoClientConfig(application, clientName), dbName);
+
+        return new DatastoreWrapper(Morphia.createDatastore(client, dbAlias), Arrays.asList(validationInterceptor));
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreImpl.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreImpl.java
index ae32854..3994fd1 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreImpl.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreProvider.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreProvider.java
index 623d2a2..0dddf50 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreProvider.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java
new file mode 100644
index 0000000..818e837
--- /dev/null
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java
@@ -0,0 +1,18 @@
+package org.seedstack.mongodb.morphia.internal;
+
+import java.util.Collection;
+
+import dev.morphia.Datastore;
+import dev.morphia.DatastoreImpl;
+import dev.morphia.EntityListener;
+
+class DatastoreWrapper extends DatastoreImpl {
+
+    public DatastoreWrapper(Datastore datastore, Collection<EntityListener<?>> extraListeners) {
+        super((DatastoreImpl) datastore);
+        // TODO: Find a way to wrap mapper instead of adding an interceptor
+        extraListeners.forEach(listener -> getMapper().addInterceptor(listener));
+
+    }
+
+}
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DefaultMorphiaRepository.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DefaultMorphiaRepository.java
index f70bdab..2e7bf26 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DefaultMorphiaRepository.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DefaultMorphiaRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.java
index 680e5ad..188d6f6 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java
index e75cc88..d70ebc3 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,28 +11,33 @@
 
 package org.seedstack.mongodb.morphia.internal;
 
+import java.util.Collection;
+
+import org.seedstack.mongodb.morphia.MorphiaDatastore;
+
 import com.google.inject.AbstractModule;
 import com.google.inject.Key;
 import com.google.inject.Scopes;
-import java.util.Collection;
-import java.util.Collection;
+
 import dev.morphia.Datastore;
-import dev.morphia.Morphia;
-import org.seedstack.mongodb.morphia.MorphiaDatastore;
+
 class MorphiaModule extends AbstractModule {
     private final Collection<MorphiaDatastore> morphiaDatastoresAnnotation;
-    private final Morphia morphia;
+    private final Collection<Class<?>> morphiaEntityListeners;
 
-    MorphiaModule(Collection<MorphiaDatastore> morphiaDatastoresAnnotation, Morphia morphia) {
+    MorphiaModule(Collection<MorphiaDatastore> morphiaDatastoresAnnotation,
+            Collection<Class<?>> morphiaEntityListeners) {
         super();
         this.morphiaDatastoresAnnotation = morphiaDatastoresAnnotation;
-        this.morphia = morphia;
+        this.morphiaEntityListeners = morphiaEntityListeners;
+
     }
 
     @Override
     protected void configure() {
-        bind(Morphia.class).toInstance(morphia);
         bind(DatastoreFactory.class);
+        bind(ValidatingEntityInterceptor.class);
+
         if (morphiaDatastoresAnnotation != null && !morphiaDatastoresAnnotation.isEmpty()) {
             for (MorphiaDatastore morphiaDatastore : morphiaDatastoresAnnotation) {
                 DatastoreProvider datastoreProvider = new DatastoreProvider(morphiaDatastore);
@@ -40,6 +45,6 @@ protected void configure() {
                 bind(Key.get(Datastore.class, morphiaDatastore)).toProvider(datastoreProvider).in(Scopes.SINGLETON);
             }
         }
-        morphia.getMapper().getInterceptors().forEach(this::requestInjection);
+
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
index 289584a..9ab1134 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,12 +7,12 @@
  */
 package org.seedstack.mongodb.morphia.internal;
 
-import com.google.common.collect.Lists;
-import dev.morphia.Morphia;
-import io.nuun.kernel.api.plugin.InitState;
-import io.nuun.kernel.api.plugin.context.Context;
-import io.nuun.kernel.api.plugin.context.InitContext;
-import io.nuun.kernel.api.plugin.request.ClasspathScanRequest;
+import java.util.Collection;
+import java.util.HashSet;
+
+import javax.inject.Inject;
+
+import org.seedstack.mongodb.internal.MongoDbPlugin;
 import org.seedstack.mongodb.morphia.MorphiaConfig;
 import org.seedstack.mongodb.morphia.MorphiaDatastore;
 import org.seedstack.seed.Application;
@@ -22,9 +22,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import java.util.Collection;
-import java.util.HashSet;
+import com.google.common.collect.Lists;
+
+import io.nuun.kernel.api.plugin.InitState;
+import io.nuun.kernel.api.plugin.context.Context;
+import io.nuun.kernel.api.plugin.context.InitContext;
+import io.nuun.kernel.api.plugin.request.ClasspathScanRequest;
 
 /**
  * This plugin manages the MongoDb Morphia object/document mapping library.
@@ -32,7 +35,7 @@
 public class MorphiaPlugin extends AbstractSeedPlugin {
     private static final Logger LOGGER = LoggerFactory.getLogger(MorphiaPlugin.class);
     private final Collection<MorphiaDatastore> morphiaDatastores = new HashSet<>();
-    private final Morphia morphia = new Morphia();
+    private final Collection<Class<?>> morphiaListeners = new HashSet<>();
     private MorphiaConfig config;
     @Inject
     private DatastoreFactory datastoreFactory;
@@ -44,13 +47,14 @@ public String name() {
 
     @Override
     public Collection<Class<?>> dependencies() {
-        return Lists.newArrayList(ValidationPlugin.class);
+        return Lists.newArrayList(ValidationPlugin.class, MongoDbPlugin.class);
     }
 
     @Override
     public Collection<ClasspathScanRequest> classpathScanRequests() {
         return classpathScanRequestBuilder()
                 .predicate(MorphiaPredicates.PERSISTED_CLASSES)
+                .predicate(MorphiaPredicates.ENTITY_LISTENERS)
                 .build();
     }
 
@@ -59,21 +63,45 @@ public InitState initialize(InitContext initContext) {
         Application application = getApplication();
         config = application.getConfiguration().get(MorphiaConfig.class);
 
-        if (ValidationManager.get().getValidationLevel() != ValidationManager.ValidationLevel.NONE) {
+        boolean validationActive = ValidationManager.get()
+                .getValidationLevel() != ValidationManager.ValidationLevel.NONE;
+
+        if (validationActive) {
             LOGGER.info("Validation is enabled on Morphia entities");
-            morphia.getMapper().addInterceptor(new ValidatingEntityInterceptor());
+        } else {
+            LOGGER.info("Validation is disabled on Morphia entities");
         }
 
-        Collection<Class<?>> morphiaScannedClasses = initContext.scannedTypesByPredicate()
+        Collection<Class<?>> morphiaPersistedClasses = initContext.scannedTypesByPredicate()
                 .get(MorphiaPredicates.PERSISTED_CLASSES);
-        if (morphiaScannedClasses != null && !morphiaScannedClasses.isEmpty()) {
-            morphia.map(new HashSet<>(morphiaScannedClasses));
-            for (Class<?> morphiaClass : morphiaScannedClasses) {
+
+        if (morphiaPersistedClasses != null && !morphiaPersistedClasses.isEmpty()) {
+            LOGGER.info("Creating datastore for {} persisted classes ", morphiaPersistedClasses.size());
+            for (Class<?> morphiaClass : morphiaPersistedClasses) {
                 MorphiaDatastore morphiaDatastore = MorphiaUtils.createDatastoreAnnotation(application, morphiaClass);
                 if (!morphiaDatastores.contains(morphiaDatastore)) {
+
                     morphiaDatastores.add(morphiaDatastore);
                 }
             }
+        } else {
+            LOGGER.info("No persisted classes found");
+        }
+
+        if (!validationActive) {
+            return InitState.INITIALIZED;
+        }
+
+        
+        
+        Collection<Class<?>> morphiaEntityListeners = initContext.scannedTypesByPredicate()
+                .get(MorphiaPredicates.ENTITY_LISTENERS);
+
+        if (morphiaEntityListeners != null && !morphiaEntityListeners.isEmpty()) {
+            LOGGER.info("Found {} entity listeners", morphiaEntityListeners.size());
+            morphiaListeners.addAll(morphiaEntityListeners);
+        } else {
+            LOGGER.info("No entity listeners found");
         }
 
         return InitState.INITIALIZED;
@@ -97,6 +125,6 @@ public void start(Context context) {
 
     @Override
     public Object nativeUnitModule() {
-        return new MorphiaModule(morphiaDatastores, morphia);
+        return new MorphiaModule(morphiaDatastores, morphiaListeners);
     }
-}
\ No newline at end of file
+}
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPredicates.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPredicates.java
index c4cc8fe..2612ea4 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPredicates.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,20 +7,25 @@
  */
 package org.seedstack.mongodb.morphia.internal;
 
-import dev.morphia.annotations.Embedded;
-import dev.morphia.annotations.Entity;
+import static org.seedstack.shed.reflect.AnnotationPredicates.elementAnnotatedWith;
+import static org.seedstack.shed.reflect.ClassPredicates.classImplements;
+import static org.seedstack.shed.reflect.ClassPredicates.classIsInterface;
+import static org.seedstack.shed.reflect.ClassPredicates.classModifierIs;
 
 import java.lang.reflect.Modifier;
 import java.util.function.Predicate;
 
-import static org.seedstack.shed.reflect.AnnotationPredicates.elementAnnotatedWith;
-import static org.seedstack.shed.reflect.ClassPredicates.classIsInterface;
-import static org.seedstack.shed.reflect.ClassPredicates.classModifierIs;
+import dev.morphia.EntityListener;
+import dev.morphia.annotations.Embedded;
+import dev.morphia.annotations.Entity;
 
 class MorphiaPredicates {
     static Predicate<Class<?>> PERSISTED_CLASSES = classIsInterface().negate()
             .and(classModifierIs(Modifier.ABSTRACT).negate())
             .and(elementAnnotatedWith(Entity.class, false)
-                    .or(elementAnnotatedWith(Embedded.class, false))
-            );
+                    .or(elementAnnotatedWith(Embedded.class, false)));
+
+    static Predicate<Class<?>> ENTITY_LISTENERS = classIsInterface().negate()
+            .and(classModifierIs(Modifier.ABSTRACT).negate())
+            .and(classImplements(EntityListener.class));
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaUtils.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaUtils.java
index 03a5f0a..59bb2f6 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaUtils.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java
index 5408df2..2f3c627 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,24 +7,38 @@
  */
 package org.seedstack.mongodb.morphia.internal;
 
-import com.mongodb.DBObject;
+import java.lang.annotation.Annotation;
 import java.util.Set;
+
 import javax.inject.Inject;
 import javax.validation.ConstraintViolation;
 import javax.validation.ValidatorFactory;
+
+import org.bson.Document;
 import org.seedstack.seed.core.internal.validation.VerboseConstraintViolationException;
-import dev.morphia.AbstractEntityInterceptor;
-import dev.morphia.mapping.Mapper;
 
-class ValidatingEntityInterceptor extends AbstractEntityInterceptor {
+import dev.morphia.Datastore;
+import dev.morphia.EntityListener;
+import dev.morphia.annotations.PrePersist;
+
+class ValidatingEntityInterceptor implements EntityListener<Object> {
+
     @Inject
     private ValidatorFactory validatorFactory;
 
     @Override
-    public void prePersist(final Object ent, final DBObject dbObj, final Mapper mapper) {
-        Set<ConstraintViolation<Object>> result = validatorFactory.getValidator().validate(ent);
+    @PrePersist
+    public void prePersist(Object entity, Document document, Datastore datastore) {
+
+        Set<ConstraintViolation<Object>> result = validatorFactory.getValidator().validate(entity);
         if (!result.isEmpty()) {
             throw new VerboseConstraintViolationException(result);
         }
+
+    }
+
+    @Override
+    public boolean hasAnnotation(Class<? extends Annotation> type) {
+        return PrePersist.class.equals(type);
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java
index 0437c30..5f2248c 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAndConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,19 +8,22 @@
 package org.seedstack.mongodb.morphia.internal.specification;
 
 import java.util.Arrays;
-import dev.morphia.query.Criteria;
-import dev.morphia.query.CriteriaContainer;
+
 import org.seedstack.business.specification.AndSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 
-class MorphiaAndConverter implements SpecificationConverter<AndSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+
+class MorphiaAndConverter implements SpecificationConverter<AndSpecification<?>, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(AndSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
-        return context.getQuery().and(
-                Arrays.stream(specification.getSpecifications())
-                        .map(spec -> translator.translate(spec, new MorphiaTranslationContext<>(context)))
-                        .toArray(Criteria[]::new)
-        );
+    public Filter convert(AndSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
+        Filter[] criterias = Arrays.stream(specification
+                .getSpecifications())
+                .map(spec -> translator.translate(spec, new MorphiaTranslationContext<>(context)))
+                .toArray(Filter[]::new);
+
+        return Filters.and(criterias);
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java
index a51bfb0..5b82082 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaAttributeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,14 +7,17 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.AttributeSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 
-class MorphiaAttributeConverter implements SpecificationConverter<AttributeSpecification<?, ?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+import dev.morphia.query.filters.Filter;
+
+class MorphiaAttributeConverter
+        implements SpecificationConverter<AttributeSpecification<?, ?>, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(AttributeSpecification<?, ?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
+    public Filter convert(AttributeSpecification<?, ?> specification, MorphiaTranslationContext<?> context,
+            SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
         context.setProperty(specification.getPath());
         return translator.translate(specification.getValueSpecification(), context);
     }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java
index d749c78..edb77a1 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaEqualConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,21 +7,24 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.EqualSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+
+class MorphiaEqualConverter
+        implements SpecificationConverter<EqualSpecification<?>, MorphiaTranslationContext<?>, Filter> {
 
-class MorphiaEqualConverter implements SpecificationConverter<EqualSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
     @Override
-    public CriteriaContainer convert(EqualSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
+    public Filter convert(EqualSpecification<?> specification,
+            MorphiaTranslationContext<?> context,
+            SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
         if (specification.getExpectedValue() == null) {
-            return context.pickFieldEnd().doesNotExist();
+            return Filters.exists(context.getProperty()).not();
         } else {
-            // We avoid using equal() because Morphia optimizes it without operator ("someAttr": "someVal")
-            // Thus generating an invalid query when trying to negate it ("$not": "someVal")
-            return context.pickFieldEnd().not().notEqual(specification.getExpectedValue());
+            return Filters.eq(context.getProperty(), specification.getExpectedValue());
         }
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java
index 630b05c..3c649ff 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaFalseConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,16 +7,20 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.FalseSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 import org.seedstack.mongodb.morphia.BaseMorphiaRepository;
 
-class MorphiaFalseConverter implements SpecificationConverter<FalseSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+
+class MorphiaFalseConverter
+        implements SpecificationConverter<FalseSpecification<?>, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(FalseSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
+    public Filter convert(FalseSpecification<?> specification, MorphiaTranslationContext<?> context,
+            SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
         // Always false
-        return context.getQuery().criteria(BaseMorphiaRepository.ID_KEY).doesNotExist();
+        return Filters.exists(BaseMorphiaRepository.ID_KEY).not();
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java
index 6ddafca..decaca5 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaGreaterThanConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,15 +7,18 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.GreaterThanSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
 
-class MorphiaGreaterThanConverter<V extends Comparable<? super V>> implements SpecificationConverter<GreaterThanSpecification<V>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaGreaterThanConverter<V extends Comparable<? super V>>
+        implements SpecificationConverter<GreaterThanSpecification<V>, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(GreaterThanSpecification<V> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
-        return context.pickFieldEnd().greaterThan(specification.getExpectedValue());
+    public Filter convert(GreaterThanSpecification<V> specification, MorphiaTranslationContext<?> context,
+            SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
+        return Filters.gt(context.getProperty(), specification.getExpectedValue());
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java
index d974745..b25c61b 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaIdentityConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,18 +7,20 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.IdentitySpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 import org.seedstack.mongodb.morphia.BaseMorphiaRepository;
 
-class MorphiaIdentityConverter implements SpecificationConverter<IdentitySpecification<?, ?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+
+class MorphiaIdentityConverter
+        implements SpecificationConverter<IdentitySpecification<?, ?>, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(IdentitySpecification<?, ?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
+    public Filter convert(IdentitySpecification<?, ?> specification, MorphiaTranslationContext<?> context,
+            SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
         context.setProperty(BaseMorphiaRepository.ID_KEY);
-        // We avoid using equal() because Morphia optimizes it without operator ("someAttr": "someVal")
-        // Thus generating an invalid query when trying to negate it ("$not": "someVal")
-        return context.pickFieldEnd().not().notEqual(specification.getExpectedIdentifier());
+        return Filters.eq(context.getProperty(), specification.getExpectedIdentifier());
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java
index 636b4a8..f3327fa 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaLessThanConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,15 +7,17 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.LessThanSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
 
-class MorphiaLessThanConverter<V extends Comparable<? super V>> implements SpecificationConverter<LessThanSpecification<V>, MorphiaTranslationContext<?>, CriteriaContainer> {
+class MorphiaLessThanConverter<V extends Comparable<? super V>>
+        implements SpecificationConverter<LessThanSpecification<V>, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(LessThanSpecification<V> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
-        return context.pickFieldEnd().lessThan(specification.getExpectedValue());
+    public Filter convert(LessThanSpecification<V> specification, MorphiaTranslationContext<?> context,SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
+        return Filters.lt(context.getProperty(), specification.getExpectedValue());
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java
index cdd2db1..e6d9adc 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaNotConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,15 +7,17 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.NotSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 
-class MorphiaNotConverter implements SpecificationConverter<NotSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+import dev.morphia.query.filters.Filter;
+
+class MorphiaNotConverter
+        implements SpecificationConverter<NotSpecification<?>, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(NotSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
-        context.not();
-        return translator.translate(specification.getSpecification(), context);
+    public Filter convert(NotSpecification<?> specification, MorphiaTranslationContext<?> context,
+            SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
+        return translator.translate(specification.getSpecification(), context).not();
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java
index 4cd1337..442250f 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaOrConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,19 +8,25 @@
 package org.seedstack.mongodb.morphia.internal.specification;
 
 import java.util.Arrays;
-import dev.morphia.query.Criteria;
-import dev.morphia.query.CriteriaContainer;
+
 import org.seedstack.business.specification.OrSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 
-class MorphiaOrConverter implements SpecificationConverter<OrSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+
+class MorphiaOrConverter implements SpecificationConverter<OrSpecification<?>, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(OrSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
-        return context.getQuery().or(
-                Arrays.stream(specification.getSpecifications())
-                        .map(spec -> translator.translate(spec, new MorphiaTranslationContext<>(context)))
-                        .toArray(Criteria[]::new)
-        );
+    public Filter convert(OrSpecification<?> specification, MorphiaTranslationContext<?> context,
+            SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
+
+        Filter[] criterias = Arrays.stream(specification
+                .getSpecifications())
+                .map(spec -> translator.translate(spec, new MorphiaTranslationContext<>(context)))
+                .toArray(Filter[]::new);
+
+        return Filters.or(criterias);
+
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java
index 7ea2c49..5a59415 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaSpecificationTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,13 +7,16 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.Specification;
 import org.seedstack.business.spi.BaseSpecificationTranslator;
 
-class MorphiaSpecificationTranslator extends BaseSpecificationTranslator<MorphiaTranslationContext, CriteriaContainer> {
+import dev.morphia.query.filters.Filter;
+
+class MorphiaSpecificationTranslator extends BaseSpecificationTranslator<MorphiaTranslationContext<?>, Filter> {
     @Override
-    public <S extends Specification<?>> CriteriaContainer translate(S specification, MorphiaTranslationContext query) {
-        return convert(specification, query);
+    public <S extends Specification<?>> Filter translate(S specification, MorphiaTranslationContext<?> context) {
+        return convert(specification, context);
     }
+    
+    
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java
index 705b053..71554fd 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,26 +7,35 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
+import java.util.regex.Pattern;
+
 import org.seedstack.business.specification.StringSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 
-import java.util.regex.Pattern;
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+import dev.morphia.query.filters.RegexFilter;
 
-abstract class MorphiaStringConverter<S extends StringSpecification> implements SpecificationConverter<S, MorphiaTranslationContext<?>, CriteriaContainer> {
+abstract class MorphiaStringConverter<S extends StringSpecification>
+        implements SpecificationConverter<S, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(S specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
+    public Filter convert(S specification, MorphiaTranslationContext<?> context,
+            SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
         if (specification.getExpectedString() == null) {
-            return context.pickFieldEnd().doesNotExist();
+            return Filters.exists(context.getProperty()).not();
         } else {
             StringSpecification.Options options = specification.getOptions();
             if (hasNoOption(options) && !isRegex()) {
-                // We avoid using equal() because Morphia optimizes it without operator ("someAttr": "someVal")
-                // Thus generating an invalid query when trying to negate it ("$not": "someVal")
-                return context.pickFieldEnd().not().notEqual(specification.getExpectedString());
+                return Filters.eq(context.getProperty(), specification.getExpectedString());
             } else {
-                return context.pickFieldEnd().equal(buildRegex(options, specification.getExpectedString()));
+
+                RegexFilter result = Filters.regex(context.getProperty(),
+                        buildRegex(options, specification.getExpectedString()));
+                if (options.isIgnoringCase()) {
+                    result.caseInsensitive();
+                }
+                return result;
             }
 
         }
@@ -43,11 +52,12 @@ private Pattern buildRegex(StringSpecification.Options options, String expectedS
             sb.append("\\s*");
         }
         sb.append("$");
-        return Pattern.compile(sb.toString(), options.isIgnoringCase() ? Pattern.CASE_INSENSITIVE : 0);
+        return Pattern.compile(sb.toString());
     }
 
     private boolean hasNoOption(StringSpecification.Options options) {
-        return !options.isLeadTrimmed() && !options.isTailTrimmed() && !options.isTrimmed() && !options.isIgnoringCase();
+        return !options.isLeadTrimmed() && !options.isTailTrimmed() && !options.isTrimmed()
+                && !options.isIgnoringCase();
     }
 
     abstract String buildRegexMatchingPart(String value);
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java
index b47ee10..da9f9c3 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringEqualConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,7 +11,6 @@
 
 import java.util.regex.Pattern;
 
-
 class MorphiaStringEqualConverter extends MorphiaStringConverter<StringEqualSpecification> {
     @Override
     String buildRegexMatchingPart(String value) {
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java
index 7f74bba..6739748 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaStringMatchingConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java
index c5cef35..84cd981 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTranslationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,8 +9,6 @@
 
 import static com.google.common.base.Preconditions.checkState;
 
-import dev.morphia.query.CriteriaContainer;
-import dev.morphia.query.FieldEnd;
 import dev.morphia.query.Query;
 
 public class MorphiaTranslationContext<T> {
@@ -28,17 +26,10 @@ public MorphiaTranslationContext(MorphiaTranslationContext<T> source) {
         this.not = source.not;
     }
 
-    public FieldEnd<? extends CriteriaContainer> pickFieldEnd() {
-        checkState(this.property != null, "No field has been set");
-        FieldEnd<? extends CriteriaContainer> result;
-        if (not) {
-            result = query.criteria(property).not();
-        } else {
-            result = query.criteria(property);
-        }
-        this.property = null;
-        this.not = false;
-        return result;
+ 
+    public String getProperty() {
+        assertPropertyValue();
+        return property;
     }
 
     public void setProperty(String property) {
@@ -46,11 +37,12 @@ public void setProperty(String property) {
         this.property = property;
     }
 
-    public void not() {
-        not = !not;
-    }
-
     public Query<T> getQuery() {
         return query;
     }
+
+    private void assertPropertyValue() {
+        checkState(this.property != null, "No field has been set");
+
+    }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java
index 61532d0..1da68a0 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/specification/MorphiaTrueConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,16 +7,20 @@
  */
 package org.seedstack.mongodb.morphia.internal.specification;
 
-import dev.morphia.query.CriteriaContainer;
 import org.seedstack.business.specification.TrueSpecification;
 import org.seedstack.business.spi.SpecificationConverter;
 import org.seedstack.business.spi.SpecificationTranslator;
 import org.seedstack.mongodb.morphia.BaseMorphiaRepository;
 
-class MorphiaTrueConverter implements SpecificationConverter<TrueSpecification<?>, MorphiaTranslationContext<?>, CriteriaContainer> {
+import dev.morphia.query.filters.Filter;
+import dev.morphia.query.filters.Filters;
+
+class MorphiaTrueConverter
+        implements SpecificationConverter<TrueSpecification<?>, MorphiaTranslationContext<?>, Filter> {
     @Override
-    public CriteriaContainer convert(TrueSpecification<?> specification, MorphiaTranslationContext<?> context, SpecificationTranslator<MorphiaTranslationContext<?>, CriteriaContainer> translator) {
+    public Filter convert(TrueSpecification<?> specification, MorphiaTranslationContext<?> context,
+            SpecificationTranslator<MorphiaTranslationContext<?>, Filter> translator) {
         // Always true
-        return context.getQuery().criteria(BaseMorphiaRepository.ID_KEY).not().doesNotExist();
+        return Filters.exists(BaseMorphiaRepository.ID_KEY);
     }
 }
diff --git a/morphia/src/main/resources/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.properties b/morphia/src/main/resources/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.properties
index 8eed6b6..acea103 100644
--- a/morphia/src/main/resources/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.properties
+++ b/morphia/src/main/resources/org/seedstack/mongodb/morphia/internal/MorphiaErrorCode.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaIT.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaIT.java
index 4100f1f..3071fd2 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaIT.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,18 +10,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
 
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.ProvisionException;
-import com.google.inject.TypeLiteral;
-import com.google.inject.util.Types;
 import javax.validation.ConstraintViolationException;
+
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runner.RunWith;
-import dev.morphia.Datastore;
-import dev.morphia.Key;
 import org.seedstack.business.domain.Repository;
 import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy1;
 import org.seedstack.mongodb.morphia.fixtures.dummyobject.Dummy2;
@@ -35,6 +28,14 @@
 import org.seedstack.seed.SeedException;
 import org.seedstack.seed.testing.junit4.SeedITRunner;
 
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.ProvisionException;
+import com.google.inject.TypeLiteral;
+import com.google.inject.util.Types;
+
+import dev.morphia.Datastore;
+
 @RunWith(SeedITRunner.class)
 public class MorphiaIT {
     @Inject
@@ -49,7 +50,7 @@ public void datastoreAccess() {
                 "Gerard",
                 "menvuça",
                 new Address("France", "78300", "Poissy", "avenue de l'europe", 1));
-        Key<User> keyUser = datastore.save(user);
+        User keyUser = datastore.save(user);
         Assertions.assertThat(keyUser).isNotNull();
     }
 
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java
index ba6a04c..16ebfd8 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/SpecificationIT.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/SpecificationIT.java
index ef7bade..2f4e1b8 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/SpecificationIT.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/SpecificationIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy1.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy1.java
index c6f2309..e7eb668 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy1.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy2.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy2.java
index 5073814..3f7b086 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy2.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy3.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy3.java
index a60a453..49d3f72 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy3.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy4.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy4.java
index f9dd382..3ad7bb8 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy4.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy5.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy5.java
index 0fb80c9..c1f46ce 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy5.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy6.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy6.java
index 86d8a6f..d74e45a 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy6.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/dummyobject/Dummy6.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Picture.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Picture.java
index 856ba6e..7904b08 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Picture.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Picture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,22 +11,21 @@
 
 package org.seedstack.mongodb.morphia.fixtures.product;
 
-import dev.morphia.annotations.Embedded;
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
 import org.seedstack.business.domain.BaseEntity;
 import org.seedstack.business.domain.Identity;
 import org.seedstack.business.util.SequenceGenerator;
 import org.seedstack.business.util.inmemory.InMemory;
 
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+
 @Entity
 public class Picture extends BaseEntity<Long> {
 
     @Id
     @Identity(generator = SequenceGenerator.class)
     @InMemory
-    private Long id;
-    @Embedded
+    private Long id; 
     private PictureURL url;
     private Long productId;
 
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/PictureURL.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/PictureURL.java
index 9ca617f..79a8fdd 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/PictureURL.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/PictureURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,11 +7,13 @@
  */
 package org.seedstack.mongodb.morphia.fixtures.product;
 
-import dev.morphia.annotations.Embedded;
 import org.seedstack.business.domain.BaseValueObject;
 
-@Embedded
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class PictureURL extends BaseValueObject {
+    private static final long serialVersionUID = -1476003771826714191L;
     private String url;
     private boolean secured = false;
 
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Product.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Product.java
index 32966af..4b6c995 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Product.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/product/Product.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/Address.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/Address.java
index ce450d0..7c31cd1 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/Address.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/Address.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,10 +7,11 @@
  */
 package org.seedstack.mongodb.morphia.fixtures.user;
 
-import dev.morphia.annotations.Embedded;
 import org.seedstack.business.domain.ValueObject;
 
-@Embedded
+import dev.morphia.annotations.Entity;
+
+@Entity()
 public class Address implements ValueObject {
     private String country;
     private String zipCode;
diff --git a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/User.java b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/User.java
index aa90c3f..7cab856 100644
--- a/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/User.java
+++ b/morphia/src/test/java/org/seedstack/mongodb/morphia/fixtures/user/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,11 +7,12 @@
  */
 package org.seedstack.mongodb.morphia.fixtures.user;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
+import javax.validation.constraints.NotNull;
+
 import org.seedstack.business.domain.AggregateRoot;
 
-import javax.validation.constraints.NotNull;
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
 
 @Entity
 public class User implements AggregateRoot<Long> {
diff --git a/morphia/src/test/resources/application.yaml b/morphia/src/test/resources/application.yaml
index 6977b98..ac4ceb1 100644
--- a/morphia/src/test/resources/application.yaml
+++ b/morphia/src/test/resources/application.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+# Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/pom.xml b/pom.xml
index ed72ff3..e841390 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
+    Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,104 +8,119 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.seedstack.poms</groupId>
-        <artifactId>parent-internal</artifactId>
-        <version>4.0.2</version>
-    </parent>
-
-    <groupId>org.seedstack.addons.mongodb</groupId>
-    <artifactId>mongodb</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <seed.version>3.14.0</seed.version>
-        <mongodb.version>5.0.1</mongodb.version>
-        <morphia.version>2.4.13</morphia.version>
-        <business.version>4.4.0</business.version>
-
-        <compatibility.skip>true</compatibility.skip>
-
-        <bintray.package>mongodb-addon</bintray.package>
-    </properties>
-    <modules>
-        <module>core</module>
-        <module>morphia</module>
-    </modules>
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>license-maven-plugin</artifactId>
-                    <configuration>
-                        <includedLicenses>
-                            <includedLicense>Apache 2</includedLicense>
-                            <includedLicense>BSD</includedLicense>
-                            <includedLicense>CDDL</includedLicense>
-                            <includedLicense>LGPL 3.0</includedLicense>
-                            <includedLicense>MIT License</includedLicense>
-                            <includedLicense>MPL 2.0</includedLicense>
-                            <includedLicense>Public Domain</includedLicense>
-                            <includedLicense>WTFPL</includedLicense>
-
-                            <!-- Some licenses are ignored because they are alternatives to acceptable licenses and the plugin doesn't handle alternate licenses -->
-                            <includedLicense>IGNORED_LICENSE</includedLicense>
-                        </includedLicenses>
-                        <licenseMerges>
-                            <licenseMerge>Apache 2|Apache License, Version 2.0</licenseMerge>
-                            <licenseMerge>Apache 2|The Apache Software License, Version 2.0</licenseMerge>
-                            <licenseMerge>Apache 2|The Apache License, Version 2.0</licenseMerge>
-                            <licenseMerge>Apache 2|ASF 2.0</licenseMerge>
-                            <licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
-                            <licenseMerge>Apache 2|Apache License, version 2.0</licenseMerge>
-                            <licenseMerge>Apache 2|Apache License Version 2.0</licenseMerge>
-                            <licenseMerge>Apache 2|Apache 2.0</licenseMerge>
-                            <licenseMerge>BSD|The New BSD License</licenseMerge>
-                            <licenseMerge>BSD|https://svn.codehaus.org/proxytoys/trunk/LICENSE.txt</licenseMerge>                            
-                            <licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
-                            <licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
-                            <licenseMerge>MIT License|The MIT License</licenseMerge>
-                            <licenseMerge>MIT License|The MIT License (MIT)</licenseMerge>
-                            <licenseMerge>MIT License|MIT license</licenseMerge>
-                            <licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
-                            <licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
-                        </licenseMerges>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.seedstack.seed</groupId>
-            <artifactId>seed-core</artifactId>
-            <version>${seed.version}</version>
-        </dependency>
-    </dependencies>
-
-    <scm>
-        <url>https://github.com/seedstack/mongodb-addon</url>
-        <connection>scm:git:git://github.com/seedstack/mongodb-addon.git</connection>
-        <developerConnection>scm:git:git@github.com:seedstack/mongodb-addon.git</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
-
-    <repositories>
-        <repository>
-            <id>oss.sonatype.org-snapshot</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.seedstack.poms</groupId>
+		<artifactId>parent-internal</artifactId>
+		<version>4.1.0</version>
+	</parent>
+
+	<groupId>org.seedstack.addons.mongodb</groupId>
+	<artifactId>mongodb</artifactId>
+	<version>4.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<properties>
+		<seed.version>3.14.0</seed.version>
+		<mongodb.version>4.11.1</mongodb.version>
+		<morphia.version>2.4.13</morphia.version>
+		<business.version>4.4.0</business.version>
+
+		<maven.compiler.target>11</maven.compiler.target>
+
+
+		<compatibility.skip>true</compatibility.skip>
+
+		<bintray.package>mongodb-addon</bintray.package>
+	</properties>
+	<modules>
+		<module>core</module>
+		<module>morphia</module>
+	</modules>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>license-maven-plugin</artifactId>
+					<configuration>
+						<includedLicenses>
+							<includedLicense>Apache 2</includedLicense>
+							<includedLicense>BSD</includedLicense>
+							<includedLicense>CDDL</includedLicense>
+							<includedLicense>LGPL 3.0</includedLicense>
+							<includedLicense>MIT License</includedLicense>
+							<includedLicense>MPL 2.0</includedLicense>
+							<includedLicense>Public Domain</includedLicense>
+							<includedLicense>WTFPL</includedLicense>
+
+							<!-- Some licenses are ignored because they are alternatives to acceptable licenses and the
+							plugin doesn't handle alternate licenses -->
+							<includedLicense>IGNORED_LICENSE</includedLicense>
+						</includedLicenses>
+						<licenseMerges>
+							<licenseMerge>Apache 2|Apache License, Version 2.0</licenseMerge>
+							<licenseMerge>Apache 2|The Apache Software License, Version 2.0</licenseMerge>
+							<licenseMerge>Apache 2|The Apache License, Version 2.0</licenseMerge>
+							<licenseMerge>Apache 2|ASF 2.0</licenseMerge>
+							<licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
+							<licenseMerge>Apache 2|Apache License, version 2.0</licenseMerge>
+							<licenseMerge>Apache 2|Apache License Version 2.0</licenseMerge>
+							<licenseMerge>Apache 2|Apache 2.0</licenseMerge>
+							<licenseMerge>BSD|The New BSD License</licenseMerge>
+							<licenseMerge>BSD|https://svn.codehaus.org/proxytoys/trunk/LICENSE.txt</licenseMerge>
+							<licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
+							<licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
+							<licenseMerge>MIT License|The MIT License</licenseMerge>
+							<licenseMerge>MIT License|The MIT License (MIT)</licenseMerge>
+							<licenseMerge>MIT License|MIT license</licenseMerge>
+							<licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
+							<licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
+						</licenseMerges>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.jboss.logging</groupId>
+				<artifactId>jboss-logging</artifactId>
+				<version>3.5.3.Final</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.seedstack.seed</groupId>
+			<artifactId>seed-core</artifactId>
+			<version>${seed.version}</version>
+		</dependency>
+	</dependencies>
+
+	<scm>
+		<url>https://github.com/seedstack/mongodb-addon</url>
+		<connection>scm:git:git://github.com/seedstack/mongodb-addon.git</connection>
+		<developerConnection>scm:git:git@github.com:seedstack/mongodb-addon.git</developerConnection>
+		<tag>HEAD</tag>
+	</scm>
+
+	<repositories>
+		<repository>
+			<id>oss.sonatype.org-snapshot</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 </project>

From e4c2ac508ad0103936dc1f8c84b7284a81518bf1 Mon Sep 17 00:00:00 2001
From: Xian Boullosa <xian.boullosa@ctag.com>
Date: Mon, 29 Apr 2024 15:51:15 +0200
Subject: [PATCH 3/4] feat: Adds EntityListener support

chore: Adds License headers
---
 core/pom.xml                                  | 79 ++++++++--------
 morphia/src/license/THIRD-PARTY.properties    | 21 -----
 .../mongodb/morphia/BaseEntityListener.java   | 29 ++++++
 .../morphia/BaseMorphiaRepository.java        |  8 +-
 .../mongodb/morphia/EntityListener.java       | 34 +++++++
 .../morphia/internal/DatastoreFactory.java    | 10 +--
 .../morphia/internal/DatastoreWrapper.java    | 14 +--
 .../morphia/internal/MorphiaModule.java       | 23 ++++-
 .../morphia/internal/MorphiaPlugin.java       | 49 ++++++----
 .../morphia/internal/MorphiaPredicates.java   | 14 ++-
 .../morphia/internal/SeedEntityListener.java  | 90 +++++++++++++++++++
 .../internal/ValidatingEntityInterceptor.java | 12 +--
 morphia/src/test/resources/application.yaml   |  3 +
 pom.xml                                       |  6 +-
 14 files changed, 278 insertions(+), 114 deletions(-)
 delete mode 100644 morphia/src/license/THIRD-PARTY.properties
 create mode 100644 morphia/src/main/java/org/seedstack/mongodb/morphia/BaseEntityListener.java
 create mode 100644 morphia/src/main/java/org/seedstack/mongodb/morphia/EntityListener.java
 create mode 100644 morphia/src/main/java/org/seedstack/mongodb/morphia/internal/SeedEntityListener.java

diff --git a/core/pom.xml b/core/pom.xml
index 4d82784..dba8654 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,44 +7,45 @@
     file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.seedstack.addons.mongodb</groupId>
-		<artifactId>mongodb</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>mongodb-core</artifactId>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-driver-sync</artifactId>
-			<version>${mongodb.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.seedstack.seed</groupId>
-			<artifactId>seed-testing-junit4</artifactId>
-			<version>${seed.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<version>${assertj.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.seedstack.addons.mongodb</groupId>
+        <artifactId>mongodb</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>mongodb-core</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongodb-driver-sync</artifactId>
+            <version>${mongodb.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.seedstack.seed</groupId>
+            <artifactId>seed-testing-junit4</artifactId>
+            <version>${seed.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/morphia/src/license/THIRD-PARTY.properties b/morphia/src/license/THIRD-PARTY.properties
deleted file mode 100644
index bc7db7f..0000000
--- a/morphia/src/license/THIRD-PARTY.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
-#-------------------------------------------------------------------------------
-# Already used licenses in project :
-# - Apache 2
-# - BSD
-# - CDDL
-# - IGNORED_LICENSE
-# - LGPL 3.0
-# - MIT License
-# - MPL 2.0
-# - Public Domain
-# - The MIT License (MIT)
-# - WTFPL
-#-------------------------------------------------------------------------------
-# Please fill the missing licenses for dependencies :
-#
-#
-#Fri Jan 31 12:24:04 CET 2020
-com.thoughtworks.proxytoys--proxytoys--1.0=BSD
-dev.morphia.morphia--core--1.6.1=Apache 2
-dev.morphia.morphia--logging-slf4j--1.6.1=Apache 2
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseEntityListener.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseEntityListener.java
new file mode 100644
index 0000000..42029e2
--- /dev/null
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseEntityListener.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.mongodb.morphia;
+
+import java.lang.reflect.Type;
+
+import org.seedstack.business.internal.utils.BusinessUtils;
+
+public abstract class BaseEntityListener<T> implements EntityListener<T> {
+
+    private final Class<T> listenerClass;
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public BaseEntityListener() {
+        Type[] generics = BusinessUtils.resolveGenerics(EntityListener.class, this.getClass());
+        this.listenerClass = (Class) generics[0];
+    }
+
+    @Override
+    public Class<T> getListenerClass() {
+        return listenerClass;
+    }
+
+}
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
index ee307b9..3c9267d 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java
@@ -30,8 +30,6 @@
 import org.seedstack.business.spi.SpecificationTranslator;
 import org.seedstack.mongodb.morphia.internal.DatastoreFactory;
 import org.seedstack.mongodb.morphia.internal.specification.MorphiaTranslationContext;
-import org.seedstack.seed.Logging;
-import org.slf4j.Logger;
 
 import com.mongodb.client.MongoCollection;
 
@@ -46,6 +44,7 @@
 import dev.morphia.query.filters.Filters;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+@SuppressWarnings("rawtypes")
 /**
  * This class can serve as a base class for Morphia repositories. It provides methods for common
  * CRUD operations as well as access to the data store through the {@link #getDatastore()} ()}
@@ -59,10 +58,8 @@
 public abstract class BaseMorphiaRepository<A extends AggregateRoot<ID>, ID> extends BaseRepository<A, ID> {
     public static final String ID_KEY = "_id";
     private Datastore datastore;
-    private SpecificationTranslator<MorphiaTranslationContext, Filter> specificationTranslator;
 
-    @Logging
-    private Logger logger;
+    private SpecificationTranslator<MorphiaTranslationContext, Filter> specificationTranslator;
 
     public BaseMorphiaRepository() {
 
@@ -176,7 +173,6 @@ private Query<A> buildQuery(Specification<A> specification) {
         Filter filter = specificationTranslator.translate(
                 specification,
                 new MorphiaTranslationContext<>(query));
-        logger.info("Querying {} with filter {}",getAggregateRootClass(),filter);
         return query.filter(filter);
     }
 
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/EntityListener.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/EntityListener.java
new file mode 100644
index 0000000..2e5070a
--- /dev/null
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/EntityListener.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.mongodb.morphia;
+
+import org.bson.Document;
+
+import dev.morphia.Datastore;
+
+public interface EntityListener<T> {
+
+    Class<T> getListenerClass();
+
+    default void postLoad(T entity, Document document, Datastore datastore) {
+        // NO-OP
+    };
+
+    default void preLoad(T entity, Document document, Datastore datastore) {
+        // NO-OP
+    };
+
+    default void postPersist(T entity, Document document, Datastore datastore) {
+        // NO-OP
+    };
+
+    default void prePersist(T entity, Document document, Datastore datastore) {
+        // NO-OP
+    };
+
+}
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
index 50bb987..d2b174a 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreFactory.java
@@ -10,8 +10,6 @@
 import static org.seedstack.mongodb.morphia.internal.MorphiaUtils.createDatastoreAnnotation;
 import static org.seedstack.mongodb.morphia.internal.MorphiaUtils.getMongoClientConfig;
 
-import java.util.Arrays;
-
 import javax.inject.Inject;
 
 import org.seedstack.mongodb.morphia.MorphiaDatastore;
@@ -28,13 +26,13 @@
 public class DatastoreFactory {
     private final Application application;
     private final Injector injector;
-    private final ValidatingEntityInterceptor validationInterceptor;
+    private final SeedEntityListener seedEntityListener;
 
     @Inject
-    DatastoreFactory(Application application, Injector injector, ValidatingEntityInterceptor validationInterceptor) {
+    DatastoreFactory(Application application, Injector injector, SeedEntityListener seedEntityListener) {
         this.application = application;
         this.injector = injector;
-        this.validationInterceptor = validationInterceptor;
+        this.seedEntityListener = seedEntityListener;
     }
 
     public Datastore createDatastore(Class<?> morphiaClass) {
@@ -49,6 +47,6 @@ public Datastore createDatastore(String clientName, String dbName) {
         MongoClient client = injector.getInstance(Key.get(MongoClient.class, Names.named(clientName)));
         String dbAlias = MorphiaUtils.resolveDatabaseAlias(getMongoClientConfig(application, clientName), dbName);
 
-        return new DatastoreWrapper(Morphia.createDatastore(client, dbAlias), Arrays.asList(validationInterceptor));
+        return new DatastoreWrapper(Morphia.createDatastore(client, dbAlias), seedEntityListener);
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java
index 818e837..672dcc0 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java
@@ -1,17 +1,21 @@
+/*
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.seedstack.mongodb.morphia.internal;
 
-import java.util.Collection;
-
 import dev.morphia.Datastore;
 import dev.morphia.DatastoreImpl;
-import dev.morphia.EntityListener;
 
 class DatastoreWrapper extends DatastoreImpl {
 
-    public DatastoreWrapper(Datastore datastore, Collection<EntityListener<?>> extraListeners) {
+    public DatastoreWrapper(Datastore datastore, SeedEntityListener seedListener) {
         super((DatastoreImpl) datastore);
         // TODO: Find a way to wrap mapper instead of adding an interceptor
-        extraListeners.forEach(listener -> getMapper().addInterceptor(listener));
+        getMapper().addInterceptor(seedListener);
 
     }
 
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java
index d70ebc3..58c0add 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaModule.java
@@ -13,30 +13,35 @@
 
 import java.util.Collection;
 
+import org.seedstack.mongodb.morphia.EntityListener;
 import org.seedstack.mongodb.morphia.MorphiaDatastore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Key;
 import com.google.inject.Scopes;
+import com.google.inject.multibindings.Multibinder;
 
 import dev.morphia.Datastore;
 
 class MorphiaModule extends AbstractModule {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MorphiaModule.class);
     private final Collection<MorphiaDatastore> morphiaDatastoresAnnotation;
-    private final Collection<Class<?>> morphiaEntityListeners;
+    private final Collection<Class<? extends EntityListener<?>>> seedEntityListeners;
 
     MorphiaModule(Collection<MorphiaDatastore> morphiaDatastoresAnnotation,
-            Collection<Class<?>> morphiaEntityListeners) {
+            Collection<Class<? extends EntityListener<?>>> seedEntityListeners) {
         super();
         this.morphiaDatastoresAnnotation = morphiaDatastoresAnnotation;
-        this.morphiaEntityListeners = morphiaEntityListeners;
+        this.seedEntityListeners = seedEntityListeners;
 
     }
 
+    @SuppressWarnings("rawtypes")
     @Override
     protected void configure() {
         bind(DatastoreFactory.class);
-        bind(ValidatingEntityInterceptor.class);
 
         if (morphiaDatastoresAnnotation != null && !morphiaDatastoresAnnotation.isEmpty()) {
             for (MorphiaDatastore morphiaDatastore : morphiaDatastoresAnnotation) {
@@ -46,5 +51,15 @@ protected void configure() {
             }
         }
 
+        Multibinder<EntityListener> entityListenerMultibinder = Multibinder.newSetBinder(binder(),
+                EntityListener.class);
+
+        for (Class<? extends EntityListener> listener : seedEntityListeners) {
+            LOGGER.debug("Binding {}", listener.toGenericString());
+            entityListenerMultibinder.addBinding().to(listener);
+        }
+
+        bind(SeedEntityListener.class).asEagerSingleton();
+
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
index 9ab1134..ebd02e0 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
@@ -13,6 +13,7 @@
 import javax.inject.Inject;
 
 import org.seedstack.mongodb.internal.MongoDbPlugin;
+import org.seedstack.mongodb.morphia.EntityListener;
 import org.seedstack.mongodb.morphia.MorphiaConfig;
 import org.seedstack.mongodb.morphia.MorphiaDatastore;
 import org.seedstack.seed.Application;
@@ -35,7 +36,8 @@
 public class MorphiaPlugin extends AbstractSeedPlugin {
     private static final Logger LOGGER = LoggerFactory.getLogger(MorphiaPlugin.class);
     private final Collection<MorphiaDatastore> morphiaDatastores = new HashSet<>();
-    private final Collection<Class<?>> morphiaListeners = new HashSet<>();
+    private final Collection<Class<? extends EntityListener<?>>> seedEntityListeners = new HashSet<>();
+
     private MorphiaConfig config;
     @Inject
     private DatastoreFactory datastoreFactory;
@@ -54,19 +56,21 @@ public Collection<Class<?>> dependencies() {
     public Collection<ClasspathScanRequest> classpathScanRequests() {
         return classpathScanRequestBuilder()
                 .predicate(MorphiaPredicates.PERSISTED_CLASSES)
-                .predicate(MorphiaPredicates.ENTITY_LISTENERS)
+                .predicate(MorphiaPredicates.SEED_INJECTED_ENTITY_LISTENERS)
+                .predicate(MorphiaPredicates.MORPHIA_RAW_ENTITY_LISTENERS)
                 .build();
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public InitState initialize(InitContext initContext) {
         Application application = getApplication();
         config = application.getConfiguration().get(MorphiaConfig.class);
 
-        boolean validationActive = ValidationManager.get()
+        boolean isValidationActive = ValidationManager.get()
                 .getValidationLevel() != ValidationManager.ValidationLevel.NONE;
 
-        if (validationActive) {
+        if (isValidationActive) {
             LOGGER.info("Validation is enabled on Morphia entities");
         } else {
             LOGGER.info("Validation is disabled on Morphia entities");
@@ -88,22 +92,35 @@ public InitState initialize(InitContext initContext) {
             LOGGER.info("No persisted classes found");
         }
 
-        if (!validationActive) {
-            return InitState.INITIALIZED;
+        Collection<Class<?>> morphiaListeners = initContext.scannedTypesByPredicate()
+                .get(MorphiaPredicates.MORPHIA_RAW_ENTITY_LISTENERS);
+
+        if (morphiaListeners != null && morphiaListeners.size() > 0) {
+            LOGGER.warn(
+                    "Morphia EntityListeners found. No injection will be performed over those EntityListeners." +
+                            "Activate debug logs to get more information");
+            if (LOGGER.isDebugEnabled()) {
+                morphiaListeners.forEach(
+                        listener -> LOGGER.debug("\t class '{}' will not have injection", listener.toGenericString()));
+            }
+
         }
 
-        
-        
-        Collection<Class<?>> morphiaEntityListeners = initContext.scannedTypesByPredicate()
-                .get(MorphiaPredicates.ENTITY_LISTENERS);
+        Collection<Class<?>> seedListeners = initContext.scannedTypesByPredicate()
+                .get(MorphiaPredicates.SEED_INJECTED_ENTITY_LISTENERS);
 
-        if (morphiaEntityListeners != null && !morphiaEntityListeners.isEmpty()) {
-            LOGGER.info("Found {} entity listeners", morphiaEntityListeners.size());
-            morphiaListeners.addAll(morphiaEntityListeners);
-        } else {
-            LOGGER.info("No entity listeners found");
+        if (seedListeners != null && seedListeners.size() > 0) {
+            for (Class<?> listener : seedListeners) {
+                if (!isValidationActive && listener.equals(ValidatingEntityInterceptor.class)) {
+                    continue;
+                }
+                LOGGER.debug("Detected '{}' EntityListener", listener.toGenericString());
+                this.seedEntityListeners.add((Class<? extends EntityListener<?>>) listener);
+            }
         }
 
+        LOGGER.info("{} EntityListeners loaded", seedListeners.size());
+
         return InitState.INITIALIZED;
     }
 
@@ -125,6 +142,6 @@ public void start(Context context) {
 
     @Override
     public Object nativeUnitModule() {
-        return new MorphiaModule(morphiaDatastores, morphiaListeners);
+        return new MorphiaModule(morphiaDatastores, seedEntityListeners);
     }
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPredicates.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPredicates.java
index 2612ea4..5873184 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPredicates.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPredicates.java
@@ -8,14 +8,14 @@
 package org.seedstack.mongodb.morphia.internal;
 
 import static org.seedstack.shed.reflect.AnnotationPredicates.elementAnnotatedWith;
-import static org.seedstack.shed.reflect.ClassPredicates.classImplements;
+import static org.seedstack.shed.reflect.ClassPredicates.classIs;
+import static org.seedstack.shed.reflect.ClassPredicates.classIsAssignableFrom;
 import static org.seedstack.shed.reflect.ClassPredicates.classIsInterface;
 import static org.seedstack.shed.reflect.ClassPredicates.classModifierIs;
 
 import java.lang.reflect.Modifier;
 import java.util.function.Predicate;
 
-import dev.morphia.EntityListener;
 import dev.morphia.annotations.Embedded;
 import dev.morphia.annotations.Entity;
 
@@ -25,7 +25,13 @@ class MorphiaPredicates {
             .and(elementAnnotatedWith(Entity.class, false)
                     .or(elementAnnotatedWith(Embedded.class, false)));
 
-    static Predicate<Class<?>> ENTITY_LISTENERS = classIsInterface().negate()
+    static Predicate<Class<?>> SEED_INJECTED_ENTITY_LISTENERS = classIsInterface().negate()
             .and(classModifierIs(Modifier.ABSTRACT).negate())
-            .and(classImplements(EntityListener.class));
+            .and(classIsAssignableFrom(org.seedstack.mongodb.morphia.EntityListener.class));
+
+    static Predicate<Class<?>> MORPHIA_RAW_ENTITY_LISTENERS = classIsInterface().negate()
+            .and(classModifierIs(Modifier.ABSTRACT).negate())
+            .and(classIsAssignableFrom(dev.morphia.EntityListener.class))
+            .and((classIs(SeedEntityListener.class)).negate()); // Ignore global listener
+
 }
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/SeedEntityListener.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/SeedEntityListener.java
new file mode 100644
index 0000000..fed7372
--- /dev/null
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/SeedEntityListener.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2013-2024, The SeedStack authors <http://seedstack.org>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.seedstack.mongodb.morphia.internal;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import org.bson.Document;
+import org.seedstack.mongodb.morphia.EntityListener;
+
+import dev.morphia.Datastore;
+import dev.morphia.annotations.PostLoad;
+import dev.morphia.annotations.PostPersist;
+import dev.morphia.annotations.PreLoad;
+import dev.morphia.annotations.PrePersist;
+
+@SuppressWarnings("rawtypes")
+class SeedEntityListener implements dev.morphia.EntityListener<Object> {
+    private final Set<EntityListener> listeners;
+
+    @Inject
+    SeedEntityListener(Set<EntityListener> listeners) {
+        this.listeners = listeners;
+    }
+
+    @Override
+    public boolean hasAnnotation(Class<? extends Annotation> type) {
+        return true;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    @PostLoad
+    public void postLoad(Object entity, Document document, Datastore datastore) {
+        Set<EntityListener> affectedListeners = getAffectedListeners(entity);
+        for (EntityListener listener : affectedListeners) {
+            listener.postLoad(entity, document, datastore);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    @PostPersist
+    public void postPersist(Object entity, Document document, Datastore datastore) {
+        Set<EntityListener> affectedListeners = getAffectedListeners(entity);
+        for (EntityListener listener : affectedListeners) {
+            listener.postPersist(entity, document, datastore);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    @PreLoad
+    public void preLoad(Object entity, Document document, Datastore datastore) {
+        Set<EntityListener> affectedListeners = getAffectedListeners(entity);
+        for (EntityListener listener : affectedListeners) {
+            listener.preLoad(entity, document, datastore);
+        }
+
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    @PrePersist
+    public void prePersist(Object entity, Document document, Datastore datastore) {
+        Set<EntityListener> affectedListeners = getAffectedListeners(entity);
+        for (EntityListener listener : affectedListeners) {
+            listener.prePersist(entity, document, datastore);
+        }
+    }
+
+    private boolean checkEntityType(Object entity, EntityListener<?> x) {
+        return x.getListenerClass().isAssignableFrom(entity.getClass());
+    }
+
+    private Set<EntityListener> getAffectedListeners(Object entity) {
+        return listeners.stream().filter(x -> checkEntityType(entity, x))
+                .collect(Collectors.toSet());
+
+    }
+
+}
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java
index 2f3c627..a3055c7 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/ValidatingEntityInterceptor.java
@@ -7,7 +7,6 @@
  */
 package org.seedstack.mongodb.morphia.internal;
 
-import java.lang.annotation.Annotation;
 import java.util.Set;
 
 import javax.inject.Inject;
@@ -15,21 +14,18 @@
 import javax.validation.ValidatorFactory;
 
 import org.bson.Document;
+import org.seedstack.mongodb.morphia.BaseEntityListener;
 import org.seedstack.seed.core.internal.validation.VerboseConstraintViolationException;
 
 import dev.morphia.Datastore;
-import dev.morphia.EntityListener;
-import dev.morphia.annotations.PrePersist;
 
-class ValidatingEntityInterceptor implements EntityListener<Object> {
+class ValidatingEntityInterceptor extends BaseEntityListener<Object> {
 
     @Inject
     private ValidatorFactory validatorFactory;
 
     @Override
-    @PrePersist
     public void prePersist(Object entity, Document document, Datastore datastore) {
-
         Set<ConstraintViolation<Object>> result = validatorFactory.getValidator().validate(entity);
         if (!result.isEmpty()) {
             throw new VerboseConstraintViolationException(result);
@@ -37,8 +33,4 @@ public void prePersist(Object entity, Document document, Datastore datastore) {
 
     }
 
-    @Override
-    public boolean hasAnnotation(Class<? extends Annotation> type) {
-        return PrePersist.class.equals(type);
-    }
 }
diff --git a/morphia/src/test/resources/application.yaml b/morphia/src/test/resources/application.yaml
index ac4ceb1..cd0cda0 100644
--- a/morphia/src/test/resources/application.yaml
+++ b/morphia/src/test/resources/application.yaml
@@ -6,6 +6,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+logging:
+  level: INFO
+
 mongoDb:
   clients:
     client1:
diff --git a/pom.xml b/pom.xml
index e841390..861da45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,9 +28,6 @@
 		<morphia.version>2.4.13</morphia.version>
 		<business.version>4.4.0</business.version>
 
-		<maven.compiler.target>11</maven.compiler.target>
-
-
 		<compatibility.skip>true</compatibility.skip>
 
 		<bintray.package>mongodb-addon</bintray.package>
@@ -69,7 +66,9 @@
 							<licenseMerge>Apache 2|Apache License, version 2.0</licenseMerge>
 							<licenseMerge>Apache 2|Apache License Version 2.0</licenseMerge>
 							<licenseMerge>Apache 2|Apache 2.0</licenseMerge>
+							<licenseMerge>Apache 2|Apache-2.0</licenseMerge>
 							<licenseMerge>BSD|The New BSD License</licenseMerge>
+							<licenseMerge>BSD|BSD-3-Clause</licenseMerge>
 							<licenseMerge>BSD|https://svn.codehaus.org/proxytoys/trunk/LICENSE.txt</licenseMerge>
 							<licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
 							<licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
@@ -78,6 +77,7 @@
 							<licenseMerge>MIT License|MIT license</licenseMerge>
 							<licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
 							<licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
+							<licenseMerge>IGNORED_LICENSE|GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1</licenseMerge>
 						</licenseMerges>
 					</configuration>
 				</plugin>

From 858d77993cd34000483e49d4114eb8e8f067217d Mon Sep 17 00:00:00 2001
From: Xian Boullosa <xian.boullosa@ctag.com>
Date: Mon, 29 Apr 2024 16:00:27 +0200
Subject: [PATCH 4/4] feat: Update version for new release

fix: Spotbugs detected issues
---
 core/pom.xml                                  |   2 +-
 morphia/pom.xml                               |   2 +-
 .../morphia/internal/DatastoreWrapper.java    |   2 +
 .../morphia/internal/MorphiaPlugin.java       |   5 +-
 pom.xml                                       | 210 +++++++++---------
 5 files changed, 113 insertions(+), 108 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index dba8654..52a5b67 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>mongodb-core</artifactId>
diff --git a/morphia/pom.xml b/morphia/pom.xml
index 2830232..965317c 100644
--- a/morphia/pom.xml
+++ b/morphia/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>mongodb-morphia</artifactId>
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java
index 672dcc0..78ebf63 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/DatastoreWrapper.java
@@ -9,9 +9,11 @@
 
 import dev.morphia.Datastore;
 import dev.morphia.DatastoreImpl;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 class DatastoreWrapper extends DatastoreImpl {
 
+    @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR", justification = "Manually verified that mapper is initialized")
     public DatastoreWrapper(Datastore datastore, SeedEntityListener seedListener) {
         super((DatastoreImpl) datastore);
         // TODO: Find a way to wrap mapper instead of adding an interceptor
diff --git a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
index ebd02e0..d16a861 100644
--- a/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
+++ b/morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaPlugin.java
@@ -117,10 +117,11 @@ public InitState initialize(InitContext initContext) {
                 LOGGER.debug("Detected '{}' EntityListener", listener.toGenericString());
                 this.seedEntityListeners.add((Class<? extends EntityListener<?>>) listener);
             }
+            LOGGER.info("{} EntityListeners loaded", seedListeners.size());
+        } else {
+            LOGGER.info("No EntityListeners loaded");
         }
 
-        LOGGER.info("{} EntityListeners loaded", seedListeners.size());
-
         return InitState.INITIALIZED;
     }
 
diff --git a/pom.xml b/pom.xml
index 861da45..00666a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,120 +7,122 @@
     file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.seedstack.poms</groupId>
-		<artifactId>parent-internal</artifactId>
-		<version>4.1.0</version>
-	</parent>
+    <parent>
+        <groupId>org.seedstack.poms</groupId>
+        <artifactId>parent-internal</artifactId>
+        <version>4.1.0</version>
+    </parent>
 
-	<groupId>org.seedstack.addons.mongodb</groupId>
-	<artifactId>mongodb</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.seedstack.addons.mongodb</groupId>
+    <artifactId>mongodb</artifactId>
+    <version>5.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<properties>
-		<seed.version>3.14.0</seed.version>
-		<mongodb.version>4.11.1</mongodb.version>
-		<morphia.version>2.4.13</morphia.version>
-		<business.version>4.4.0</business.version>
+    <properties>
+        <seed.version>3.14.0</seed.version>
+        <mongodb.version>5.0.1</mongodb.version>
+        <morphia.version>2.4.13</morphia.version>
+        <business.version>4.4.0</business.version>
 
-		<compatibility.skip>true</compatibility.skip>
+        <compatibility.skip>true</compatibility.skip>
 
-		<bintray.package>mongodb-addon</bintray.package>
-	</properties>
-	<modules>
-		<module>core</module>
-		<module>morphia</module>
-	</modules>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>license-maven-plugin</artifactId>
-					<configuration>
-						<includedLicenses>
-							<includedLicense>Apache 2</includedLicense>
-							<includedLicense>BSD</includedLicense>
-							<includedLicense>CDDL</includedLicense>
-							<includedLicense>LGPL 3.0</includedLicense>
-							<includedLicense>MIT License</includedLicense>
-							<includedLicense>MPL 2.0</includedLicense>
-							<includedLicense>Public Domain</includedLicense>
-							<includedLicense>WTFPL</includedLicense>
+        <bintray.package>mongodb-addon</bintray.package>
+    </properties>
+    <modules>
+        <module>core</module>
+        <module>morphia</module>
+    </modules>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>license-maven-plugin</artifactId>
+                    <configuration>
+                        <includedLicenses>
+                            <includedLicense>Apache 2</includedLicense>
+                            <includedLicense>BSD</includedLicense>
+                            <includedLicense>CDDL</includedLicense>
+                            <includedLicense>LGPL 3.0</includedLicense>
+                            <includedLicense>MIT License</includedLicense>
+                            <includedLicense>MPL 2.0</includedLicense>
+                            <includedLicense>Public Domain</includedLicense>
+                            <includedLicense>WTFPL</includedLicense>
 
-							<!-- Some licenses are ignored because they are alternatives to acceptable licenses and the
+                            <!-- Some licenses are ignored because they are alternatives to
+                            acceptable licenses and the
 							plugin doesn't handle alternate licenses -->
-							<includedLicense>IGNORED_LICENSE</includedLicense>
-						</includedLicenses>
-						<licenseMerges>
-							<licenseMerge>Apache 2|Apache License, Version 2.0</licenseMerge>
-							<licenseMerge>Apache 2|The Apache Software License, Version 2.0</licenseMerge>
-							<licenseMerge>Apache 2|The Apache License, Version 2.0</licenseMerge>
-							<licenseMerge>Apache 2|ASF 2.0</licenseMerge>
-							<licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
-							<licenseMerge>Apache 2|Apache License, version 2.0</licenseMerge>
-							<licenseMerge>Apache 2|Apache License Version 2.0</licenseMerge>
-							<licenseMerge>Apache 2|Apache 2.0</licenseMerge>
-							<licenseMerge>Apache 2|Apache-2.0</licenseMerge>
-							<licenseMerge>BSD|The New BSD License</licenseMerge>
-							<licenseMerge>BSD|BSD-3-Clause</licenseMerge>
-							<licenseMerge>BSD|https://svn.codehaus.org/proxytoys/trunk/LICENSE.txt</licenseMerge>
-							<licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
-							<licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
-							<licenseMerge>MIT License|The MIT License</licenseMerge>
-							<licenseMerge>MIT License|The MIT License (MIT)</licenseMerge>
-							<licenseMerge>MIT License|MIT license</licenseMerge>
-							<licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
-							<licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
-							<licenseMerge>IGNORED_LICENSE|GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1</licenseMerge>
-						</licenseMerges>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
+                            <includedLicense>IGNORED_LICENSE</includedLicense>
+                        </includedLicenses>
+                        <licenseMerges>
+                            <licenseMerge>Apache 2|Apache License, Version 2.0</licenseMerge>
+                            <licenseMerge>Apache 2|The Apache Software License, Version 2.0</licenseMerge>
+                            <licenseMerge>Apache 2|The Apache License, Version 2.0</licenseMerge>
+                            <licenseMerge>Apache 2|ASF 2.0</licenseMerge>
+                            <licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
+                            <licenseMerge>Apache 2|Apache License, version 2.0</licenseMerge>
+                            <licenseMerge>Apache 2|Apache License Version 2.0</licenseMerge>
+                            <licenseMerge>Apache 2|Apache 2.0</licenseMerge>
+                            <licenseMerge>Apache 2|Apache-2.0</licenseMerge>
+                            <licenseMerge>BSD|The New BSD License</licenseMerge>
+                            <licenseMerge>BSD|BSD-3-Clause</licenseMerge>
+                            <licenseMerge>BSD|https://svn.codehaus.org/proxytoys/trunk/LICENSE.txt</licenseMerge>
+                            <licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
+                            <licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
+                            <licenseMerge>MIT License|The MIT License</licenseMerge>
+                            <licenseMerge>MIT License|The MIT License (MIT)</licenseMerge>
+                            <licenseMerge>MIT License|MIT license</licenseMerge>
+                            <licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
+                            <licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>
+                            <licenseMerge>IGNORED_LICENSE|GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1</licenseMerge>
+                        </licenseMerges>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.jboss.logging</groupId>
-				<artifactId>jboss-logging</artifactId>
-				<version>3.5.3.Final</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging</artifactId>
+                <version>3.5.3.Final</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.seedstack.seed</groupId>
-			<artifactId>seed-core</artifactId>
-			<version>${seed.version}</version>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.seedstack.seed</groupId>
+            <artifactId>seed-core</artifactId>
+            <version>${seed.version}</version>
+        </dependency>
+    </dependencies>
 
-	<scm>
-		<url>https://github.com/seedstack/mongodb-addon</url>
-		<connection>scm:git:git://github.com/seedstack/mongodb-addon.git</connection>
-		<developerConnection>scm:git:git@github.com:seedstack/mongodb-addon.git</developerConnection>
-		<tag>HEAD</tag>
-	</scm>
+    <scm>
+        <url>https://github.com/seedstack/mongodb-addon</url>
+        <connection>scm:git:git://github.com/seedstack/mongodb-addon.git</connection>
+        <developerConnection>scm:git:git@github.com:seedstack/mongodb-addon.git</developerConnection>
+        <tag>HEAD</tag>
+    </scm>
 
-	<repositories>
-		<repository>
-			<id>oss.sonatype.org-snapshot</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
+    <repositories>
+        <repository>
+            <id>oss.sonatype.org-snapshot</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>