honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6792 from areek/fix/6717 

Remove Lucene's deprecated PatternAnalyzer
This commit is contained in:
Areek Zillur 2014-07-09 11:18:51 -04:00
parent 747fd38411 14af0cb0f3
commit 95a5eedd3c
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/org/elasticsearch/index/analysis/PatternAnalyzerProvider.java
View File

@ -19,8 +19,12 @@
package org.elasticsearch.index.analysis; package org.elasticsearch.index.analysis;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.core.StopAnalyzer; import org.apache.lucene.analysis.core.StopAnalyzer;
import org.apache.lucene.analysis.miscellaneous.PatternAnalyzer; import org.apache.lucene.analysis.core.StopFilter;
import org.apache.lucene.analysis.pattern.PatternTokenizer;
import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.CharArraySet;
import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.ElasticsearchIllegalArgumentException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
@ -33,15 +37,41 @@ import org.elasticsearch.env.Environment;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.settings.IndexSettings;
import java.io.Reader;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
* *
*/ */
public class PatternAnalyzerProvider extends AbstractIndexAnalyzerProvider<PatternAnalyzer> { public class PatternAnalyzerProvider extends AbstractIndexAnalyzerProvider<Analyzer> {
private final PatternAnalyzer analyzer; private final PatternAnalyzer analyzer;
private static final class PatternAnalyzer extends Analyzer {
private final org.apache.lucene.util.Version version;
private final Pattern pattern;
private final boolean lowercase;
private final CharArraySet stopWords;
PatternAnalyzer(org.apache.lucene.util.Version version, Pattern pattern, boolean lowercase, CharArraySet stopWords) {
this.version = version;
this.pattern = pattern;
this.lowercase = lowercase;
this.stopWords = stopWords;
}
@Override
protected TokenStreamComponents createComponents(String s, Reader reader) {
final TokenStreamComponents source = new TokenStreamComponents(new PatternTokenizer(reader, pattern, -1));
TokenStream result = null;
if (lowercase) {
result = new LowerCaseFilter(version, source.getTokenStream());
}
result = new StopFilter(version, (result == null) ? source.getTokenStream() : result, stopWords);
return new TokenStreamComponents(source.getTokenizer(), result);
}
}
@Inject @Inject
public PatternAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, Environment env, @Assisted String name, @Assisted Settings settings) { public PatternAnalyzerProvider(Index index, @IndexSettings Settings indexSettings, Environment env, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name, settings); super(index, indexSettings, name, settings);