mongo42driver: uncompilable interims commit with *-legacy bundle removed from our bundle dependencies;

this produces lots of compilation errors, mostly because of MongoClientURI replaced by ConnectionString

java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF

@@ -10,7 +10,6 @@ Require-Bundle: com.sap.sse.mongodb,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Export-Package: com.sap.sailing.domain.igtimiadapter.persistence
 Import-Package: com.sap.sailing.domain.common.security,
  com.sap.sse.security,

java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF

@@ -18,7 +18,6 @@ Require-Bundle: com.sap.sse.mongodb,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sse.security.common,
  com.sap.sailing.shared.persistence
 Export-Package: com.sap.sailing.domain.persistence,

java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF

@@ -20,7 +20,6 @@ Require-Bundle: com.sap.sailing.domain.shared.android,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sse.shared.android
 Export-Package: com.sap.sailing.domain.racelog.tracking.test.mock
 Automatic-Module-Name: com.sap.sailing.domain.racelogtrackingadapter.testsupport

java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF

@@ -22,7 +22,6 @@ Require-Bundle: com.sap.sailing.domain,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sailing.shared.persistence;bundle-version="1.0.0",
  com.sap.sse.shared.android
 Import-Package: com.google.zxing;version="3.1.0",

java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF

@@ -16,7 +16,6 @@ Require-Bundle: com.sap.sailing.domain.swisstimingadapter,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sse.security.common,
  com.sap.sse.replication.interfaces
 Export-Package: com.sap.sailing.domain.swisstimingadapter.persistence,

java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF

@@ -23,7 +23,6 @@ Require-Bundle: com.sap.sailing.domain,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sailing.domain.shared.android,
  com.sap.sse.replication.interfaces
 Bundle-ClassPath: resources/,

java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF

@@ -33,7 +33,6 @@ Require-Bundle: com.sap.sailing.domain,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  org.apache.commons.math3;bundle-version="3.5.0",
  org.apache.shiro.core;bundle-version="1.2.2"
 Export-Package: com.sap.sailing.domain.test,

java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF

@@ -16,7 +16,6 @@ Require-Bundle: com.sap.sse.mongodb,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sse.security.common,
  com.sap.sse.replication.interfaces,
  com.tractrac.clientmodule;bundle-version="3.13.1",

java/com.sap.sailing.expeditionconnector.persistence/META-INF/MANIFEST.MF

@@ -19,6 +19,5 @@ Require-Bundle: com.sap.sailing.domain.persistence,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Export-Package: com.sap.sailing.expeditionconnector.persistence
 Automatic-Module-Name: com.sap.sailing.expeditionconnector.persistence

java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF

@@ -64,7 +64,6 @@ Require-Bundle: com.sap.sailing.domain,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sailing.server.gateway.serialization.shared.android,
  com.sap.sailing.shared.server,
  org.apache.commons.math;bundle-version="2.1.0",

java/com.sap.sailing.landscape.test/META-INF/MANIFEST.MF

@@ -11,4 +11,3 @@ Require-Bundle: org.junit,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"

java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF

@@ -17,5 +17,4 @@ Require-Bundle: com.sap.sse.mongodb,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Automatic-Module-Name: com.sap.sailing.media.persistence.test

java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java

@@ -7,8 +7,9 @@ import java.net.UnknownHostException;
 import org.junit.After;
 import org.junit.Before;
 
-import com.mongodb.MongoClient;
 import com.mongodb.MongoException;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 import com.sap.sse.mongodb.MongoDBConfiguration;
 import com.sap.sse.mongodb.MongoDBService;
@@ -31,7 +32,7 @@ public abstract class AbstractMongoDBTest {
     }
     
     protected MongoClient newMongo() throws UnknownHostException, MongoException {
-        return new MongoClient(dbConfiguration.getMongoClientURI());
+        return MongoClients.create(dbConfiguration.getMongoClientURI());
     }
     
     @Before

