You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/12/25 20:47:37 UTC
[jspwiki] 04/09: update lucene to 7.6.0
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit fdc064085f89b0b21e7ee9f92de4d77720d17bfc
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Dec 24 01:33:58 2018 +0100
update lucene to 7.6.0
---
.../apache/wiki/search/LuceneSearchProvider.java | 21 ++++++++++-----------
.../org/apache/wiki/search/SearchManagerTest.java | 2 +-
pom.xml | 2 +-
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index 5af7573..a515866 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -64,7 +64,6 @@ import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.store.SimpleFSDirectory;
-import org.apache.lucene.util.Version;
import org.apache.wiki.InternalWikiException;
import org.apache.wiki.WatchDog;
import org.apache.wiki.WikiBackgroundThread;
@@ -126,7 +125,7 @@ public class LuceneSearchProvider implements SearchProvider {
private static final int MAX_FRAGMENTS = 3;
/** The maximum number of hits to return from searches. */
- public static final int MAX_SEARCH_HITS = 99999;
+ public static final int MAX_SEARCH_HITS = 99_999;
private static String c_punctuationSpaces = StringUtils.repeat(" ", MarkupParser.PUNCTUATION_CHARS_ALLOWED.length() );
@@ -217,7 +216,7 @@ public class LuceneSearchProvider implements SearchProvider {
log.info("Starting Lucene reindexing, this can take a couple of minutes...");
- Directory luceneDir = new SimpleFSDirectory(dir, null);
+ Directory luceneDir = new SimpleFSDirectory( dir.toPath() );
try( IndexWriter writer = getIndexWriter( luceneDir ) )
{
Collection< WikiPage > allPages = m_engine.getPageManager().getAllPages();
@@ -359,7 +358,7 @@ public class LuceneSearchProvider implements SearchProvider {
pageRemoved( page );
// Now add back the new version.
- luceneDir = new SimpleFSDirectory(new File(m_luceneDirectory), null);
+ luceneDir = new SimpleFSDirectory( new File( m_luceneDirectory ).toPath() );
writer = getIndexWriter( luceneDir );
luceneIndexPage( page, text, writer );
@@ -388,8 +387,8 @@ public class LuceneSearchProvider implements SearchProvider {
try
{
Class< ? > clazz = ClassUtil.findClass( "", m_analyzerClass );
- Constructor< ? > constructor = clazz.getConstructor( Version.LUCENE_47.getClass() );
- Analyzer analyzer = (Analyzer) constructor.newInstance( Version.LUCENE_47 );
+ Constructor< ? > constructor = clazz.getConstructor();
+ Analyzer analyzer = (Analyzer) constructor.newInstance();
return analyzer;
}
catch( Exception e )
@@ -479,7 +478,7 @@ public class LuceneSearchProvider implements SearchProvider {
IndexWriter writer = null;
try
{
- Directory luceneDir = new SimpleFSDirectory(new File(m_luceneDirectory), null);
+ Directory luceneDir = new SimpleFSDirectory( new File( m_luceneDirectory ).toPath() );
writer = getIndexWriter( luceneDir );
Query query = new TermQuery( new Term( LUCENE_ID, page.getName() ) );
writer.deleteDocuments( query );
@@ -498,7 +497,7 @@ public class LuceneSearchProvider implements SearchProvider {
LockObtainFailedException, IOException, ProviderException
{
IndexWriter writer = null;
- IndexWriterConfig writerConfig = new IndexWriterConfig( Version.LUCENE_47, getLuceneAnalyzer() );
+ IndexWriterConfig writerConfig = new IndexWriterConfig( getLuceneAnalyzer() );
writerConfig.setOpenMode( OpenMode.CREATE_OR_APPEND );
writer = new IndexWriter( luceneDir, writerConfig );
@@ -512,7 +511,7 @@ public class LuceneSearchProvider implements SearchProvider {
{
if( writer != null )
{
- writer.close( true );
+ writer.close();
}
}
catch( IOException e )
@@ -583,7 +582,7 @@ public class LuceneSearchProvider implements SearchProvider {
try
{
String[] queryfields = { LUCENE_PAGE_CONTENTS, LUCENE_PAGE_NAME, LUCENE_AUTHOR, LUCENE_ATTACHMENTS };
- QueryParser qp = new MultiFieldQueryParser( Version.LUCENE_47, queryfields, getLuceneAnalyzer() );
+ QueryParser qp = new MultiFieldQueryParser( queryfields, getLuceneAnalyzer() );
//QueryParser qp = new QueryParser( LUCENE_PAGE_CONTENTS, getLuceneAnalyzer() );
Query luceneQuery = qp.parse( query );
@@ -598,7 +597,7 @@ public class LuceneSearchProvider implements SearchProvider {
try
{
File dir = new File(m_luceneDirectory);
- Directory luceneDir = new SimpleFSDirectory(dir, null);
+ Directory luceneDir = new SimpleFSDirectory( dir.toPath() );
IndexReader reader = DirectoryReader.open(luceneDir);
searcher = new IndexSearcher(reader);
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
index 21f29e4..4aa37c9 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/search/SearchManagerTest.java
@@ -83,7 +83,7 @@ public class SearchManagerTest {
res = m_mgr.findPages( text, ctx );
-// debugSearchResults( res );
+ // debugSearchResults( res );
}
return res;
}
diff --git a/pom.xml b/pom.xml
index 92debe8..d469234 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<jrcs-diff.version>0.4.2</jrcs-diff.version>
<junit.version>5.3.2</junit.version>
<log4j.version>1.2.17</log4j.version>
- <lucene.version>4.7.0</lucene.version>
+ <lucene.version>7.6.0</lucene.version>
<nekohtml.version>1.9.21</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>