lucene 9.0.0

Author: tarzanek

opengrok-indexer/pom.xml

@@ -63,7 +63,7 @@ Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-common</artifactId>
+            <artifactId>lucene-analysis-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>

pom.xml

@@ -60,7 +60,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
     </scm>
 
     <properties>
-        <lucene.version>8.11.0</lucene.version>
+        <lucene.version>9.0.0</lucene.version>
         <mavenjavadocplugin.version>3.2.0</mavenjavadocplugin.version>
         <!-- The following changed syntax from e.g. 1.8 to 11. -->
         <compileSource>11</compileSource>
@@ -114,7 +114,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
             </dependency>
             <dependency>
                 <groupId>org.apache.lucene</groupId>
-                <artifactId>lucene-analyzers-common</artifactId>
+                <artifactId>lucene-analysis-common</artifactId>
                 <version>${lucene.version}</version>
             </dependency>
             <dependency>

suggester/pom.xml

@@ -48,7 +48,7 @@ Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
 
         <dependency>
             <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-common</artifactId>
+            <artifactId>lucene-analysis-common</artifactId>
         </dependency>
 
         <dependency>

suggester/src/main/java/org/opengrok/suggest/query/SuggesterPhraseQuery.java

@@ -26,6 +26,7 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
 import org.opengrok.suggest.query.customized.CustomPhraseQuery;
 
 import java.util.ArrayList;
@@ -146,4 +147,9 @@ public Query rewrite(final IndexReader reader) {
         return phraseQuery.rewrite(reader);
     }
 
+    @Override
+    public void visit(QueryVisitor visitor) {
+        visitor.visitLeaf(this);
+    }
+
 }

suggester/src/main/java/org/opengrok/suggest/query/customized/CustomExactPhraseScorer.java

@@ -23,7 +23,7 @@
 import java.util.Map;
 
 import org.apache.lucene.index.PostingsEnum;
-import org.apache.lucene.search.ConjunctionDISI;
+import org.apache.lucene.search.ConjunctionUtils;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.TwoPhaseIterator;
@@ -84,7 +84,7 @@ private static class PostingsAndPosition {
         if (iterators.size() == 1) {
             conjunction = iterators.get(0);
         } else {
-            conjunction = ConjunctionDISI.intersectIterators(iterators);
+            conjunction = ConjunctionUtils.intersectIterators(iterators);
         }
         // custom ends
         assert TwoPhaseIterator.unwrap(conjunction) == null;

suggester/src/main/java/org/opengrok/suggest/query/customized/CustomPhraseQuery.java

@@ -31,6 +31,7 @@
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.PhraseQuery;
 import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryVisitor;
 import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.Weight;
@@ -239,6 +240,11 @@ public Query rewrite(IndexReader reader) {
         return this;
     }
 
+    @Override
+    public void visit(QueryVisitor visitor) {
+        visitor.visitLeaf(this);
+    }
+
     @Override
     public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost) throws IOException {
         return new CustomPhraseWeight(searcher, this);
@@ -263,7 +269,6 @@ private static class CustomPhraseWeight extends Weight {
             }
         }
 
-        @Override
         @Deprecated
         public void extractTerms(Set<Term> set) {
             throw new UnsupportedOperationException();

suggester/src/main/java/org/opengrok/suggest/query/customized/CustomSloppyPhraseScorer.java

@@ -26,7 +26,7 @@
 import java.util.Map;
 
 import org.apache.lucene.index.Term;
-import org.apache.lucene.search.ConjunctionDISI;
+import org.apache.lucene.search.ConjunctionUtils;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.TwoPhaseIterator;
@@ -94,7 +94,7 @@ final class CustomSloppyPhraseScorer extends Scorer implements PhraseScorer { //
         if (iterators.length == 1) {
             conjunction = iterators[0];
         } else {
-            conjunction = ConjunctionDISI.intersectIterators(Arrays.asList(iterators));
+            conjunction = ConjunctionUtils.intersectIterators(Arrays.asList(iterators));
         }
         // custom ends
         assert TwoPhaseIterator.unwrap(conjunction) == null;