Author: reschke
Date: Wed Mar 26 11:42:55 2014
New Revision: 1581791
URL: http://svn.apache.org/r1581791
Log:
OAK-1590 - get rid of RDBDocumentStore's default constructor
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1581791&r1=1581790&r2=1581791&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Wed Mar 26 11:42:55 2014
@@ -40,7 +40,6 @@ import javax.annotation.Nonnull;
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.jackrabbit.commons.query.sql2.SQL2QOMBuilder;
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
@@ -67,20 +66,6 @@ import com.google.common.util.concurrent
public class RDBDocumentStore implements CachingDocumentStore {
/**
- * Creates a {@linkplain RDBDocumentStore} instance using an embedded H2
- * database in in-memory mode.
- */
- public RDBDocumentStore(DocumentMK.Builder builder) {
- try {
- String jdbcurl = "jdbc:h2:file:./target/oaknodes";
- DataSource ds = RDBDataSourceFactory.forJdbcUrl(jdbcurl, "sa", "");
- initialize(ds, builder);
- } catch (Exception ex) {
- throw new MicroKernelException("initializing RDB document store",
ex);
- }
- }
-
- /**
* Creates a {@linkplain RDBDocumentStore} instance using the provided
* {@link DataSource}.
*/
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java?rev=1581791&r1=1581790&r2=1581791&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
Wed Mar 26 11:42:55 2014
@@ -33,7 +33,7 @@ public abstract class DocumentStoreFixtu
private static final Logger LOG =
LoggerFactory.getLogger(DocumentStoreFixture.class);
public static final DocumentStoreFixture MEMORY = new MemoryFixture();
- public static final DocumentStoreFixture RDB_H2 = new RDBH2Fixture();
+ public static final DocumentStoreFixture RDB_H2 = new
RDBFixture("RDB-Postgres", "jdbc:h2:file:./target/ds-test", "sa", "");
public static final DocumentStoreFixture RDB_PG = new
RDBFixture("RDB-Postgres", "jdbc:postgresql:oak", "postgres", "geheim");
public static final DocumentStoreFixture RDB_DB2 = new
RDBFixture("RDB-DB2", "jdbc:db2://localhost:50000/OAK", "oak", "geheim");
public static final DocumentStoreFixture MONGO = new
MongoFixture("mongodb://localhost:27017/oak");
@@ -61,21 +61,6 @@ public abstract class DocumentStoreFixtu
}
}
- private static class RDBH2Fixture extends DocumentStoreFixture {
-
- DocumentStore ds = new RDBDocumentStore(new DocumentMK.Builder());
-
- @Override
- public String getName() {
- return "RDB-on-HS-in-memory";
- }
-
- @Override
- public DocumentStore getDocumentStore() {
- return ds;
- }
- }
-
private static class RDBFixture extends DocumentStoreFixture {
DocumentStore ds;
