diff --git a/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF index ae8346ae803..2507667d34c 100644 --- a/java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF +++ b/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, diff --git a/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF index 7ef08240c5a..af0857cb8cb 100644 --- a/java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF +++ b/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, diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF index 170f4b68bed..91460e6bf4d 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF index 006ed8a6c60..bc0bcc5e4bb 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF +++ b/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", diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF index 8278ded8305..4e1702ac7f7 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF +++ b/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, diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF index bdee4252ded..6b0b0789d2a 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF +++ b/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/, diff --git a/java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF index a52c6313871..2502dd43e5c 100644 --- a/java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF +++ b/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, diff --git a/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF index dba93efbf1c..476aa5f39f1 100644 --- a/java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF +++ b/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", diff --git a/java/com.sap.sailing.expeditionconnector.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.expeditionconnector.persistence/META-INF/MANIFEST.MF index f5b20d4d4f4..72c2773ade0 100755 --- a/java/com.sap.sailing.expeditionconnector.persistence/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF index 79b77a794eb..f76c8202bd4 100644 --- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF +++ b/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", diff --git a/java/com.sap.sailing.landscape.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.landscape.test/META-INF/MANIFEST.MF index a910b104c00..e8e73206e4c 100755 --- a/java/com.sap.sailing.landscape.test/META-INF/MANIFEST.MF +++ b/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" diff --git a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF index 3ad4bc21f99..70ff3913e43 100644 --- a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java index 1e3de3bb18b..975e999f90f 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java +++ b/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 diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MongoClientURITest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MongoClientURITest.java index ecf88b9c1bb..5e98328f12f 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MongoClientURITest.java +++ b/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()); - assertEquals("rs0", config.getMongoClientURI().getOptions().getRequiredReplicaSetName()); + assertSame(ReadPreference.primary(), config.getMongoClientURI().getReadPreference()); + assertEquals("rs0", config.getMongoClientURI().getRequiredReplicaSetName()); } } diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java index 9ee9abd41fc..1699e74e500 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java +++ b/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); } diff --git a/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF index 30d0b0b757d..81f08f3de5c 100644 --- a/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF +++ b/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, diff --git a/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF index b7bf438a797..58b6a08f145 100644 --- a/java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF +++ b/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", diff --git a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF index 4849eab53d3..70ed540ada4 100644 --- a/java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF +++ b/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: . diff --git a/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF index a8127af3dc8..693b7d90a5b 100644 --- a/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF +++ b/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", diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/MediaReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/MediaReplicationTest.java index 3dc98f98467..be48af60b9f 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/MediaReplicationTest.java +++ b/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 MongoClientOptions masterMongoDbOptions = masterMongoDbUri.getOptions(); + final ConnectionString masterMongoDbUri = masterMongoDBConfig.getMongoClientURI(); + 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; diff --git a/java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF index 33c9fab46cc..3a876afd773 100644 --- a/java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sailing.server/META-INF/MANIFEST.MF b/java/com.sap.sailing.server/META-INF/MANIFEST.MF index 124e44edbc7..dc654f10ef2 100755 --- a/java/com.sap.sailing.server/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sailing.shared.persistence/META-INF/MANIFEST.MF b/java/com.sap.sailing.shared.persistence/META-INF/MANIFEST.MF index 02b30bc3cfb..a75dec9dbb4 100644 --- a/java/com.sap.sailing.shared.persistence/META-INF/MANIFEST.MF +++ b/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, diff --git a/java/com.sap.sailing.shared.server.gateway/META-INF/MANIFEST.MF b/java/com.sap.sailing.shared.server.gateway/META-INF/MANIFEST.MF index f4e6c952066..5c003156401 100644 --- a/java/com.sap.sailing.shared.server.gateway/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sailing.windestimation/META-INF/MANIFEST.MF b/java/com.sap.sailing.windestimation/META-INF/MANIFEST.MF index 243ecafb521..55cdf359eee 100644 --- a/java/com.sap.sailing.windestimation/META-INF/MANIFEST.MF +++ b/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, diff --git a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF b/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF index 9af7dc0edcc..aa09ea16032 100644 --- a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sse.landscape.aws.persistence/META-INF/MANIFEST.MF b/java/com.sap.sse.landscape.aws.persistence/META-INF/MANIFEST.MF index 7e049120fa2..39cd192df89 100755 --- a/java/com.sap.sse.landscape.aws.persistence/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF b/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF index b949df60723..23608fee5dd 100755 --- a/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF +++ b/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" diff --git a/java/com.sap.sse.landscape.aws/META-INF/MANIFEST.MF b/java/com.sap.sse.landscape.aws/META-INF/MANIFEST.MF index 261e16599e2..f667dcc9398 100755 --- a/java/com.sap.sse.landscape.aws/META-INF/MANIFEST.MF +++ b/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", diff --git a/java/com.sap.sse.landscape/META-INF/MANIFEST.MF b/java/com.sap.sse.landscape/META-INF/MANIFEST.MF index 5d11686cbf5..cfe39cd81bc 100755 --- a/java/com.sap.sse.landscape/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF b/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF index de4789a209b..1896b7eb7c0 100644 --- a/java/com.sap.sse.mongodb/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/Activator.java b/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/Activator.java index faac8320f9d..3dd3481931b 100755 --- a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/Activator.java +++ b/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( - context.getProperty(MongoDBConfiguration.MONGO_URI), MongoDBConfiguration.getDefaultOptionsBuilder())); + newConfiguration = new MongoDBConfiguration(new ConnectionString(context.getProperty(MongoDBConfiguration.MONGO_URI))); } else { final String databaseNameProperty = context.getProperty(MongoDBConfiguration.MONGO_DB_NAME); final String databaseName; diff --git a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/MongoDBConfiguration.java b/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/MongoDBConfiguration.java index 84f7769b33e..fba7dc728dd 100644 --- a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/MongoDBConfiguration.java +++ b/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.MongoClientOptions.Builder; -import com.mongodb.MongoClientURI; -import com.mongodb.ReadPreference; +import com.mongodb.ConnectionString; 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: * 
      *   mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database[.collection]][?options]]
      *
