Author: mreutegg
Date: Tue Jul 24 11:22:27 2018
New Revision: 1836543
URL: http://svn.apache.org/viewvc?rev=1836543&view=rev
Log:
OAK-7654: Remove usage of deprecated MongoDB Java driver 2.x API
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/RevisionsCommandTest.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java?rev=1836543&r1=1836542&r2=1836543&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexer.java
Tue Jul 24 11:22:27 2018
@@ -155,7 +155,7 @@ public class DocumentStoreIndexer implem
private long getEstimatedDocumentCount(){
MongoConnection mongoConnection =
indexHelper.getService(MongoConnection.class);
if (mongoConnection != null) {
- return mongoConnection.getDB().getCollection("nodes").count();
+ return
mongoConnection.getDatabase().getCollection("nodes").count();
}
return 0;
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java?rev=1836543&r1=1836542&r2=1836543&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/CheckpointsCommand.java
Tue Jul 24 11:22:27 2018
@@ -65,7 +65,7 @@ class CheckpointsCommand implements Comm
MongoClientURI uri = new MongoClientURI(connection);
MongoClient client = new MongoClient(uri);
final DocumentNodeStore store =
newMongoDocumentNodeStoreBuilder()
- .setMongoDB(client.getDB(uri.getDatabase()))
+ .setMongoDB(client, uri.getDatabase())
.build();
closer.register(Utils.asCloseable(store));
cps = Checkpoints.onDocumentMK(store);
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java?rev=1836543&r1=1836542&r2=1836543&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java
Tue Jul 24 11:22:27 2018
@@ -182,7 +182,7 @@ public class DataStoreCheckCommand imple
MongoClientURI uri = new MongoClientURI(source);
MongoClient client = new MongoClient(uri);
DocumentNodeStore docNodeStore =
-
newMongoDocumentNodeStoreBuilder().setMongoDB(client.getDB(uri.getDatabase())).build();
+ newMongoDocumentNodeStoreBuilder().setMongoDB(client,
uri.getDatabase()).build();
closer.register(Utils.asCloseable(docNodeStore));
blobStore = (GarbageCollectableBlobStore)
docNodeStore.getBlobStore();
marker = new DocumentBlobReferenceRetriever(docNodeStore);
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java?rev=1836543&r1=1836542&r2=1836543&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/ResetClusterIdCommand.java
Tue Jul 24 11:22:27 2018
@@ -104,7 +104,7 @@ class ResetClusterIdCommand implements C
MongoClientURI uri = new MongoClientURI(source);
MongoClient client = new MongoClient(uri);
final DocumentNodeStore dns =
newMongoDocumentNodeStoreBuilder()
- .setMongoDB(client.getDB(uri.getDatabase()))
+ .setMongoDB(client, uri.getDatabase())
.build();
closer.register(Utils.asCloseable(dns));
store = dns;
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java?rev=1836543&r1=1836542&r2=1836543&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java
Tue Jul 24 11:22:27 2018
@@ -199,7 +199,8 @@ class Utils {
}
MongoConnection mongo = new MongoConnection(uri.getURI());
closer.register(asCloseable(mongo));
- builder =
newMongoDocumentNodeStoreBuilder().setMongoDB(mongo.getDB());
+ builder = newMongoDocumentNodeStoreBuilder().setMongoDB(
+ mongo.getMongoClient(), mongo.getDBName());
} else if (src.startsWith("jdbc")) {
DataSource ds = RDBDataSourceFactory.forJdbcUrl(src,
options.getRDBJDBCUser(), options.getRDBJDBCPassword());
Modified:
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java?rev=1836543&r1=1836542&r2=1836543&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/index/DocumentStoreIndexerIT.java
Tue Jul 24 11:22:27 2018
@@ -137,7 +137,9 @@ public class DocumentStoreIndexerIT exte
@Test
public void bundling() throws Exception{
- DocumentNodeStoreBuilder<?> docBuilder =
builderProvider.newBuilder().setMongoDB(getConnection().getDB());
+ MongoConnection c = getConnection();
+ DocumentNodeStoreBuilder<?> docBuilder = builderProvider.newBuilder()
+ .setMongoDB(c.getMongoClient(), c.getDBName());
DocumentNodeStore store = docBuilder.build();
Whiteboard wb = new DefaultWhiteboard();
@@ -172,8 +174,9 @@ public class DocumentStoreIndexerIT exte
store.dispose();
r1.unregister();
+ MongoConnection c2 = connectionFactory.getConnection();
DocumentNodeStoreBuilder<?> docBuilderRO =
builderProvider.newBuilder().setReadOnlyMode()
- .setMongoDB(connectionFactory.getConnection().getDB());
+ .setMongoDB(c2.getMongoClient(), c2.getDBName());
ds = (MongoDocumentStore) docBuilderRO.getDocumentStore();
store = docBuilderRO.build();
wb.register(MongoDocumentStore.class, ds, emptyMap());
@@ -220,14 +223,16 @@ public class DocumentStoreIndexerIT exte
merge(store, builder);
}
- private DocumentNodeStore getNodeStore(){
- return
builderProvider.newBuilder().setMongoDB(getConnection().getDB()).getNodeStore();
+ private DocumentNodeStore getNodeStore() {
+ MongoConnection c = getConnection();
+ return builderProvider.newBuilder()
+ .setMongoDB(c.getMongoClient(), c.getDBName()).getNodeStore();
}
private MongoConnection getConnection(){
MongoConnection conn = connectionFactory.getConnection();
assumeNotNull(conn);
- MongoUtils.dropCollections(conn.getDB());
+ MongoUtils.dropCollections(conn.getDatabase());
return conn;
}
Modified:
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/RevisionsCommandTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/RevisionsCommandTest.java?rev=1836543&r1=1836542&r2=1836543&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/RevisionsCommandTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/RevisionsCommandTest.java
Tue Jul 24 11:22:27 2018
@@ -90,7 +90,9 @@ public class RevisionsCommandTest {
assertTrue(output.contains("resetting recommendations and
statistics"));
MongoConnection c = connectionFactory.getConnection();
- ns = builderProvider.newBuilder().setMongoDB(c.getDB()).getNodeStore();
+ assertNotNull(c);
+ ns = builderProvider.newBuilder()
+ .setMongoDB(c.getMongoClient(), c.getDBName()).getNodeStore();
doc = ns.getDocumentStore().find(Collection.SETTINGS, "versionGC");
assertNull(doc);
}
@@ -121,7 +123,9 @@ public class RevisionsCommandTest {
// remove the sweep revision to force a sweep run
MongoConnection c = connectionFactory.getConnection();
- DocumentNodeStoreBuilder<?> builder =
builderProvider.newBuilder().setMongoDB(c.getDB());
+ assertNotNull(c);
+ DocumentNodeStoreBuilder<?> builder = builderProvider.newBuilder()
+ .setMongoDB(c.getMongoClient(), c.getDBName());
DocumentStore store = builder.getDocumentStore();
UpdateOp op = new UpdateOp(getIdFromPath("/"), false);
op.removeMapEntry("_sweepRev", new Revision(0, 0, clusterId));
@@ -133,8 +137,10 @@ public class RevisionsCommandTest {
private DocumentNodeStore createDocumentNodeStore() {
MongoConnection c = connectionFactory.getConnection();
- MongoUtils.dropCollections(c.getDB().getName());
- return
builderProvider.newBuilder().setMongoDB(c.getDB()).getNodeStore();
+ assertNotNull(c);
+ MongoUtils.dropCollections(c.getDatabase());
+ return builderProvider.newBuilder()
+ .setMongoDB(c.getMongoClient(), c.getDBName()).getNodeStore();
}
private String captureSystemOut(Runnable r) {
