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 re...@apache.org on 2019/06/24 13:58:01 UTC
svn commit: r1862007 - in /jackrabbit/oak/branches/1.8:
oak-it/src/test/java/org/apache/jackrabbit/oak/composite/
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/
oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/
Author: reschke
Date: Mon Jun 24 13:58:01 2019
New Revision: 1862007
URL: http://svn.apache.org/viewvc?rev=1862007&view=rev
Log:
OAK-8371: Stop using deprecated DocumentMK.Builder in RDB tests (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
Modified: jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java?rev=1862007&r1=1862006&r2=1862007&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java Mon Jun 24 13:58:01 2019
@@ -55,9 +55,9 @@ import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentNodeStoreBuilder;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
import org.apache.jackrabbit.oak.plugins.document.util.CountingDiff;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
@@ -897,7 +897,7 @@ public class CompositeNodeStoreTest {
}
ds = RDBDataSourceFactory.forJdbcUrl(jdbcUrl, "sa", "");
- instance = new DocumentMK.Builder().setRDBConnection(ds, options).getNodeStore();
+ instance = new RDBDocumentNodeStoreBuilder().setRDBConnection(ds, options).build();
return instance;
Modified: jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java?rev=1862007&r1=1862006&r2=1862007&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java (original)
+++ jackrabbit/oak/branches/1.8/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java Mon Jun 24 13:58:01 2019
@@ -25,9 +25,9 @@ import java.util.Properties;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
-import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentNodeStoreBuilder;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
/**
@@ -61,11 +61,11 @@ public class OakDocumentRDBRepositoryStu
try {
String prefix = "T" + Long.toHexString(System.currentTimeMillis());
RDBOptions options = new RDBOptions().tablePrefix(prefix).dropTablesOnClose(true);
- m = new DocumentMK.Builder().
+ m = new RDBDocumentNodeStoreBuilder().
memoryCacheSize(64 * 1024 * 1024).
setPersistentCache("target/persistentCache,time").
setRDBConnection(RDBDataSourceFactory.forJdbcUrl(jdbcUrl, USERNAME, PASSWD), options).
- getNodeStore();
+ build();
Jcr jcr = new Jcr(m);
preCreateRepository(jcr);
this.repository = jcr.createRepository();
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java?rev=1862007&r1=1862006&r2=1862007&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java Mon Jun 24 13:58:01 2019
@@ -28,9 +28,9 @@ import java.util.concurrent.ConcurrentHa
import javax.sql.DataSource;
import org.apache.commons.lang.StringUtils;
-import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
+import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentNodeStoreBuilder;
import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -55,8 +55,8 @@ public class DocumentRdbFixture extends
this.jdbcUrl = pUrl.replace("{fname}", fname);
DataSource ds = RDBDataSourceFactory.forJdbcUrl(jdbcUrl, pUser, pPasswd);
- NodeStore result = new DocumentMK.Builder().setPersistentCache("target/persistentCache,time")
- .setRDBConnection(ds, options).getNodeStore();
+ NodeStore result = new RDBDocumentNodeStoreBuilder().setPersistentCache("target/persistentCache,time")
+ .setRDBConnection(ds, options).build();
this.dataSources.put(result, ds);
return result;
}
@@ -80,4 +80,4 @@ public class DocumentRdbFixture extends
public String toString() {
return "DocumentNodeStore[RDB] on " + StringUtils.defaultString(this.jdbcUrl, this.pUrl);
}
-}
\ No newline at end of file
+}