OAK-9447: Upgrade Mongo java driver to 5.2

oak-benchmarks/pom.xml

@@ -206,7 +206,7 @@
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
+            <artifactId>mongodb-driver-sync</artifactId>
         </dependency>
          <dependency>
             <groupId>com.h2database</groupId>

oak-examples/standalone/pom.xml

@@ -100,8 +100,7 @@
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
-      <version>${mongo.driver.version}</version>
+      <artifactId>mongodb-driver-sync</artifactId>
       <optional>true</optional>
     </dependency>
     <!-- Required for the persistent cache -->

oak-it/pom.xml

@@ -186,7 +186,7 @@
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
+            <artifactId>mongodb-driver-sync</artifactId>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>

oak-jcr/pom.xml

@@ -389,7 +389,7 @@
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
+      <artifactId>mongodb-driver-sync</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/NonLocalObservationIT.java

@@ -48,7 +48,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
 
 /**
  * Test for external events from another cluster node.
@@ -108,7 +108,7 @@ public void dispose(NodeStore nodeStore) {
                 nodeStores.remove(nodeStore);
                 if (nodeStores.size() == 0) {
                     try (MongoClient c = createClient()) {
-                        c.dropDatabase(dbName);
+                        c.getDatabase(dbName).drop();
                     } catch (Exception e) {
                         log.error("dispose: Can't close Mongo", e);
                     }

oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java

@@ -38,8 +38,6 @@
 import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 
-import com.mongodb.DB;
-
 /**
  * A randomized test that writes to two repositories (using different storage
  * backends), and compares the results. The test uses low cache sizes, and low

oak-lucene/pom.xml

@@ -281,7 +281,7 @@
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
+      <artifactId>mongodb-driver-sync</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

oak-parent/pom.xml

@@ -58,7 +58,7 @@
     <segment.db>SegmentMK</segment.db>
     <lucene.version>4.7.2</lucene.version>
     <solr.version>8.11.1</solr.version>
-    <mongo.driver.version>3.12.14</mongo.driver.version>
+    <mongo.driver.version>5.2.0</mongo.driver.version>
     <slf4j.api.version>1.7.36</slf4j.api.version>
     <slf4j.version>1.7.36</slf4j.version> <!-- sync with logback version -->
     <logback.version>1.2.13</logback.version>
@@ -558,7 +558,7 @@
       </dependency>
       <dependency>
         <groupId>org.mongodb</groupId>
-        <artifactId>mongo-java-driver</artifactId>
+        <artifactId>mongodb-driver-sync</artifactId>
         <version>${mongo.driver.version}</version>
       </dependency>
       <dependency>

oak-pojosr/pom.xml

@@ -121,7 +121,7 @@
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
+      <artifactId>mongodb-driver-sync</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>

oak-run-commons/pom.xml

@@ -117,7 +117,7 @@
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
+            <artifactId>mongodb-driver-sync</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java

@@ -43,7 +43,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 
 import static java.util.Arrays.asList;
 import static org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBuilder.newMongoDocumentNodeStoreBuilder;
@@ -109,7 +109,7 @@ static OakFixture newCompositeMongoFixture(String name, String uri, boolean drop
                                                boolean throttlingEnabled) {
         return new CompositeStoreFixture(name) {
 
-            private String database = new MongoClientURI(uri).getDatabase();
+            private String database = new ConnectionString(uri).getDatabase();
             private DocumentNodeStore ns;
 
             @Override

oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java

@@ -16,11 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.jackrabbit.oak.index.indexer.document;
 
 import com.codahale.metrics.MetricRegistry;
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import com.mongodb.client.MongoDatabase;
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
 import org.apache.jackrabbit.guava.common.io.Closer;
@@ -483,8 +482,8 @@ private MongoDocumentStore getMongoDocumentStore() {
         return requireNonNull(indexHelper.getService(MongoDocumentStore.class));
     }
 
-    private MongoClientURI getMongoClientURI() {
-        return requireNonNull(indexHelper.getService(MongoClientURI.class));
+    private ConnectionString getMongoClientURI() {
+        return requireNonNull(indexHelper.getService(ConnectionString.class));
     }
 
     private MongoDatabase getMongoDatabase() {
@@ -508,7 +507,7 @@ private void configureEstimators(IndexingProgressReporter progressReporter) {
     private long getEstimatedDocumentCount() {
         MongoConnection mongoConnection = indexHelper.getService(MongoConnection.class);
         if (mongoConnection != null) {
-            return mongoConnection.getDatabase().getCollection("nodes").count();
+            return mongoConnection.getDatabase().getCollection("nodes").countDocuments();
         }
         return 0;
     }

oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java

@@ -19,7 +19,7 @@
 
 package org.apache.jackrabbit.oak.index.indexer.document.flatfile;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import com.mongodb.client.MongoDatabase;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
@@ -112,7 +112,7 @@ public class FlatFileNodeStoreBuilder {
     private String checkpoint;
     private StatisticsProvider statisticsProvider = StatisticsProvider.NOOP;
     private IndexingReporter indexingReporter = IndexingReporter.NOOP;
-    private MongoClientURI mongoClientURI;
+    private ConnectionString mongoClientURI;
     private boolean withAheadOfTimeBlobDownloading = false;
 
     public enum SortStrategyType {
@@ -191,7 +191,7 @@ public FlatFileNodeStoreBuilder withCheckpoint(String checkpoint) {
         return this;
     }
 
-    public FlatFileNodeStoreBuilder withMongoClientURI(MongoClientURI mongoClientURI) {
+    public FlatFileNodeStoreBuilder withMongoClientURI(ConnectionString mongoClientURI) {
         this.mongoClientURI = mongoClientURI;
         return this;
     }

oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTask.java

@@ -20,7 +20,6 @@
 
 import com.mongodb.ConnectionString;
 import com.mongodb.MongoClientSettings;
-import com.mongodb.MongoClientURI;
 import com.mongodb.MongoException;
 import com.mongodb.MongoIncompatibleDriverException;
 import com.mongodb.MongoInterruptedException;
@@ -204,7 +203,7 @@ public String toString() {
     static final String THREAD_NAME_PREFIX = "mongo-dump";
 
 
-    private final MongoClientURI mongoClientURI;
+    private final ConnectionString mongoClientURI;
     private final MongoDocumentStore docStore;
     private final int maxBatchSizeBytes;
     private final int maxBatchNumberOfDocuments;
@@ -229,7 +228,7 @@ public String toString() {
     private final DownloadStageStatistics downloadStageStatistics = new DownloadStageStatistics();
     private Instant lastDelayedEnqueueWarningMessageLoggedTimestamp = Instant.now();
 
-    public PipelinedMongoDownloadTask(MongoClientURI mongoClientURI,
+    public PipelinedMongoDownloadTask(ConnectionString mongoClientURI,
                                       MongoDocumentStore docStore,
                                       int maxBatchSizeBytes,
                                       int maxBatchNumberOfDocuments,
@@ -240,7 +239,7 @@ public PipelinedMongoDownloadTask(MongoClientURI mongoClientURI,
         this(mongoClientURI, docStore, maxBatchSizeBytes, maxBatchNumberOfDocuments, queue, pathFilters, statisticsProvider, reporter, new ThreadFactoryBuilder().setDaemon(true).build());
     }
 
-    public PipelinedMongoDownloadTask(MongoClientURI mongoClientURI,
+    public PipelinedMongoDownloadTask(ConnectionString mongoClientURI,
                                       MongoDocumentStore docStore,
                                       int maxBatchSizeBytes,
                                       int maxBatchNumberOfDocuments,
@@ -343,7 +342,7 @@ public Result call() throws Exception {
             );
 
             MongoClientSettings.Builder settingsBuilder = MongoClientSettings.builder()
-                    .applyConnectionString(new ConnectionString(mongoClientURI.getURI()))
+                    .applyConnectionString(mongoClientURI)
                     .readPreference(ReadPreference.secondaryPreferred());
             if (parallelDump && parallelDumpSecondariesOnly) {
                 // Set a custom server selector that is able to distribute the two connections between the two secondaries.

oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedStrategy.java

@@ -18,7 +18,7 @@
  */
 package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.guava.common.base.Preconditions;
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
@@ -179,7 +179,7 @@ private static void prettyPrintTransformStatisticsHistograms(TransformStageStati
     }
 
     private final MongoDocumentStore docStore;
