Merge pull request #7440 from svemeyer/update-mongodb-9.2-new

pom: Update mongodb-driver
dCache · Nov 30, 2023 · 06ddc6e · 06ddc6e
2 parents fc02003 + a83cc7f
commit 06ddc6e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml
@@ -313,7 +313,7 @@
     </dependency>
     <dependency>
         <groupId>org.mongodb</groupId>
-        <artifactId>mongo-java-driver</artifactId>
+        <artifactId>mongodb-driver-sync</artifactId>
     </dependency>
 
       <dependency>

diff --git a/...dcache/src/main/java/org/dcache/pool/repository/meta/mongo/MongoDbMetadataRepository.java b/...dcache/src/main/java/org/dcache/pool/repository/meta/mongo/MongoDbMetadataRepository.java
@@ -6,10 +6,11 @@
 import static org.dcache.util.Exceptions.messageOrClassName;
 
 import com.google.common.base.Stopwatch;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoException;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.event.ServerClosedEvent;
 import com.mongodb.event.ServerDescriptionChangedEvent;
@@ -130,14 +131,13 @@ public MongoDbMetadataRepository(FileStore fileStore, Path ignored, String poolN
 
     @Override
     public void init() throws CacheException {
+        MongoClientSettings settings = MongoClientSettings.builder()
+              .applicationName("dCache-" + Version.of(MongoDbMetadataRepository.class).getVersion())
+              .applyToServerSettings(builder -> builder.addServerListener(this))
+              .applyConnectionString(new ConnectionString(url))
+              .build();
+        mongo = MongoClients.create(settings);
 
-        MongoClientOptions.Builder optionBuilder = new MongoClientOptions.Builder()
-              .addServerListener(this)
-              .description(pool)
-              .applicationName(
-                    "dCache-" + Version.of(MongoDbMetadataRepository.class).getVersion());
-
-        mongo = new MongoClient(new MongoClientURI(url, optionBuilder));
         collection = mongo.getDatabase(dbName).getCollection(collectionName);
     }
 
@@ -278,7 +278,7 @@ public long getTotalSpace() {
 
     @Override
     public String toString() {
-        return String.format("[data=%s;meta=%s]", fileStore, mongo.getConnectPoint());
+        return String.format("[data=%s;meta=%s]", fileStore, url);
     }
 
     @Override

diff --git a/pom.xml b/pom.xml
@@ -832,8 +832,8 @@
             </dependency>
             <dependency>
                 <groupId>org.mongodb</groupId>
-                <artifactId>mongo-java-driver</artifactId>
-                <version>3.4.2</version>
+                <artifactId>mongodb-driver-sync</artifactId>
+                <version>4.11.1</version>
             </dependency>
 
             <dependency>