fix context tests and highlighter

Author: tarzanek

opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/Context.java

@@ -37,6 +37,7 @@
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
+import org.apache.lucene.search.uhighlight.UnifiedHighlighter;
 import org.opengrok.indexer.analysis.AbstractAnalyzer;
 import org.opengrok.indexer.analysis.Definitions;
 import org.opengrok.indexer.analysis.Scopes;
@@ -196,9 +197,13 @@ public boolean getContext2(RuntimeEnvironment env, IndexSearcher searcher,
         formatter.setMoreUrl(moreURL);
         formatter.setMoreLimit(linelimit);
 
-        OGKUnifiedHighlighter uhi = new OGKUnifiedHighlighter(env, searcher, anz);
-        uhi.setBreakIterator(StrictLineBreakIterator::new);
-        uhi.setFormatter(formatter);
+        UnifiedHighlighter.Builder uhBuilder =  new UnifiedHighlighter.Builder(searcher, anz)
+//                .withMaxLength(maxDocCharsToAnalyze)
+//                .withHighlightPhrasesStrictly(true)
+//                .withHandleMultiTermQuery(true)
+                .withBreakIterator(StrictLineBreakIterator::new)
+                .withFormatter(formatter);
+        OGKUnifiedHighlighter uhi = new OGKUnifiedHighlighter(env, uhBuilder);
         uhi.setTabSize(tabSize);
 
         try {

opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/OGKUnifiedHighlighter.java

@@ -35,7 +35,6 @@
 import org.apache.lucene.document.DateTools;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.uhighlight.UHComponents;
 import org.apache.lucene.search.uhighlight.UnifiedHighlighter;
@@ -68,12 +67,11 @@ public class OGKUnifiedHighlighter extends UnifiedHighlighter {
      * for the specified {@code indexSearcher} and {@code indexAnalyzer}, and
      * stores the {@code env} for later use.
      * @param env a required instance
-     * @param indexSearcher a required instance
-     * @param indexAnalyzer a required instance
      * @throws IllegalArgumentException if any argument is null
      */
-    public OGKUnifiedHighlighter(RuntimeEnvironment env, IndexSearcher indexSearcher, Analyzer indexAnalyzer) {
-        super(indexSearcher, indexAnalyzer);
+    public OGKUnifiedHighlighter(RuntimeEnvironment env,
+                                 UnifiedHighlighter.Builder uhBuilder) {
+        super(uhBuilder);
 
         if (env == null) {
             throw new IllegalArgumentException("env is null");

opengrok-indexer/src/test/java/org/opengrok/indexer/search/context/SearchAndContextFormatterTest.java

@@ -32,6 +32,7 @@
 import org.apache.lucene.document.Document;
 import org.apache.lucene.search.ScoreDoc;
 
+import org.apache.lucene.search.uhighlight.UnifiedHighlighter;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -124,9 +125,13 @@ private String[] getFirstFragments(SearchEngine instance) throws IOException {
         AbstractAnalyzer anz = fac.getAnalyzer();
 
         ContextFormatter formatter = new ContextFormatter(args);
-        OGKUnifiedHighlighter uhi = new OGKUnifiedHighlighter(env, instance.getSearcher(), anz);
-        uhi.setBreakIterator(StrictLineBreakIterator::new);
-        uhi.setFormatter(formatter);
+        UnifiedHighlighter.Builder uhBuilder =  new UnifiedHighlighter.Builder(instance.getSearcher(), anz)
+//                .withMaxLength(maxDocCharsToAnalyze)
+//                .withHighlightPhrasesStrictly(true)
+//                .withHandleMultiTermQuery(true)
+                .withBreakIterator(StrictLineBreakIterator::new)
+                .withFormatter(formatter);
+        OGKUnifiedHighlighter uhi = new OGKUnifiedHighlighter(env, uhBuilder);
 
         ScoreDoc[] docs = instance.scoreDocs();
         for (ScoreDoc scoreDoc : docs) {

opengrok-indexer/src/test/java/org/opengrok/indexer/search/context/SearchAndContextFormatterTest2.java

@@ -39,6 +39,7 @@
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
 
+import org.apache.lucene.search.uhighlight.UnifiedHighlighter;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -197,10 +198,14 @@ private String[] getFirstFragments(SearchEngine instance)
         AbstractAnalyzer anz = fac.getAnalyzer();
 
         ContextFormatter formatter = new ContextFormatter(args);
+        UnifiedHighlighter.Builder uhBuilder =  new UnifiedHighlighter.Builder(instance.getSearcher(), anz)
+//                .withMaxLength(maxDocCharsToAnalyze)
+//                .withHighlightPhrasesStrictly(true)
+//                .withHandleMultiTermQuery(true)
+                .withBreakIterator(StrictLineBreakIterator::new)
+                .withFormatter(formatter);
         OGKUnifiedHighlighter uhi = new OGKUnifiedHighlighter(env,
-                instance.getSearcher(), anz);
-        uhi.setBreakIterator(StrictLineBreakIterator::new);
-        uhi.setFormatter(formatter);
+                uhBuilder);
         uhi.setTabSize(TABSIZE);
 
         ScoreDoc[] docs = instance.scoreDocs();

pom.xml

@@ -60,7 +60,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
     </scm>
 
     <properties>
-        <lucene.version>9.0.0</lucene.version>
+        <lucene.version>9.1.0</lucene.version>
         <mavenjavadocplugin.version>3.2.0</mavenjavadocplugin.version>
         <!-- The following changed syntax from e.g. 1.8 to 11. -->
         <compileSource>11</compileSource>