java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MongoClientURITest.java

@@ -15,7 +15,7 @@ public class MongoClientURITest {
         assertEquals("humba", config.getHostname());
         assertEquals(12345, config.getPort());
         assertEquals("mydb", config.getDatabaseName());
-        assertSame(ReadPreference.primaryPreferred(), config.getMongoClientURI().getOptions().getReadPreference()); 
+        assertSame(ReadPreference.primaryPreferred(), config.getMongoClientURI().getReadPreference()); 
     }
 
     @Test
@@ -24,7 +24,7 @@ public class MongoClientURITest {
         assertEquals("humba", config.getHostname());
         assertEquals(12345, config.getPort());
         assertEquals("mydb", config.getDatabaseName());
-        assertSame(ReadPreference.primary(), config.getMongoClientURI().getOptions().getReadPreference()); 
+        assertSame(ReadPreference.primary(), config.getMongoClientURI().getReadPreference()); 
-        assertEquals("rs0", config.getMongoClientURI().getOptions().getRequiredReplicaSetName());
+        assertEquals("rs0", config.getMongoClientURI().getRequiredReplicaSetName());
     }
 }

java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java

@@ -14,8 +14,9 @@ import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.mongodb.MongoClient;
 import com.mongodb.MongoException;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 import com.sap.sailing.domain.base.RaceDefinition;
 import com.sap.sailing.domain.base.Regatta;
@@ -66,14 +67,14 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive
     }
     
     private MongoClient newMongo() throws UnknownHostException, MongoException {
-        return new MongoClient(dbConfiguration.getMongoClientURI());
+        return MongoClients.create(dbConfiguration.getMongoClientURI());
     }
     
     @Before
     public void dropTestDB() throws UnknownHostException, MongoException {
         mongo = newMongo();
         assertNotNull(mongo);
-        mongo.dropDatabase(dbConfiguration.getMongoClientURI().getDatabase());
+        mongo.getDatabase(dbConfiguration.getMongoClientURI().getDatabase()).drop();
         db = mongo.getDatabase(dbConfiguration.getMongoClientURI().getDatabase());
         assertNotNull(db);
     }

java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF

@@ -16,7 +16,6 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sun.jersey;bundle-version="1.17.0",
  com.sap.sse.security
 Bundle-ClassPath: lib/cglib-nodep-2.2.3.jar,

java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF

@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.jetty.osgi-servlet-api;bundle-version="3.1.0",
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  org.apache.shiro.core;bundle-version="1.2.2",
  org.apache.shiro.ehcache;bundle-version="1.2.3",
  org.apache.shiro.web;bundle-version="1.2.2",

java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF

@@ -65,7 +65,6 @@ Require-Bundle: com.sap.sailing.domain,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sailing.shared.server,
  com.sap.sailing.shared.server.gateway
 Bundle-ClassPath: .

java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF

@@ -34,7 +34,6 @@ Require-Bundle: com.sap.sailing.server,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sse.security,
  com.sap.sse.security.common,
  com.sun.jersey;bundle-version="1.17.0",

java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/MediaReplicationTest.java

@@ -29,8 +29,9 @@ import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
+import com.mongodb.ConnectionString;
 import com.mongodb.MongoClientOptions;
-import com.mongodb.MongoClientURI;
+import com.mongodb.MongoClientSettings;
 import com.sap.sailing.domain.base.CompetitorAndBoatStore;
 import com.sap.sailing.domain.base.DomainFactory;
 import com.sap.sailing.domain.base.Regatta;
