Author: mkataria
Date: Wed Apr 15 11:05:24 2020
New Revision: 1876547
URL: http://svn.apache.org/viewvc?rev=1876547&view=rev
Log:
OAK-8995: polish code of changed classes (patch by Fabrizio)
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java?rev=1876547&r1=1876546&r2=1876547&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
Wed Apr 15 11:05:24 2020
@@ -73,7 +73,7 @@ public class LuceneIndexProvider impleme
@Override @NotNull
public List<QueryIndex> getQueryIndexes(NodeState nodeState) {
- return ImmutableList.<QueryIndex> of(new
AggregateIndex(newLuceneIndex()), newLucenePropertyIndex());
+ return ImmutableList.of(new AggregateIndex(newLuceneIndex()),
newLucenePropertyIndex());
}
protected LuceneIndex newLuceneIndex() {
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java?rev=1876547&r1=1876546&r2=1876547&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
Wed Apr 15 11:05:24 2020
@@ -32,8 +32,6 @@ import java.util.concurrent.ThreadPoolEx
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.management.NotCompliantMBeanException;
-
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -362,8 +360,7 @@ public class LuceneIndexProviderService
private AsyncIndexesSizeStatsUpdate asyncIndexesSizeStatsUpdate;
@Activate
- private void activate(BundleContext bundleContext, Map<String, ?> config)
- throws NotCompliantMBeanException, IOException {
+ private void activate(BundleContext bundleContext, Map<String, ?> config)
throws IOException {
asyncIndexesSizeStatsUpdate = new AsyncIndexesSizeStatsUpdateImpl(
PropertiesUtil.toLong(config.get(LUCENE_INDEX_STATS_UPDATE_INTERVAL),
LUCENE_INDEX_STATS_UPDATE_INTERVAL_DEFAULT) * 1000);
// convert seconds to millis
@@ -532,7 +529,7 @@ public class LuceneIndexProviderService
editorProvider.setIndexingQueue(checkNotNull(documentQueue));
}
- Dictionary<String, Object> props = new Hashtable<String, Object>();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put("type", TYPE_LUCENE);
regs.add(bundleContext.registerService(IndexEditorProvider.class.getName(),
editorProvider, props));
oakRegs.add(registerMBean(whiteboard,
@@ -590,14 +587,9 @@ public class LuceneIndexProviderService
private ExecutorService createExecutor() {
ThreadPoolExecutor executor = new ThreadPoolExecutor(5, 5, 60L,
TimeUnit.SECONDS,
- new LinkedBlockingQueue<Runnable>(), new ThreadFactory() {
+ new LinkedBlockingQueue<>(), new ThreadFactory() {
private final AtomicInteger counter = new AtomicInteger();
- private final Thread.UncaughtExceptionHandler handler = new
Thread.UncaughtExceptionHandler() {
- @Override
- public void uncaughtException(Thread t, Throwable e) {
- log.warn("Error occurred in asynchronous processing ", e);
- }
- };
+ private final Thread.UncaughtExceptionHandler handler = (t, e) ->
log.warn("Error occurred in asynchronous processing ", e);
@Override
public Thread newThread(@NotNull Runnable r) {
Thread thread = new Thread(r, createName());
@@ -824,7 +816,7 @@ public class LuceneIndexProviderService
}
private void registerLuceneFileSystemStats(LuceneIndexFileSystemStatistics
luceneIndexFSStats, long delayInSeconds) {
- Map<String, Object> config = ImmutableMap.<String, Object>of(
+ Map<String, Object> config = ImmutableMap.of(
"scheduler.name",
LuceneIndexFileSystemStatistics.class.getName()
);
oakRegs.add(scheduleWithFixedDelay(whiteboard, luceneIndexFSStats,
config, delayInSeconds, false, true));
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1876547&r1=1876546&r2=1876547&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
Wed Apr 15 11:05:24 2020
@@ -627,7 +627,7 @@ public class LucenePropertyIndex extends
final boolean requireNodeLevelExcerpt = nodeExcerptColumns.size() > 0;
int docID = doc.doc;
- List<String> names = new LinkedList<String>();
+ List<String> names = new LinkedList<>();
for (IndexableField field :
searcher.getIndexReader().document(docID).getFields()) {
String name = field.name();
@@ -643,9 +643,7 @@ public class LucenePropertyIndex extends
if (names.size() > 0) {
int[] maxPassages = new int[names.size()];
- for (int i = 0; i < maxPassages.length; i++) {
- maxPassages[i] = 1;
- }
+ Arrays.fill(maxPassages, 1);
try {
Map<String, String[]> stringMap =
postingsHighlighter.highlightFields(names.toArray(new String[names.size()]),
query, searcher, new int[]{docID}, maxPassages);
@@ -693,7 +691,7 @@ public class LucenePropertyIndex extends
}
}
} catch (InvalidTokenOffsetsException e) {
- LOG.error("higlighting failed", e);
+ LOG.error("highlighting failed", e);
}
}
}
@@ -702,9 +700,7 @@ public class LucenePropertyIndex extends
if (requireNodeLevelExcerpt) {
String nodeExcerpt =
Joiner.on("...").join(columnNameToExcerpts.values());
- nodeExcerptColumns.forEach( nodeExcerptColumnName -> {
- columnNameToExcerpts.put(nodeExcerptColumnName, nodeExcerpt);
- });
+ nodeExcerptColumns.forEach( nodeExcerptColumnName ->
columnNameToExcerpts.put(nodeExcerptColumnName, nodeExcerpt));
}
columnNameToExcerpts.keySet().retainAll(excerptFields);
@@ -806,7 +802,7 @@ public class LucenePropertyIndex extends
if (original == null || original.isEmpty()) {
return original;
}
- ArrayList<OrderEntry> result = new ArrayList<OrderEntry>();
+ ArrayList<OrderEntry> result = new ArrayList<>();
for(OrderEntry oe : original) {
if (!isNativeSort(oe)) {
result.add(oe);
@@ -852,7 +848,7 @@ public class LucenePropertyIndex extends
*/
private static LuceneRequestFacade getLuceneRequest(IndexPlan plan,
IndexAugmentorFactory augmentorFactory, IndexReader reader) {
FulltextQueryTermsProvider augmentor = getIndexAgumentor(plan,
augmentorFactory);
- List<Query> qs = new ArrayList<Query>();
+ List<Query> qs = new ArrayList<>();
Filter filter = plan.getFilter();
FullTextExpression ft = filter.getFullTextConstraint();
PlanResult planResult = getPlanResult(plan);
@@ -898,12 +894,12 @@ public class LucenePropertyIndex extends
} else if (query.startsWith("spellcheck?")) {
String spellcheckQueryString = query.replace("spellcheck?",
"");
if (reader != null) {
- return new
LuceneRequestFacade<SpellcheckHelper.SpellcheckQuery>(SpellcheckHelper.getSpellcheckQuery(spellcheckQueryString,
reader));
+ return new
LuceneRequestFacade<>(SpellcheckHelper.getSpellcheckQuery(spellcheckQueryString,
reader));
}
} else if (query.startsWith("suggest?")) {
String suggestQueryString = query.replace("suggest?", "");
if (reader != null) {
- return new
LuceneRequestFacade<SuggestHelper.SuggestQuery>(SuggestHelper.getSuggestQuery(suggestQueryString));
+ return new
LuceneRequestFacade<>(SuggestHelper.getSuggestQuery(suggestQueryString));
}
} else {
try {
@@ -979,7 +975,7 @@ public class LucenePropertyIndex extends
ibq.add(new MatchAllDocsQuery(),
BooleanClause.Occur.SHOULD);
}
}
- return new LuceneRequestFacade<Query>(qs.get(0));
+ return new LuceneRequestFacade<>(qs.get(0));
}
BooleanQuery bq = new BooleanQuery();
for (Query q : qs) {
@@ -992,7 +988,7 @@ public class LucenePropertyIndex extends
bq.add(q, MUST);
}
}
- return new LuceneRequestFacade<Query>(bq);
+ return new LuceneRequestFacade<>(bq);
}
/**
@@ -1375,7 +1371,7 @@ public class LucenePropertyIndex extends
final PlanResult pr = getPlanResult(plan);
// a reference to the query, so it can be set in the visitor
// (a "non-local return")
- final AtomicReference<Query> result = new AtomicReference<Query>();
+ final AtomicReference<Query> result = new AtomicReference<>();
ft.accept(new FullTextVisitor() {
@Override
@@ -1540,7 +1536,7 @@ public class LucenePropertyIndex extends
NodeStateUtils.getNode(rootState, pr.indexPath),
plan.getPathPrefix(), false);
PropertyIndexResult pir = pr.getPropertyIndexResult();
- FluentIterable<String> paths = null;
+ FluentIterable<String> paths;
if (pir != null) {
Iterable<String> queryResult = lookup.query(plan.getFilter(),
pir.propertyName, pir.pr);
paths = FluentIterable.from(queryResult)
@@ -1632,7 +1628,7 @@ public class LucenePropertyIndex extends
String facetFieldName = FulltextIndex.parseFacetField(columnName);
if (facets != null) {
- ImmutableList.Builder res = new ImmutableList.Builder<Facet>();
+ ImmutableList.Builder<Facet> res = new
ImmutableList.Builder<>();
FacetResult topChildren =
facets.getTopChildren(numberOfFacets, facetFieldName);
if (topChildren != null) {
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java?rev=1876547&r1=1876546&r2=1876547&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java
Wed Apr 15 11:05:24 2020
@@ -68,7 +68,7 @@ public class LuceneIndexAugmentTest exte
private LuceneIndexNode indexNode;
@Override
- protected void createTestIndexNode() throws Exception {
+ protected void createTestIndexNode() {
setTraversalEnabled(false);
}
@@ -190,7 +190,7 @@ public class LuceneIndexAugmentTest exte
assertEquals(TestUtil.NT_TEST,
document.getName(JcrConstants.JCR_PRIMARYTYPE));
assertEquals(IndexConstants.INDEX_DEFINITIONS_NODE_TYPE,
indexDefinition.getName(JcrConstants.JCR_PRIMARYTYPE));
- return Lists.<Field>newArrayList(new StringField("barbar",
"1", Field.Store.NO));
+ return Lists.newArrayList(new StringField("barbar", "1",
Field.Store.NO));
}
@NotNull
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java?rev=1876547&r1=1876546&r2=1876547&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
Wed Apr 15 11:05:24 2020
@@ -157,14 +157,14 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void typeProperty() throws Exception{
+ public void typeProperty() {
MockOsgi.activate(service, context.bundleContext(),
getDefaultConfig());
ServiceReference sr =
context.bundleContext().getServiceReference(IndexEditorProvider.class.getName());
assertEquals(TYPE_LUCENE, sr.getProperty("type"));
}
@Test
- public void disableOpenIndexAsync() throws Exception{
+ public void disableOpenIndexAsync() {
Map<String,Object> config = getDefaultConfig();
config.put("enableOpenIndexAsync", false);
MockOsgi.activate(service, context.bundleContext(), config);
@@ -175,7 +175,7 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void enableCopyOnWrite() throws Exception{
+ public void enableCopyOnWrite() {
Map<String,Object> config = getDefaultConfig();
config.put("enableCopyOnWriteSupport", true);
MockOsgi.activate(service, context.bundleContext(), config);
@@ -236,7 +236,7 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void enablePrefetchIndexFiles() throws Exception{
+ public void enablePrefetchIndexFiles() {
Map<String,Object> config = getDefaultConfig();
config.put("prefetchIndexFiles", true);
MockOsgi.activate(service, context.bundleContext(), config);
@@ -248,7 +248,7 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void debugLogging() throws Exception{
+ public void debugLogging() {
Map<String,Object> config = getDefaultConfig();
config.put("debug", true);
MockOsgi.activate(service, context.bundleContext(), config);
@@ -258,7 +258,7 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void enableExtractedTextCaching() throws Exception{
+ public void enableExtractedTextCaching() {
Map<String,Object> config = getDefaultConfig();
config.put("extractedTextCacheSizeInMB", 11);
MockOsgi.activate(service, context.bundleContext(), config);
@@ -275,7 +275,7 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void preExtractedTextProvider() throws Exception{
+ public void preExtractedTextProvider() {
MockOsgi.activate(service, context.bundleContext(),
getDefaultConfig());
LuceneIndexEditorProvider editorProvider =
(LuceneIndexEditorProvider)
context.getService(IndexEditorProvider.class);
@@ -290,7 +290,7 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void preExtractedProviderBindBeforeActivate() throws Exception{
+ public void preExtractedProviderBindBeforeActivate() {
service.bindExtractedTextProvider(mock(PreExtractedTextProvider.class));
MockOsgi.activate(service, context.bundleContext(),
getDefaultConfig());
LuceneIndexEditorProvider editorProvider =
@@ -299,7 +299,7 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void alwaysUsePreExtractedCache() throws Exception{
+ public void alwaysUsePreExtractedCache() {
Map<String,Object> config = getDefaultConfig();
config.put("alwaysUsePreExtractedCache", "true");
MockOsgi.activate(service, context.bundleContext(), config);
@@ -309,7 +309,7 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void booleanQuerySize() throws Exception{
+ public void booleanQuerySize() {
Map<String,Object> config = getDefaultConfig();
config.put("booleanClauseLimit", 4000);
MockOsgi.activate(service, context.bundleContext(), config);
@@ -318,7 +318,7 @@ public class LuceneIndexProviderServiceT
}
@Test
- public void indexDefnStorafe() throws Exception{
+ public void indexDefnStorafe() {
Map<String,Object> config = getDefaultConfig();
config.put("disableStoredIndexDefinition", true);
MockOsgi.activate(service, context.bundleContext(), config);
@@ -355,20 +355,14 @@ public class LuceneIndexProviderServiceT
final CountDownLatch latch1 = new CountDownLatch(1);
final CountDownLatch latch2 = new CountDownLatch(1);
- Callable cb1 = new Callable() {
- @Override
- public Object call() throws Exception {
- latch1.await();
- return null;
- }
+ Callable<Object> cb1 = () -> {
+ latch1.await();
+ return null;
};
- Callable cb2 = new Callable() {
- @Override
- public Object call() throws Exception {
- latch2.countDown();
- return null;
- }
+ Callable<Object> cb2 = () -> {
+ latch2.countDown();
+ return null;
};
executor.submit(cb1);
@@ -383,7 +377,7 @@ public class LuceneIndexProviderServiceT
@Test
- public void singleBlobPerIndexFileConfig() throws Exception {
+ public void singleBlobPerIndexFileConfig() {
Map<String, Object> config = getDefaultConfig();
config.put("enableSingleBlobIndexFiles", "true");
MockOsgi.activate(service, context.bundleContext(), config);
@@ -432,7 +426,7 @@ public class LuceneIndexProviderServiceT
}
private Map<String,Object> getDefaultConfig(){
- Map<String,Object> config = new HashMap<String, Object>();
+ Map<String,Object> config = new HashMap<>();
config.put("localIndexDir", folder.getRoot().getAbsolutePath());
return config;
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1876547&r1=1876546&r2=1876547&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
Wed Apr 15 11:05:24 2020
@@ -95,7 +95,6 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.commit.Observable;
-import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.query.Cursor;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.IndexRow;
@@ -119,7 +118,6 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
-import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
@@ -225,12 +223,8 @@ public class LuceneIndexTest {
List<IndexPlan> plans = queryIndex.getPlans(filter, null, indexed);
Cursor cursor = queryIndex.query(plans.get(0), indexed);
- List<String> paths = copyOf(transform(cursor, new Function<IndexRow,
String>() {
- public String apply(IndexRow input) {
- return input.getPath();
- }
- }));
- assertTrue(!paths.isEmpty());
+ List<String> paths = copyOf(transform(cursor, IndexRow::getPath));
+ assertFalse(paths.isEmpty());
assertEquals(LuceneIndex.LUCENE_QUERY_BATCH_SIZE + 1, paths.size());
}
@@ -365,7 +359,7 @@ public class LuceneIndexTest {
Set<String> uniquePaths = Sets.newHashSet(resultPaths);
assertEquals(resultPaths.size(), uniquePaths.size());
- assertTrue(!uniquePaths.isEmpty());
+ assertFalse(uniquePaths.isEmpty());
}
private void purgeDeletedDocs(NodeBuilder idx, LuceneIndexDefinition
definition) throws IOException {
@@ -487,7 +481,7 @@ public class LuceneIndexTest {
filter = createFilter(NT_TEST);
filter.restrictProperty("jcr:content/bar", Operator.EQUAL, null);
- assertFilter(filter, queryIndex, indexed,
Collections.<String>emptyList());
+ assertFilter(filter, queryIndex, indexed, Collections.emptyList());
}
@Test
@@ -588,7 +582,7 @@ public class LuceneIndexTest {
//No stop word configured so default analyzer would also check for
'was'
filter.setFullTextConstraint(new FullTextTerm(null, "fox was jumping",
false, false, null));
- assertFilter(filter, queryIndex, indexed,
Collections.<String>emptyList());
+ assertFilter(filter, queryIndex, indexed, Collections.emptyList());
//Change the default analyzer to use the default stopword set
//and trigger a reindex such that new analyzer is used
@@ -645,12 +639,7 @@ public class LuceneIndexTest {
//entering
NodeStore nodeStore = SegmentNodeStoreBuilders.builder(new
MemoryStore()).build();
tracker = new IndexTracker();
- ((Observable)nodeStore).addObserver(new Observer() {
- @Override
- public void contentChanged(@NotNull NodeState root, @NotNull
CommitInfo info) {
- tracker.update(root);
- }
- });
+ ((Observable)nodeStore).addObserver((root, info) ->
tracker.update(root));
builder = nodeStore.getRoot().builder();
//Also initialize the NodeType registry required for Lucene index to
work
@@ -813,7 +802,7 @@ public class LuceneIndexTest {
NodeBuilder dir =
builder.child("oak:index").child("lucene").child(":data");
//Mutate the blob to fail on access i.e. create corrupt index
- List<Blob> blobs = new ArrayList<Blob>();
+ List<Blob> blobs = new ArrayList<>();
Blob b =
dir.child("segments_1").getProperty(JCR_DATA).getValue(Type.BINARY, 0);
FailingBlob fb = new
FailingBlob(IOUtils.toByteArray(b.getNewStream()));
blobs.add(fb);
@@ -846,8 +835,8 @@ public class LuceneIndexTest {
}
/**
- * Given a lucene index with a config error , it should not block other
- * indexes to index content and should log a meaningful Exception . Once
+ * Given a lucene index with a config error, it should not block other
+ * indexes to index content and should log a meaningful Exception. Once
* fixed and reindexed - it should reindex content as expected.
*/
@Test
@@ -889,8 +878,8 @@ public class LuceneIndexTest {
PropertyValues.newString("bar"));
List<IndexPlan> plans = queryIndex.getPlans(filter, null, indexed);
- // Since the index serving property foo has a config error , no plan
should be available
- assertTrue(plans.size() == 0);
+ // Since the index serving property foo has a config error, no plan
should be available
+ assertEquals(0, plans.size());
// Now we check the config error in index1 should not impact the query
results and content getting indexed for index 2
FilterImpl filter2 = createFilter(NT_BASE);
@@ -915,7 +904,7 @@ public class LuceneIndexTest {
indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
tracker.update(indexed);
// Since the config error is now fixed - there should not be any
more errors here
- assertTrue(customLogs.getLogs().size() == 0);
+ assertEquals(0, customLogs.getLogs().size());
} finally {
customLogs.finished();
}
@@ -980,26 +969,6 @@ public class LuceneIndexTest {
return paths;
}
- private static List<String> assertFilter(Filter filter, AdvancedQueryIndex
queryIndex,
- NodeState indexed, List<String>
expected, boolean ordered) {
- if (!ordered) {
- return assertFilter(filter, queryIndex, indexed, expected);
- }
-
- List<IndexPlan> plans = queryIndex.getPlans(filter, null, indexed);
- Cursor cursor = queryIndex.query(plans.get(0), indexed);
-
- List<String> paths = newArrayList();
- while (cursor.hasNext()) {
- paths.add(cursor.next().getPath());
- }
- for (String p : expected) {
- assertTrue("Expected path " + p + " not found", paths.contains(p));
- }
- assertEquals("Result set size is different", expected.size(),
paths.size());
- return paths;
- }
-
private String getIndexDir(){
File dir = new File("target", "indexdir"+System.nanoTime());
dirs.add(dir);
