Author: angela
Date: Thu Feb 23 10:50:15 2017
New Revision: 1784107
URL: http://svn.apache.org/viewvc?rev=1784107&view=rev
Log:
minor improvement: reduce code duplication in OakRepositoryStub.java and
subclasses
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentMemRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.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/OakRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentTarRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentMemRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentMemRepositoryStub.java?rev=1784107&r1=1784106&r2=1784107&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentMemRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentMemRepositoryStub.java
Thu Feb 23 10:50:15 2017
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.jcr;
import java.util.Properties;
-
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -25,7 +24,6 @@ import javax.jcr.Session;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
-import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.test.RepositoryStubException;
/**
@@ -48,9 +46,7 @@ public class OakDocumentMemRepositoryStu
final DocumentNodeStore store;
try {
store = new DocumentMK.Builder().getNodeStore();
- QueryEngineSettings qs = new QueryEngineSettings();
- qs.setFullTextComparisonWithoutIndex(true);
- this.repository = new
Jcr(store).with(qs).with(BundlingConfigInitializer.INSTANCE).createRepository();
+ this.repository = new
Jcr(store).with(getQueryEngineSettings()).with(BundlingConfigInitializer.INSTANCE).createRepository();
session = getRepository().login(superuser);
TestContentLoader loader = new TestContentLoader();
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java?rev=1784107&r1=1784106&r2=1784107&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
Thu Feb 23 10:50:15 2017
@@ -22,7 +22,6 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
import java.util.UUID;
-
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -31,7 +30,6 @@ import org.apache.jackrabbit.oak.plugins
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.RDBOptions;
-import org.apache.jackrabbit.oak.query.QueryEngineSettings;
/**
* A repository stub implementation for the RDB document store.
@@ -70,9 +68,7 @@ public class OakDocumentRDBRepositoryStu
setPersistentCache("target/persistentCache,time").
setRDBConnection(RDBDataSourceFactory.forJdbcUrl(jdbcUrl,
USERNAME, PASSWD), options).
getNodeStore();
- QueryEngineSettings qs = new QueryEngineSettings();
- qs.setFullTextComparisonWithoutIndex(true);
- this.repository = new Jcr(m).with(qs).createRepository();
+ this.repository = new
Jcr(m).with(getQueryEngineSettings()).createRepository();
session = getRepository().login(superuser);
TestContentLoader loader = new TestContentLoader();
loader.loadTestContent(session);
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=1784107&r1=1784106&r2=1784107&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
Thu Feb 23 10:50:15 2017
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.jcr;
import java.util.Properties;
-
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -27,7 +26,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import
org.apache.jackrabbit.oak.plugins.document.bundlor.BundlingConfigInitializer;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
-import org.apache.jackrabbit.oak.query.QueryEngineSettings;
/**
* A repository stub using the DocumentNodeStore.
@@ -62,9 +60,7 @@ public class OakMongoNSRepositoryStub ex
setPersistentCache("target/persistentCache,time").
setMongoDB(connection.getDB()).
getNodeStore();
- QueryEngineSettings qs = new QueryEngineSettings();
- qs.setFullTextComparisonWithoutIndex(true);
- this.repository = new
Jcr(store).with(qs).with(BundlingConfigInitializer.INSTANCE).createRepository();
+ this.repository = new
Jcr(store).with(getQueryEngineSettings()).with(BundlingConfigInitializer.INSTANCE).createRepository();
session = getRepository().login(superuser);
TestContentLoader loader = new TestContentLoader();
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStub.java?rev=1784107&r1=1784106&r2=1784107&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStub.java
Thu Feb 23 10:50:15 2017
@@ -23,6 +23,7 @@ import javax.jcr.GuestCredentials;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.test.NotExecutableException;
import org.apache.jackrabbit.test.RepositoryStub;
@@ -43,6 +44,12 @@ abstract class OakRepositoryStub extends
super(env);
}
+ protected QueryEngineSettings getQueryEngineSettings() {
+ QueryEngineSettings settings = new QueryEngineSettings();
+ settings.setFullTextComparisonWithoutIndex(true);
+ return settings;
+ }
+
@Override
public Credentials getReadOnlyCredentials() {
return new GuestCredentials();
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentTarRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentTarRepositoryStub.java?rev=1784107&r1=1784106&r2=1784107&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentTarRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentTarRepositoryStub.java
Thu Feb 23 10:50:15 2017
@@ -20,13 +20,11 @@ package org.apache.jackrabbit.oak.jcr;
import java.io.File;
import java.util.Properties;
-
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.jackrabbit.oak.Oak;
-import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
@@ -54,9 +52,7 @@ public class OakSegmentTarRepositoryStub
File directory = new File("target", "segment-tar-" +
System.currentTimeMillis());
this.store =
FileStoreBuilder.fileStoreBuilder(directory).withMaxFileSize(1).build();
Jcr jcr = new Jcr(new
Oak(SegmentNodeStoreBuilders.builder(store).build()));
- QueryEngineSettings qs = new QueryEngineSettings();
- qs.setFullTextComparisonWithoutIndex(true);
- jcr.with(qs);
+ jcr.with(getQueryEngineSettings());
preCreateRepository(jcr);
this.repository = jcr.createRepository();
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java?rev=1784107&r1=1784106&r2=1784107&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakTarMKRepositoryStub.java
Thu Feb 23 10:50:15 2017
@@ -25,7 +25,6 @@ import javax.jcr.Session;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
-import org.apache.jackrabbit.oak.query.QueryEngineSettings;
/**
* A repository stub implementation for Oak on TarMK
@@ -53,9 +52,7 @@ public class OakTarMKRepositoryStub exte
new File("target", "tarmk-" + System.currentTimeMillis());
this.store =
FileStore.builder(directory).withMaxFileSize(1).withMemoryMapping(false).build();
Jcr jcr = new Jcr(new
Oak(SegmentNodeStore.builder(store).build()));
- QueryEngineSettings qs = new QueryEngineSettings();
- qs.setFullTextComparisonWithoutIndex(true);
- jcr.with(qs);
+ jcr.with(getQueryEngineSettings());
preCreateRepository(jcr);
this.repository = jcr.createRepository();
