You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2018/07/24 11:20:38 UTC
svn commit: r1836541 - in
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr:
ConcurrentAddNodesClusterIT.java DocumentClusterIT.java
OakMongoNSRepositoryStub.java random/RandomOpCompare.java
Author: mreutegg
Date: Tue Jul 24 11:20:38 2018
New Revision: 1836541
URL: http://svn.apache.org/viewvc?rev=1836541&view=rev
Log:
OAK-7654: Remove usage of deprecated MongoDB Java driver 2.x API
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java?rev=1836541&r1=1836540&r2=1836541&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java Tue Jul 24 11:20:38 2018
@@ -376,7 +376,7 @@ public class ConcurrentAddNodesClusterIT
private static void dropDB() throws Exception {
MongoConnection con = createConnection();
try {
- con.getDB().dropDatabase();
+ con.getDatabase().drop();
} finally {
con.close();
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java?rev=1836541&r1=1836540&r2=1836541&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java Tue Jul 24 11:20:38 2018
@@ -178,7 +178,7 @@ public abstract class DocumentClusterIT
static void dropDB(@NotNull final Class<?> clazz) throws Exception {
MongoConnection con = createConnection(checkNotNull(clazz));
try {
- con.getDB().dropDatabase();
+ con.getDatabase().drop();
} finally {
con.close();
}
@@ -199,8 +199,9 @@ public abstract class DocumentClusterIT
@NotNull final List<DocumentMK> mks,
final int clusterId,
final int asyncDelay) throws Exception {
- DocumentMK.Builder builder = new DocumentMK.Builder();
- builder.setMongoDB(createConnection(checkNotNull(clazz)).getDB());
+ DocumentMK.Builder builder = new DocumentMK.Builder();
+ MongoConnection c = createConnection(checkNotNull(clazz));
+ builder.setMongoDB(c.getMongoClient(), c.getDBName());
if (asyncDelay != NOT_PROVIDED) {
builder.setAsyncDelay(asyncDelay);
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java?rev=1836541&r1=1836540&r2=1836541&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java Tue Jul 24 11:20:38 2018
@@ -33,7 +33,7 @@ public class OakMongoNSRepositoryStub ex
static {
MongoConnection c = MongoUtils.getConnection();
if (c != null) {
- MongoUtils.dropCollections(c.getDB());
+ MongoUtils.dropCollections(c.getDatabase());
c.close();
}
}
@@ -55,7 +55,7 @@ public class OakMongoNSRepositoryStub ex
store = new DocumentMK.Builder().
memoryCacheSize(64 * 1024 * 1024).
setPersistentCache("target/persistentCache,time").
- setMongoDB(connection.getDB()).
+ setMongoDB(connection.getMongoClient(), connection.getDBName()).
getNodeStore();
Jcr jcr = new Jcr(store);
preCreateRepository(jcr);
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java?rev=1836541&r1=1836540&r2=1836541&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/random/RandomOpCompare.java Tue Jul 24 11:20:38 2018
@@ -140,10 +140,9 @@ public class RandomOpCompare {
} catch (Exception e) {
throw new RuntimeException(e);
}
- DB mongoDB = connection.getDB();
return new DocumentMK.Builder().
memoryCacheSize(0).
- setMongoDB(mongoDB, 16).
+ setMongoDB(connection.getMongoClient(), connection.getDBName()).
setPersistentCache("target/persistentCache,time").
getNodeStore();
}