-    private final MongoClientURI mongoClientURI;
+    private final ConnectionString mongoClientURI;
     private final DocumentNodeStore documentNodeStore;
     private final RevisionVector rootRevision;
     private final BlobStore blobStore;
@@ -204,7 +204,7 @@ private static void prettyPrintTransformStatisticsHistograms(TransformStageStati
      * @param statisticsProvider Used to collect statistics about the indexing process.
      * @param indexingReporter   Used to collect diagnostics, metrics and statistics and report them at the end of the indexing process.
      */
-    public PipelinedStrategy(MongoClientURI mongoClientURI,
+    public PipelinedStrategy(ConnectionString mongoClientURI,
                              MongoDocumentStore documentStore,
                              DocumentNodeStore documentNodeStore,
                              RevisionVector rootRevision,

oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedTreeStoreStrategy.java

@@ -18,7 +18,7 @@
  */
 package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.guava.common.base.Preconditions;
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
@@ -166,7 +166,7 @@ private static void prettyPrintTransformStatisticsHistograms(TransformStageStati
     }
 
     private final MongoDocumentStore docStore;
-    private final MongoClientURI mongoClientURI;
+    private final ConnectionString mongoClientURI;
     private final DocumentNodeStore documentNodeStore;
     private final RevisionVector rootRevision;
     private final BlobStore blobStore;
@@ -190,7 +190,7 @@ private static void prettyPrintTransformStatisticsHistograms(TransformStageStati
      * @param statisticsProvider Used to collect statistics about the indexing process.
      * @param indexingReporter   Used to collect diagnostics, metrics and statistics and report them at the end of the indexing process.
      */
-    public PipelinedTreeStoreStrategy(MongoClientURI mongoClientURI,
+    public PipelinedTreeStoreStrategy(ConnectionString mongoClientURI,
                              MongoDocumentStore documentStore,
                              DocumentNodeStore documentNodeStore,
                              RevisionVector rootRevision,

oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java

@@ -22,9 +22,9 @@
 
 import javax.sql.DataSource;
 
+import com.mongodb.ConnectionString;
 import com.mongodb.client.MongoDatabase;
 import org.apache.jackrabbit.guava.common.io.Closer;
-import com.mongodb.MongoClientURI;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreBuilder;
@@ -101,14 +101,14 @@ static DocumentNodeStore configureDocumentMk(Options options,
 
         DocumentNodeStore dns;
         if (commonOpts.isMongo()) {
-            MongoClientURI uri = new MongoClientURI(commonOpts.getStoreArg());
+            ConnectionString uri = new ConnectionString(commonOpts.getStoreArg());
             if (uri.getDatabase() == null) {
                 System.err.println("Database missing in MongoDB URI: "
-                        + uri.getURI());
+                        + uri);
                 System.exit(1);
             }
-            MongoConnection mongo = new MongoConnection(uri.getURI());
-            wb.register(MongoClientURI.class, uri, emptyMap());
+            MongoConnection mongo = new MongoConnection(uri.getConnectionString());
+            wb.register(ConnectionString.class, uri, emptyMap());
             wb.register(MongoConnection.class, mongo, emptyMap());
             wb.register(MongoDatabase.class, mongo.getDatabase(), emptyMap());
             closer.register(mongo::close);

oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/MongoTestBackend.java

@@ -18,7 +18,7 @@
  */
 package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import com.mongodb.client.MongoDatabase;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
@@ -27,12 +27,12 @@
 import java.io.IOException;
 
 class MongoTestBackend implements Closeable {
-    final MongoClientURI mongoClientURI;
+    final ConnectionString mongoClientURI;
     final MongoDocumentStore mongoDocumentStore;
     final DocumentNodeStore documentNodeStore;
     final MongoDatabase mongoDatabase;
 
-    public MongoTestBackend(MongoClientURI mongoClientURI, MongoDocumentStore mongoDocumentStore, DocumentNodeStore documentNodeStore, MongoDatabase mongoDatabase) {
+    public MongoTestBackend(ConnectionString mongoClientURI, MongoDocumentStore mongoDocumentStore, DocumentNodeStore documentNodeStore, MongoDatabase mongoDatabase) {
         this.mongoClientURI = mongoClientURI;
         this.mongoDocumentStore = mongoDocumentStore;
         this.documentNodeStore = documentNodeStore;

oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelineITUtil.java

@@ -18,7 +18,7 @@
  */
 package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.commons.Compression;
 import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
@@ -179,7 +179,7 @@ static MongoTestBackend createNodeStore(boolean readOnly, MongoConnectionFactory
     }
 
     static MongoTestBackend createNodeStore(boolean readOnly, String mongoUri, DocumentMKBuilderProvider builderProvider) {
-        MongoClientURI mongoClientUri = new MongoClientURI(mongoUri);
+        ConnectionString mongoClientUri = new ConnectionString(mongoUri);
         DocumentMK.Builder builder = builderProvider.newBuilder();
         builder.setMongoDB(mongoUri, "oak", 0);
         if (readOnly) {

oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoDownloadTaskTest.java

@@ -18,7 +18,7 @@
  */
 package org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined;
 
-import com.mongodb.MongoClient;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.client.model.Filters;
 import org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipelined.MongoRegexPathFilterFactory.MongoFilterPaths;
 import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
@@ -336,8 +336,8 @@ private void assertBsonEquals(Bson actual, Bson expected) {
             throw new AssertionError("One of the bson is null. Actual: " + actual + ", expected: " + expected);
         }
         assertEquals(
-                actual.toBsonDocument(BsonDocument.class, MongoClient.getDefaultCodecRegistry()),
-                expected.toBsonDocument(BsonDocument.class, MongoClient.getDefaultCodecRegistry())
+                actual.toBsonDocument(BsonDocument.class, MongoClientSettings.getDefaultCodecRegistry()),
+                expected.toBsonDocument(BsonDocument.class, MongoClientSettings.getDefaultCodecRegistry())
         );
     }
 

oak-run/pom.xml

@@ -296,7 +296,7 @@
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
+      <artifactId>mongodb-driver-sync</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mapdb</groupId>