Apache Lucene open-source search software
LUCENE-10523: factor out UnifiedHighlighter.newFieldHighlighter() method (#821)
Christine Poerschke56462b5f9628
diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.javaindex 3e872733ce2..f74babab3ae 100644--- a/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java+++ b/lucene/highlighter/src/java/org/apache/lucene/search/uhighlight/UnifiedHighlighter.java@@ -1077,7 +1077,7 @@ public class UnifiedHighlighter {String field, Query query, Set<Term> allTerms, int maxPassages) {UHComponents components = getHighlightComponents(field, query, allTerms);OffsetSource offsetSource = getOptimizedOffsetSource(components);- return new FieldHighlighter(+ return newFieldHighlighter(field,getOffsetStrategy(offsetSource, components),new SplittingBreakIterator(getBreakIterator(field), UnifiedHighlighter.MULTIVAL_SEP_CHAR),@@ -1087,6 +1087,24 @@ public class UnifiedHighlighter {getFormatter(field));}+ protected FieldHighlighter newFieldHighlighter(+ String field,+ FieldOffsetStrategy fieldOffsetStrategy,+ BreakIterator breakIterator,+ PassageScorer passageScorer,+ int maxPassages,+ int maxNoHighlightPassages,+ PassageFormatter passageFormatter) {+ return new FieldHighlighter(+ field,+ fieldOffsetStrategy,+ breakIterator,+ passageScorer,+ maxPassages,+ maxNoHighlightPassages,+ passageFormatter);+ }+protected UHComponents getHighlightComponents(String field, Query query, Set<Term> allTerms) {Predicate<String> fieldMatcher = getFieldMatcher(field);Set<HighlightFlag> highlightFlags = getFlags(field);