@@ -84,12 +85,12 @@ public class MediaReplicationTest extends AbstractServerReplicationTest {
             @Override
             public RacingEventServiceImpl createNewReplica() {
                 final MongoDBConfiguration masterMongoDBConfig = mongoDBService.getConfiguration();
-                final MongoClientURI masterMongoDbUri = masterMongoDBConfig.getMongoClientURI();
+                final ConnectionString masterMongoDbUri = masterMongoDBConfig.getMongoClientURI();
-                final MongoClientOptions masterMongoDbOptions = masterMongoDbUri.getOptions();
+                MongoClientSettings.builder().applyConnectionString(masterMongoDbUri).build();
                 final MongoDBConfiguration proxyReplicaMongoDBConfig = new MongoDBConfiguration(
                         masterMongoDBConfig.getHostname(), masterMongoDBConfig.getPort(),
                         masterMongoDBConfig.getDatabaseName() + "-replica"); // use to construct basic MongoDB URI for replica DB name
-                final MongoClientURI replicaMongoDbUri = new MongoClientURI(proxyReplicaMongoDBConfig.getMongoClientURI().toString()) {
+                final ConnectionString replicaMongoDbUri = new ConnectionString(proxyReplicaMongoDBConfig.getMongoClientURI().toString()) {
                     @Override
                     public MongoClientOptions getOptions() {
                         return masterMongoDbOptions;

java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF

@@ -38,7 +38,6 @@ Require-Bundle: com.sap.sailing.server,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sse.security.common,
  com.sap.sse.mail
 Automatic-Module-Name: com.sap.sailing.server.testsupport

java/com.sap.sailing.server/META-INF/MANIFEST.MF

@@ -43,7 +43,6 @@ Require-Bundle: com.sap.sailing.domain,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sse.security.common,
  com.sap.sailing.resultimport,
  com.sap.sailing.shared.server

java/com.sap.sailing.shared.persistence/META-INF/MANIFEST.MF

@@ -19,7 +19,6 @@ Require-Bundle: com.sap.sse.mongodb,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sailing.domain.shared.android,
  com.sap.sse.security.common
 Export-Package: com.sap.sailing.shared.persistence,

java/com.sap.sailing.shared.server.gateway/META-INF/MANIFEST.MF

@@ -52,7 +52,6 @@ Require-Bundle: com.sap.sailing.domain,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  com.sap.sailing.domain.racelogtrackingadapter
 Bundle-ClassPath: .
 Web-ContextPath: /sharedsailingserver

java/com.sap.sailing.windestimation/META-INF/MANIFEST.MF

@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.1",
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  org.apache.httpcomponents.httpclient;bundle-version="4.5.5",
  org.apache.httpcomponents.httpcore;bundle-version="4.4.9",
  com.sap.sse,

java/com.sap.sse.filestorage/META-INF/MANIFEST.MF

@@ -26,5 +26,4 @@ Require-Bundle: com.amazon.aws.aws-java-api,
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Automatic-Module-Name: com.sap.sse.filestorage

java/com.sap.sse.landscape.aws.persistence/META-INF/MANIFEST.MF

@@ -15,5 +15,4 @@ Require-Bundle: com.sap.sse.mongodb,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Export-Package: com.sap.sse.landscape.aws.persistence

java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF

@@ -14,6 +14,5 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: org.mockito,
  org.mockito.stubbing;version="1.10.14"

java/com.sap.sse.landscape.aws/META-INF/MANIFEST.MF

@@ -26,7 +26,6 @@ Require-Bundle: com.amazon.aws.aws-java-api;bundle-version="2.13.50",
  com.sap.sse.operationaltransformation,
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Web-ContextPath: /landscape
 Import-Package: org.apache.shiro;version="1.2.2",
  org.osgi.framework;version="1.8.0",

java/com.sap.sse.landscape/META-INF/MANIFEST.MF

@@ -30,5 +30,4 @@ Require-Bundle: com.sap.sse.common,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Bundle-ActivationPolicy: lazy

java/com.sap.sse.mongodb/META-INF/MANIFEST.MF

@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sse.common,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1"
 Export-Package: com.sap.sse.mongodb
 Bundle-ActivationPolicy: lazy

java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/Activator.java

@@ -6,7 +6,7 @@ import java.util.logging.Logger;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import com.sap.sse.mongodb.internal.MongoDBServiceImpl;
 
 public class Activator implements BundleActivator {
@@ -19,8 +19,7 @@ public class Activator implements BundleActivator {
         final String mongoClientURI = context.getProperty(MongoDBConfiguration.MONGO_URI);
         if (mongoClientURI != null) {
             logger.info("found "+MongoDBConfiguration.MONGO_URI+"="+mongoClientURI);
-            newConfiguration = new MongoDBConfiguration(new MongoClientURI(
+            newConfiguration = new MongoDBConfiguration(new ConnectionString(context.getProperty(MongoDBConfiguration.MONGO_URI)));
-                    context.getProperty(MongoDBConfiguration.MONGO_URI), MongoDBConfiguration.getDefaultOptionsBuilder()));
         } else {
             final String databaseNameProperty = context.getProperty(MongoDBConfiguration.MONGO_DB_NAME);
             final String databaseName;

java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/MongoDBConfiguration.java

@@ -1,9 +1,6 @@
 package com.sap.sse.mongodb;
 
-import com.mongodb.MongoClientOptions;
+import com.mongodb.ConnectionString;
-import com.mongodb.MongoClientOptions.Builder;
-import com.mongodb.MongoClientURI;
-import com.mongodb.ReadPreference;
 import com.mongodb.ServerAddress;
 import com.sap.sse.mongodb.internal.MongoDBServiceImpl;
 
@@ -19,7 +16,7 @@ public class MongoDBConfiguration {
     static final String MONGO_DB_NAME = "mongo.dbName";
     
     /**
-     * The system property by this name may contain a MongoClientURI in its string representation:
+     * The system property by this name may contain a {@link ConnectionString} in its string representation:
      * <pre>
      *   mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database[.collection]][?options]]
      * </pre>
@@ -30,7 +27,7 @@ public class MongoDBConfiguration {
     private static String DEFAULT_DB_NAME = "winddb"; 
     private static String DEFAULT_TEST_DB_NAME = "winddbTest"; 
 
-    private final MongoClientURI mongoClientURI;
+    private final ConnectionString mongoClientURI;
 
     public static MongoDBConfiguration getDefaultConfiguration() {
         return getDefaultConfiguration(DEFAULT_DB_NAME);
@@ -39,7 +36,7 @@ public class MongoDBConfiguration {
     private static MongoDBConfiguration getDefaultConfiguration(String dbName) {
         final MongoDBConfiguration result;
         if (System.getProperty(MONGO_URI) != null) {
-            result = new MongoDBConfiguration(new MongoClientURI(System.getProperty(MONGO_URI)));
+            result = new MongoDBConfiguration(new ConnectionString(System.getProperty(MONGO_URI)));
         } else {
             String defaultHostName = "127.0.0.1";
             if (System.getProperty(MONGO_HOSTNAME) != null) {
@@ -68,19 +65,19 @@ public class MongoDBConfiguration {
     }
 
     public MongoDBConfiguration(String mongoClientURIAsString) {
-        this.mongoClientURI = new MongoClientURI(mongoClientURIAsString, getDefaultOptionsBuilder());
+        this.mongoClientURI = new ConnectionString(mongoClientURIAsString);
     }
 
-    public MongoDBConfiguration(MongoClientURI mongoClientURI) {
+    public MongoDBConfiguration(ConnectionString mongoClientURI) {
         this.mongoClientURI = mongoClientURI;
     }
 
     public MongoDBConfiguration(String hostName, String databaseName) {
-        this.mongoClientURI = new MongoClientURI("mongodb://"+hostName+"/"+databaseName, getDefaultOptionsBuilder());
+        this.mongoClientURI = new ConnectionString("mongodb://"+hostName+"/"+databaseName);
     }
 
     public MongoDBConfiguration(String hostName, int port, String databaseName) {
-        this.mongoClientURI = new MongoClientURI("mongodb://"+hostName+":"+port+"/"+databaseName);
+        this.mongoClientURI = new ConnectionString("mongodb://"+hostName+":"+port+"/"+databaseName);
     }
 
     /**
@@ -90,14 +87,10 @@ public class MongoDBConfiguration {
         return new MongoDBServiceImpl(this);
     }
 
-    public MongoClientURI getMongoClientURI() {
+    public ConnectionString getMongoClientURI() {
         return mongoClientURI;
     }
 
-    public static MongoClientOptions.Builder getDefaultOptionsBuilder() {
-        return new Builder().readPreference(ReadPreference.primaryPreferred());
-    }
-
     public String getDatabaseName() {
         return getMongoClientURI().getDatabase();
     }

java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java

@@ -6,8 +6,9 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.mongodb.MongoClient;
+import com.mongodb.ConnectionString;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 import com.sap.sse.mongodb.AlreadyRegisteredException;
 import com.sap.sse.mongodb.MongoDBConfiguration;
@@ -19,9 +20,9 @@ public class MongoDBServiceImpl implements MongoDBService {
 
     private MongoDBConfiguration configuration;
 
-    private final Map<MongoClientURI, MongoClient> mongos;
+    private final Map<ConnectionString, MongoClient> mongos;
     
-    private final Map<MongoClientURI, MongoDatabase> dbs;
+    private final Map<ConnectionString, MongoDatabase> dbs;
 
     /**
      * collection name -> fully qualified class name
@@ -61,12 +62,12 @@ public class MongoDBServiceImpl implements MongoDBService {
     }
     
     private synchronized MongoDatabase getDB(MongoDBConfiguration mongoDBConfiguration) throws UnknownHostException {
-        final MongoClientURI key = mongoDBConfiguration.getMongoClientURI();
+        final ConnectionString key = mongoDBConfiguration.getMongoClientURI();
         MongoDatabase db = dbs.get(key);
         if (db == null) {
             MongoClient mongo = mongos.get(key);
             if (mongo == null) {
-                mongo = new MongoClient(mongoDBConfiguration.getMongoClientURI());
+                mongo = MongoClients.create(mongoDBConfiguration.getMongoClientURI());
                 mongos.put(key, mongo);
             }
             db = mongo.getDatabase(mongoDBConfiguration.getMongoClientURI().getDatabase());

java/com.sap.sse.replication.persistence/META-INF/MANIFEST.MF

@@ -11,7 +11,6 @@ Require-Bundle: com.sap.sse.replication.interfaces,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: com.sap.sse.mongodb,
  org.osgi.framework;version="1.8.0"
 Export-Package: com.sap.sse.replication.persistence

java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF

@@ -17,6 +17,5 @@ Require-Bundle: com.sap.sse.mongodb,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Export-Package: com.sap.sse.security.persistence,
  com.sap.sse.security.persistence.impl

java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF

@@ -18,6 +18,5 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
  com.sap.sse.replication;bundle-version="1.0.0",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: org.osgi.util.tracker;version="1.5.1"
 Automatic-Module-Name: com.sap.sse.security.replication.test

java/com.sap.sse.security.storemerging.test/src/com/sap/sse/security/storemerging/AbstractStoreMergeTest.java

@@ -6,7 +6,7 @@ import java.util.UUID;
 import org.bson.Document;
 import org.junit.After;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
@@ -67,7 +67,7 @@ import com.sap.sse.security.userstore.mongodb.impl.CollectionNames;
  */
 public abstract class AbstractStoreMergeTest {
     private final static String importSourceMongoDbUri = MongoDBConfiguration.getDefaultTestConfiguration()
-            .getMongoClientURI().getURI()
+            .getMongoClientURI().getConnectionString()
             .replace(MongoDBConfiguration.getDefaultTestConfiguration().getMongoClientURI().getDatabase(),
                     UUID.randomUUID().toString());
     protected final static String defaultCreationGroupNameForSource = "dummy-default-creation-group-for-source";
@@ -83,7 +83,7 @@ public abstract class AbstractStoreMergeTest {
         cfgForTarget = MongoDBConfiguration.getDefaultTestConfiguration();
         targetDb = cfgForTarget.getService().getDB();
         fill(targetVariant, targetDb);
-        cfgForSource = new MongoDBConfiguration(new MongoClientURI(importSourceMongoDbUri));
+        cfgForSource = new MongoDBConfiguration(new ConnectionString(importSourceMongoDbUri));
         fill(sourceVariant, cfgForSource.getService().getDB());
         merger = new SecurityStoreMerger(cfgForTarget, defaultCreationGroupNameForTarget);
         targetUserStore = merger.getTargetUserStore();

java/com.sap.sse.security.storemerging/META-INF/MANIFEST.MF

@@ -12,6 +12,5 @@ Require-Bundle: com.sap.sse.mongodb,
  com.sap.sse.common,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
- org.mongodb.driver-sync;bundle-version="4.3.1",
+ org.mongodb.driver-sync;bundle-version="4.3.1"
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: com.sap.sse.security

java/com.sap.sse.security.storemerging/src/com/sap/sse/security/storemerging/SecurityStoreMerger.java

@@ -11,7 +11,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.StreamSupport;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.Util.Pair;
 import com.sap.sse.mongodb.MongoDBConfiguration;
@@ -19,12 +19,12 @@ import com.sap.sse.security.SecurityService;
 import com.sap.sse.security.interfaces.AccessControlStore;
 import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
-import com.sap.sse.security.shared.UserStoreManagementException;
 import com.sap.sse.security.shared.OwnershipAnnotation;
 import com.sap.sse.security.shared.QualifiedObjectIdentifier;
 import com.sap.sse.security.shared.RoleDefinition;
 import com.sap.sse.security.shared.UserGroupManagementException;
 import com.sap.sse.security.shared.UserManagementException;
+import com.sap.sse.security.shared.UserStoreManagementException;
 import com.sap.sse.security.shared.WildcardPermission;
 import com.sap.sse.security.shared.impl.Ownership;
 import com.sap.sse.security.shared.impl.PermissionAndRoleAssociation;
@@ -100,7 +100,7 @@ public class SecurityStoreMerger {
         final MongoDBConfiguration cfgForTarget = MongoDBConfiguration.getDefaultConfiguration();
         final SecurityStoreMerger instance = new SecurityStoreMerger(cfgForTarget, System.getProperty(TARGET_DEFAULT_TENANT_NAME_SYSTEM_PROPERTY_NAME));
         for (int i=0; i<args.length/2; i++) {
-            final MongoDBConfiguration cfgForSource = new MongoDBConfiguration(new MongoClientURI(args[2*i]));
+            final MongoDBConfiguration cfgForSource = new MongoDBConfiguration(new ConnectionString(args[2*i]));
             instance.importStores(cfgForSource, args[2*i+1]);
         }
     }

java/com.sap.sse.security.test/META-INF/MANIFEST.MF

@@ -21,7 +21,6 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Import-Package: com.sap.sse.security.shared,
  com.sap.sse.security.ui.shared,
  org.apache.shiro.session.mgt

java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF

@@ -23,7 +23,6 @@ Require-Bundle: org.apache.shiro.core;bundle-version="1.2.2",
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- org.mongodb.mongodb-driver-legacy;bundle-version="4.3.1"
 Export-Package: com.sap.sse.security.userstore.mongodb,
  com.sap.sse.security.userstore.mongodb.impl;x-friends:="com.sap.sse.security.storemerging,com.sap.sse.security.test"
 Automatic-Module-Name: com.sap.sse.security.userstore.mongodb