Merge pull request #1967 from beyonnex-io/update-pekko-persistence-and-mongo-driver

update pekko-persistence-mongo and mongo-driver to latest

Author: thjaeckle

bom/pom.xml

@@ -47,7 +47,7 @@
 
         <pekko-bom.version>1.0.2</pekko-bom.version>
         <pekko-http-bom.version>1.0.0</pekko-http-bom.version>
-        <pekko-persistence-mongodb.version>1.1.0</pekko-persistence-mongodb.version>
+        <pekko-persistence-mongodb.version>1.2.0</pekko-persistence-mongodb.version>
         <pekko-persistence-inmemory.version>1.0.0</pekko-persistence-inmemory.version>
         <pekko-management.version>1.0.0</pekko-management.version>
         <pekko-connector-kafka.version>1.0.0</pekko-connector-kafka.version>
@@ -57,15 +57,15 @@
         <metrics4-scala.version>4.2.9</metrics4-scala.version>
 
         <!-- Keep these version consistent with pekko-persistence-mongodb.version's build.sbt -->
-        <mongo-java-driver.version>4.11.1</mongo-java-driver.version>
+        <mongo-java-driver.version>5.1.1</mongo-java-driver.version>
 
         <jjwt.version>0.12.5</jjwt.version>
         <asm.version>9.2</asm.version>
         <qpid-jms-client.version>1.11.0</qpid-jms-client.version>
         <pjfanning-pekko-rabbitmq.version>7.0.0</pjfanning-pekko-rabbitmq.version>
         <amqp-client.version>5.18.0</amqp-client.version>
         <reactive-streams.version>1.0.4</reactive-streams.version>
-        <netty-bom.version>4.1.106.Final</netty-bom.version>
+        <netty-bom.version>4.1.111.Final</netty-bom.version>
         <cloudevents.version>2.5.0</cloudevents.version>
 
         <slf4j.version>2.0.11</slf4j.version>

deployment/helm/ditto/Chart.yaml

@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.5.9  # chart version is effectively set by release-job
+version: 3.5.10  # chart version is effectively set by release-job
 appVersion: 3.5.9
 keywords:
   - iot-chart

deployment/helm/ditto/values.yaml

@@ -597,10 +597,12 @@ policies:
       # maxPoolIdleTime configures the maximum amount of time a pooled connection is allowed to idle before closing the connection
       maxPoolIdleTime: 10m
       # journalWriteConcern the MongoDB write concern to apply for writing operations on the event journal
-      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged | W1 | W2 | W3
+      #  caution: Acknowledged refers to the MongoDB server's configured "default write concern"
       journalWriteConcern: "Journaled"
       # snapsWriteConcern the MongoDB write concern to apply for writing operations on the snapshots persistence
-      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged | W1 | W2 | W3
+      #  caution: Acknowledged refers to the MongoDB server's configured "default write concern"
       snapsWriteConcern: "Journaled"
       # journalCircuitBreaker configures the circuit breaker for MongoDB operations on the event journal
       journalCircuitBreaker:
@@ -828,10 +830,12 @@ things:
       # maxPoolIdleTime configures the maximum amount of time a pooled connection is allowed to idle before closing the connection
       maxPoolIdleTime: 10m
       # journalWriteConcern the MongoDB write concern to apply for writing operations on the event journal
-      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged | W1 | W2 | W3
+      #  caution: Acknowledged refers to the MongoDB server's configured "default write concern"
       journalWriteConcern: "Acknowledged"
       # snapsWriteConcern the MongoDB write concern to apply for writing operations on the snapshots persistence
-      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged | W1 | W2 | W3
+      #  caution: Acknowledged refers to the MongoDB server's configured "default write concern"
       snapsWriteConcern: "Acknowledged"
       # journalCircuitBreaker configures the circuit breaker for MongoDB operations on the event journal
       journalCircuitBreaker:
@@ -1296,10 +1300,12 @@ connectivity:
       # maxPoolIdleTime configures the maximum amount of time a pooled connection is allowed to idle before closing the connection
       maxPoolIdleTime: 10m
       # journalWriteConcern the MongoDB write concern to apply for writing operations on the event journal
-      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged | W1 | W2 | W3
+      #  caution: Acknowledged refers to the MongoDB server's configured "default write concern"
       journalWriteConcern: "Journaled"
       # snapsWriteConcern the MongoDB write concern to apply for writing operations on the snapshots persistence
-      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged
+      #  one of: Unacknowledged | Acknowledged | Journaled | ReplicaAcknowledged | W1 | W2 | W3
+      #  caution: Acknowledged refers to the MongoDB server's configured "default write concern"
       snapsWriteConcern: "Journaled"
       # journalCircuitBreaker configures the circuit breaker for MongoDB operations on the event journal
       journalCircuitBreaker:

internal/utils/persistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/mongo/MongoClientWrapper.java

@@ -39,7 +39,7 @@
 import com.mongodb.WriteConcern;
 import com.mongodb.connection.ClusterDescription;
 import com.mongodb.connection.ServerDescription;
-import com.mongodb.connection.netty.NettyStreamFactoryFactory;
+import com.mongodb.connection.TransportSettings;
 import com.mongodb.event.CommandListener;
 import com.mongodb.event.ConnectionPoolListener;
 import com.mongodb.management.JMXConnectionPoolListener;
@@ -448,7 +448,7 @@ private void buildAndApplySslSettings() {
             if (sslEnabled) {
                 eventLoopGroup = new NioEventLoopGroup();
                 mongoClientSettingsBuilder
-                        .streamFactoryFactory(NettyStreamFactoryFactory.builder().eventLoopGroup(eventLoopGroup).build())
+                        .transportSettings(TransportSettings.nettyBuilder().eventLoopGroup(eventLoopGroup).build())
                         .applyToSslSettings(builder -> builder
                                 .context(tryToCreateAndInitSslContext())
                                 .enabled(sslEnabled));