SGF-609 - Fix test failures related to Mockito version 2.7.

This commit is contained in:
John Blum
2017-04-12 19:18:11 -07:00
parent 6abac9af12
commit 979a7895c6
7 changed files with 117 additions and 74 deletions

View File

@@ -122,14 +122,15 @@ public class LuceneIndexFactoryBean implements FactoryBean<LuceneIndex>,
protected LuceneIndex createIndex(String indexName, String regionPath) {
LuceneService luceneService = resolveLuceneService();
LuceneIndexFactory indexFactory = luceneService.createIndexFactory();
Map<String, Analyzer> fieldAnalyzers = getFieldAnalyzers();
if (isEmpty(fieldAnalyzers)) {
luceneService.createIndexFactory().setFields(asArray(resolveFields(getFields())))
.create(indexName, regionPath);
indexFactory.setFields(asArray(resolveFields(getFields()))).create(indexName, regionPath);
}
else {
luceneService.createIndexFactory().setFields(fieldAnalyzers).create(indexName, regionPath);
indexFactory.setFields(fieldAnalyzers).create(indexName, regionPath);
}
return luceneService.getIndex(indexName, regionPath);