Author: mreutegg
Date: Tue Jul 24 11:22:03 2018
New Revision: 1836542
URL: http://svn.apache.org/viewvc?rev=1836542&view=rev
Log:
OAK-7654: Remove usage of deprecated MongoDB Java driver 2.x API
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1836542&r1=1836541&r2=1836542&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
Tue Jul 24 11:22:03 2018
@@ -399,7 +399,7 @@ public abstract class OakFixture {
this.dsCacheInMB = dsCacheInMB;
}
- public DocumentNodeStoreBuilder<?> getBuilder(int clusterId) throws
UnknownHostException {
+ public DocumentNodeStoreBuilder<?> getBuilder(int clusterId) {
MongoConnection mongo = new MongoConnection(uri);
DocumentNodeStoreBuilder<?> builder = new
MongoDocumentNodeStoreBuilder() {
@Override
@@ -408,7 +408,7 @@ public abstract class OakFixture {
nodeStores.add(ns);
return ns;
}
- }.setMongoDB(mongo.getDB()).
+ }.setMongoDB(mongo.getMongoClient(), mongo.getDBName()).
memoryCacheSize(cacheSize).
setClusterId(clusterId).
setLogging(false);
@@ -450,7 +450,7 @@ public abstract class OakFixture {
try {
MongoConnection mongo =
new MongoConnection(uri);
- mongo.getDB().dropDatabase();
+ mongo.getDatabase().drop();
mongo.close();
if(blobStoreFixture != null){
blobStoreFixture.tearDown();
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java?rev=1836542&r1=1836541&r2=1836542&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/DocumentFixtureProvider.java
Tue Jul 24 11:22:03 2018
@@ -109,7 +109,7 @@ class DocumentFixtureProvider {
MongoConnection mongo = new MongoConnection(uri.getURI());
wb.register(MongoConnection.class, mongo, emptyMap());
closer.register(mongo::close);
- ((MongoDocumentNodeStoreBuilder)
builder).setMongoDB(mongo.getDB());
+ ((MongoDocumentNodeStoreBuilder)
builder).setMongoDB(mongo.getMongoClient(), mongo.getDBName());
dns = builder.build();
wb.register(MongoDocumentStore.class, (MongoDocumentStore)
builder.getDocumentStore(), emptyMap());
} else if (commonOpts.isRDB()) {
