LUCENE-6572: Remove dependency on analyzer-common from highlighing

This makes a simplifed copy of LimitTokenOffsetFilter to the highlighting
module to detach the dependency on analyzer-common.
This commit is contained in:
Simon Willnauer 2018-10-17 10:16:31 +02:00
parent 635d1ea535
commit 11a1b8c1a8
3 changed files with 60 additions and 2 deletions

View File

@ -32,10 +32,17 @@
<pathelement path="${memory.jar}"/> <pathelement path="${memory.jar}"/>
<pathelement path="${queries.jar}"/> <pathelement path="${queries.jar}"/>
<pathelement path="${join.jar}"/> <pathelement path="${join.jar}"/>
<pathelement path="${analyzers-common.jar}"/>
<path refid="base.classpath"/> <path refid="base.classpath"/>
</path> </path>
<path id="test.classpath">
<pathelement path="${memory.jar}"/>
<pathelement path="${queries.jar}"/>
<pathelement path="${join.jar}"/>
<pathelement path="${analyzers-common.jar}"/>
<path refid="test.base.classpath"/>
</path>
<target name="compile-core" depends="jar-memory,jar-queries,jar-join,jar-analyzers-common,common.compile-core" /> <target name="compile-core" depends="jar-memory,jar-queries,jar-join,jar-analyzers-common,common.compile-core" />
<target name="javadocs" depends="javadocs-memory,compile-core,check-javadocs-uptodate" <target name="javadocs" depends="javadocs-memory,compile-core,check-javadocs-uptodate"

View File

@ -0,0 +1,52 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.search.highlight;
import java.io.IOException;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
/**
* This is a simplified version of org.apache.lucene.analysis.miscellaneous.LimitTokenOffsetFilter to prevent
* a dependency on analyzers-common.jar.
*/
final class LimitTokenOffsetFilter extends TokenFilter {
private final OffsetAttribute offsetAttrib = addAttribute(OffsetAttribute.class);
private int maxStartOffset;
LimitTokenOffsetFilter(TokenStream input, int maxStartOffset) {
super(input);
if (maxStartOffset < 0) {
throw new IllegalArgumentException("maxStartOffset must be >= zero");
}
this.maxStartOffset = maxStartOffset;
}
@Override
public boolean incrementToken() throws IOException {
if (!input.incrementToken()) {
return false;
}
if (offsetAttrib.startOffset() <= maxStartOffset) {
return true;
}
return false;
}
}

View File

@ -23,7 +23,6 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.LimitTokenOffsetFilter;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.lucene.index.Fields; import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;