Issue #11322 Upgrade to mongodb-driver-sync 5.x (#11681)

Upgrade to mongodb driver async 5.x --------- Signed-off-by: Olivier Lamy <olamy@apache.org>
jetty · Aug 28, 2024 · edbd21b · edbd21b
1 parent 1bf0748
commit edbd21b
Show file tree

Hide file tree

Showing 11 changed files with 190 additions and 180 deletions.
diff --git a/jetty-integrations/jetty-nosql/pom.xml b/jetty-integrations/jetty-nosql/pom.xml
@@ -23,10 +23,21 @@
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
+      <artifactId>bson</artifactId>
       <version>${mongodb.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongodb-driver-core</artifactId>
+      <version>${mongodb.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongodb-driver-sync</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod
@@ -14,11 +14,15 @@ sessions
 sessions/mongo/${connection-type}
 
 [files]
-maven://org.mongodb/mongo-java-driver/${mongodb.version}|lib/nosql/mongo-java-driver-${mongodb.version}.jar
+maven://org.mongodb/mongodb-driver-sync/${mongodb.version}|lib/nosql/mongodb-driver-sync-${mongodb.version}.jar
+maven://org.mongodb/mongodb-driver-core/${mongodb.version}|lib/nosql/mongodb-driver-core-${mongodb.version}.jar
+maven://org.mongodb/bson/${mongodb.version}|lib/nosql/bson-${mongodb.version}.jar
 
 [lib]
 lib/jetty-nosql-${jetty.version}.jar
-lib/nosql/mongo-java-driver-${mongodb.version}.jar
+lib/nosql/mongodb-driver-sync-${mongodb.version}.jar
+lib/nosql/mongodb-driver-core-${mongodb.version}.jar
+lib/nosql/bson-${mongodb.version}.jar
 
 [license]
 The java driver for the MongoDB document-based database system is hosted on GitHub and released under the Apache 2.0 license.

diff --git a/jetty-integrations/jetty-nosql/src/main/java/module-info.java b/jetty-integrations/jetty-nosql/src/main/java/module-info.java
@@ -13,7 +13,9 @@
 
 module org.eclipse.jetty.nosql
 {
-    requires transitive mongo.java.driver;
+    requires transitive org.mongodb.driver.core;
+    requires transitive org.mongodb.driver.sync.client;
+    requires transitive org.mongodb.bson;
     requires transitive org.eclipse.jetty.session;
 
     exports org.eclipse.jetty.nosql;

diff --git a/...integrations/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionDataStore.java b/...integrations/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionDataStore.java
@@ -62,7 +62,7 @@ public Set<String> takeDirtyAttributes()
 
         public Set<String> getAllAttributeNames()
         {
-            return new HashSet<String>(_attributes.keySet());
+            return new HashSet<>(_attributes.keySet());
         }
     }