Merge pull request eclipse-ditto#2009 from beyonnex-io/pekko-110

updating pekko to 1.1.0
thfries · Oct 24, 2024 · d7724b3 · d7724b3
2 parents 12a5f32 + 947e8aa
commit d7724b3
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 6 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -43,19 +43,19 @@
         <eddsa.version>0.3.0</eddsa.version>
         <lz4-java.version>1.8.0</lz4-java.version>
 
-        <pekko-bom.version>1.0.3</pekko-bom.version>
-        <pekko-http-bom.version>1.0.1</pekko-http-bom.version>
-        <pekko-persistence-mongodb.version>1.2.1</pekko-persistence-mongodb.version>
+        <pekko-bom.version>1.1.2</pekko-bom.version>
+        <pekko-http-bom.version>1.1.0</pekko-http-bom.version>
+        <pekko-persistence-mongodb.version>1.2.2</pekko-persistence-mongodb.version>
         <pekko-persistence-inmemory.version>1.1.1</pekko-persistence-inmemory.version>
-        <pekko-management.version>1.0.0</pekko-management.version>
+        <pekko-management.version>1.1.0</pekko-management.version>
         <pekko-connector-kafka.version>1.0.0</pekko-connector-kafka.version>
         <parboiled.version>2.5.1</parboiled.version>
 
         <!--  Necessary for pekko-persistence-mongodb -->
-        <metrics4-scala.version>4.3.2</metrics4-scala.version>
+        <metrics4-scala.version>4.3.3</metrics4-scala.version>
 
         <!-- Keep these version consistent with pekko-persistence-mongodb.version's build.sbt -->
-        <mongo-java-driver.version>5.1.4</mongo-java-driver.version>
+        <mongo-java-driver.version>5.2.0</mongo-java-driver.version>
 
         <!-- AWS SDK version needed for MongoDB AWS IAM authentication -->
         <awssdk.version>2.26.21</awssdk.version>

diff --git a/.../src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/MongoClientWrapper.java b/.../src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/MongoClientWrapper.java
@@ -26,6 +26,7 @@
 import javax.net.ssl.SSLContext;
 
 import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 import org.eclipse.ditto.internal.utils.persistence.mongo.auth.AwsAuthenticationHelper;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.MongoDbConfig;
@@ -49,6 +50,7 @@
 import com.mongodb.reactivestreams.client.ListDatabasesPublisher;
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoClients;
+import com.mongodb.reactivestreams.client.MongoCluster;
 import com.mongodb.reactivestreams.client.MongoCollection;
 import com.mongodb.reactivestreams.client.MongoDatabase;
 
@@ -125,6 +127,56 @@ public DittoMongoClientSettings getDittoSettings() {
         return dittoMongoClientSettings;
     }
 
+    @Override
+    public CodecRegistry getCodecRegistry() {
+        return mongoClient.getCodecRegistry();
+    }
+
+    @Override
+    public ReadPreference getReadPreference() {
+        return mongoClient.getReadPreference();
+    }
+
+    @Override
+    public WriteConcern getWriteConcern() {
+        return mongoClient.getWriteConcern();
+    }
+
+    @Override
+    public ReadConcern getReadConcern() {
+        return mongoClient.getReadConcern();
+    }
+
+    @Override
+    public Long getTimeout(final TimeUnit timeUnit) {
+        return mongoClient.getTimeout(timeUnit);
+    }
+
+    @Override
+    public MongoCluster withCodecRegistry(final CodecRegistry codecRegistry) {
+        return mongoClient.withCodecRegistry(codecRegistry);
+    }
+
+    @Override
+    public MongoCluster withReadPreference(final ReadPreference readPreference) {
+        return mongoClient.withReadPreference(readPreference);
+    }
+
+    @Override
+    public MongoCluster withWriteConcern(final WriteConcern writeConcern) {
+        return mongoClient.withWriteConcern(writeConcern);
+    }
+
+    @Override
+    public MongoCluster withReadConcern(final ReadConcern readConcern) {
+        return mongoClient.withReadConcern(readConcern);
+    }
+
+    @Override
+    public MongoCluster withTimeout(final long l, final TimeUnit timeUnit) {
+        return mongoClient.withTimeout(l, timeUnit);
+    }
+
     @Override
     public MongoDatabase getDatabase(final String name) {
         return mongoClient.getDatabase(name);