@@ -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(); } diff --git a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java b/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java index cc55344df9d..152daea368d 100644 --- a/java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java +++ b/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.MongoClientURI; +import com.mongodb.ConnectionString; +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 mongos; + private final Map mongos; - private final Map dbs; + private final Map 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()); diff --git a/java/com.sap.sse.replication.persistence/META-INF/MANIFEST.MF b/java/com.sap.sse.replication.persistence/META-INF/MANIFEST.MF index 4f70e474d81..d569cc567f1 100644 --- a/java/com.sap.sse.replication.persistence/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF b/java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF index e2ad10cd439..b4347a64a6c 100755 --- a/java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF index 4fa60883946..1bb5af1f974 100644 --- a/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/com.sap.sse.security.storemerging.test/src/com/sap/sse/security/storemerging/AbstractStoreMergeTest.java b/java/com.sap.sse.security.storemerging.test/src/com/sap/sse/security/storemerging/AbstractStoreMergeTest.java index 8138a5609e9..cd0f8150f6c 100755 --- a/java/com.sap.sse.security.storemerging.test/src/com/sap/sse/security/storemerging/AbstractStoreMergeTest.java +++ b/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(); diff --git a/java/com.sap.sse.security.storemerging/META-INF/MANIFEST.MF b/java/com.sap.sse.security.storemerging/META-INF/MANIFEST.MF index e309b6dfabe..c8a09929ae8 100755 --- a/java/com.sap.sse.security.storemerging/META-INF/MANIFEST.MF +++ b/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.mongodb-driver-legacy;bundle-version="4.3.1" + org.mongodb.driver-sync;bundle-version="4.3.1" Import-Package: com.sap.sse.security diff --git a/java/com.sap.sse.security.storemerging/src/com/sap/sse/security/storemerging/SecurityStoreMerger.java b/java/com.sap.sse.security.storemerging/src/com/sap/sse/security/storemerging/SecurityStoreMerger.java index b1933c3321a..4a70d5e735c 100755 --- a/java/com.sap.sse.security.storemerging/src/com/sap/sse/security/storemerging/SecurityStoreMerger.java +++ b/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