Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-03-01 05:49:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

LUCENE-2510: Moved Analysis Factory parent classes into analysis module

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1335331 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christopher John Male 2012-05-08 03:23:47 +00:00
parent 871924ea2e
commit 0bad718d58
146 changed files with 381 additions and 472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev-tools/idea/solr/contrib/uima/uima.iml
View File

@ -27,5 +27,6 @@
<orderEntry type="module" module-name="solr" />
<orderEntry type="module" module-name="lucene" />
<orderEntry type="module" module-name="analysis-uima" />
<orderEntry type="module" module-name="analysis-common" />
</component>
</module>

81
solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java → lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java
View File

@ -1,4 +1,6 @@
/**
package org.apache.lucene.analysis.util;
/*
* 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.
@ -15,15 +17,9 @@
* limitations under the License.
*/
package org.apache.solr.analysis;
import org.apache.lucene.analysis.core.StopFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.WordlistLoader;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.Version;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.util.StrUtils;
import java.io.IOException;
import java.io.InputStream;
@ -31,33 +27,29 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CodingErrorAction;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
/**
* Simple abstract implementation that handles init arg processing, is not really
* a factory as it implements no interface, but removes code duplication
* in its subclasses.
*
*
*/
abstract class BaseTokenStreamFactory {
abstract class AbstractAnalysisFactory {
/** The init args */
protected Map<String,String> args;
/** the luceneVersion arg */
protected Version luceneMatchVersion = null;
public void init(Map<String,String> args) {
this.args=args;
this.args = args;
}
public Map<String,String> getArgs() {
return args;
}
/** this method can be called in the {@link TokenizerFactory#create(java.io.Reader)}
* or {@link TokenFilterFactory#create(org.apache.lucene.analysis.TokenStream)} methods,
/** this method can be called in the {@link org.apache.lucene.analysis.util.TokenizerFactory#create(java.io.Reader)}
* or {@link org.apache.lucene.analysis.util.TokenFilterFactory#create(org.apache.lucene.analysis.TokenStream)} methods,
* to inform user, that for this factory a {@link #luceneMatchVersion} is required */
protected final void assureMatchVersion() {
if (luceneMatchVersion == null) {
@ -69,28 +61,32 @@ abstract class BaseTokenStreamFactory {
public void setLuceneMatchVersion(Version luceneMatchVersion) {
this.luceneMatchVersion = luceneMatchVersion;
}
// TODO: move these somewhere that tokenizers and others
// can also use them...
public Version getLuceneMatchVersion() {
return this.luceneMatchVersion;
}
protected int getInt(String name) {
return getInt(name,-1,false);
return getInt(name, -1, false);
}
protected int getInt(String name, int defaultVal) {
return getInt(name,defaultVal,true);
return getInt(name, defaultVal, true);
}
protected int getInt(String name, int defaultVal, boolean useDefault) {
String s = args.get(name);
if (s==null) {
if (useDefault) return defaultVal;
if (s == null) {
if (useDefault) {
return defaultVal;
}
throw new InitializationException("Configuration Error: missing parameter '" + name + "'");
}
return Integer.parseInt(s);
}
protected boolean getBoolean(String name, boolean defaultVal) {
return getBoolean(name,defaultVal,true);
return getBoolean(name, defaultVal, true);
}
protected boolean getBoolean(String name, boolean defaultVal, boolean useDefault) {
@ -105,12 +101,12 @@ abstract class BaseTokenStreamFactory {
protected CharArraySet getWordSet(ResourceLoader loader,
String wordFiles, boolean ignoreCase) throws IOException {
assureMatchVersion();
List<String> files = StrUtils.splitFileNames(wordFiles);
List<String> files = splitFileNames(wordFiles);
CharArraySet words = null;
if (files.size() > 0) {
// default stopwords list has 35 or so words, but maybe don't make it that
// big to start
words = new CharArraySet(luceneMatchVersion,
words = new CharArraySet(luceneMatchVersion,
files.size() * 10, ignoreCase);
for (String file : files) {
List<String> wlist = loader.getLines(file.trim());
@ -120,18 +116,18 @@ abstract class BaseTokenStreamFactory {
}
return words;
}
/** same as {@link #getWordSet(ResourceLoader, String, boolean)},
* except the input is in snowball format. */
protected CharArraySet getSnowballWordSet(ResourceLoader loader,
String wordFiles, boolean ignoreCase) throws IOException {
assureMatchVersion();
List<String> files = StrUtils.splitFileNames(wordFiles);
List<String> files = splitFileNames(wordFiles);
CharArraySet words = null;
if (files.size() > 0) {
// default stopwords list has 35 or so words, but maybe don't make it that
// big to start
words = new CharArraySet(luceneMatchVersion,
words = new CharArraySet(luceneMatchVersion,
files.size() * 10, ignoreCase);
for (String file : files) {
InputStream stream = null;
@ -150,4 +146,23 @@ abstract class BaseTokenStreamFactory {
}
return words;
}
/**
* Splits file names separated by comma character.
* File names can contain comma characters escaped by backslash '\'
*
* @param fileNames the string containing file names
* @return a list of file names with the escaping backslashed removed
*/
protected List<String> splitFileNames(String fileNames) {
if (fileNames == null)
return Collections.<String>emptyList();
List<String> result = new ArrayList<String>();
for (String file : fileNames.split("(?<!\\\\),")) {
result.add(file.replaceAll("\\\\(?=,)", ""));
}
return result;
}
}

14
solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java → lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java
View File

@ -1,4 +1,6 @@
/**
package org.apache.lucene.analysis.util;
/*
* 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.
@ -15,13 +17,9 @@
* limitations under the License.
*/
package org.apache.solr.analysis;
import org.apache.lucene.analysis.CharStream;
/**
* Simple abstract implementation that handles init arg processing.
*
*
*/
public abstract class BaseTokenizerFactory extends BaseTokenStreamFactory implements TokenizerFactory {
public abstract class CharFilterFactory extends AbstractAnalysisFactory {
public abstract CharStream create(CharStream input);
}

2
solr/core/src/java/org/apache/solr/analysis/InitializationException.java → lucene/analysis/common/src/java/org/apache/lucene/analysis/util/InitializationException.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.analysis;
package org.apache.lucene.analysis.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more

15
solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java → lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java
View File

@ -1,4 +1,6 @@
/**
package org.apache.lucene.analysis.util;
/*
* 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.
@ -15,13 +17,10 @@
* limitations under the License.
*/
package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple abstract implementation that handles init arg processing.
*
*
*/
public abstract class BaseTokenFilterFactory extends BaseTokenStreamFactory implements TokenFilterFactory {
public abstract class TokenFilterFactory extends AbstractAnalysisFactory {
/** Transform the specified input TokenStream */
public abstract TokenStream create(TokenStream input);
}

27
solr/core/src/java/org/apache/solr/analysis/CharFilterFactory.java → lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java
View File

@ -1,4 +1,6 @@
/**
package org.apache.lucene.analysis.util;
/*
* 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.
@ -15,25 +17,12 @@
* limitations under the License.
*/
package org.apache.solr.analysis;
import org.apache.lucene.analysis.Tokenizer;
import java.util.Map;
import java.io.Reader;
import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.util.Version;
public abstract class TokenizerFactory extends AbstractAnalysisFactory {
/**
*
* @since Solr 1.4
*
*/
public interface CharFilterFactory {
public void init(Map<String,String> args);
public Map<String,String> getArgs();
public void setLuceneMatchVersion(Version luceneMatchVersion);
public CharStream create(CharStream input);
/** Creates a TokenStream of the specified input */
public abstract Tokenizer create(Reader input);
}

3
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java
View File

@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.io.IOUtils;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.collation.ICUCollationKeyFilter;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.SolrException;
@ -70,7 +71,7 @@ import com.ibm.icu.util.ULocale;
* @deprecated use {@link org.apache.solr.schema.ICUCollationField} instead.
*/
@Deprecated
public class ICUCollationKeyFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent,ResourceLoaderAware {
public class ICUCollationKeyFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent, ResourceLoaderAware {
private Collator collator;
public void inform(ResourceLoader loader) {

3
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java
View File

@ -2,6 +2,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.icu.ICUFoldingFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -21,7 +22,7 @@ import org.apache.lucene.analysis.icu.ICUFoldingFilter;
*/
/** Factory for {@link ICUFoldingFilter} */
public class ICUFoldingFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class ICUFoldingFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
@Override
public TokenStream create(TokenStream input) {

3
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java
View File

@ -23,6 +23,7 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.icu.ICUNormalizer2Filter;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import com.ibm.icu.text.FilteredNormalizer2;
import com.ibm.icu.text.Normalizer2;
@ -44,7 +45,7 @@ import com.ibm.icu.text.UnicodeSet;
* @see Normalizer2
* @see FilteredNormalizer2
*/
public class ICUNormalizer2FilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class ICUNormalizer2FilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
private Normalizer2 normalizer;
// TODO: support custom normalization

3
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java
View File

@ -21,9 +21,10 @@ import java.io.Reader;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.icu.segmentation.ICUTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
/** Factory for {@link ICUTokenizer} */
public class ICUTokenizerFactory extends BaseTokenizerFactory {
public class ICUTokenizerFactory extends TokenizerFactory {
// TODO: add support for custom configs
@Override
public Tokenizer create(Reader input) {

4
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java
View File

@ -21,9 +21,9 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.icu.ICUTransformFilter;
import org.apache.solr.analysis.BaseTokenFilterFactory;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import com.ibm.icu.text.Transliterator;
@ -37,7 +37,7 @@ import com.ibm.icu.text.Transliterator;
* </ul>
* @see Transliterator
*/
public class ICUTransformFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class ICUTransformFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
private Transliterator transliterator;
// TODO: add support for custom rules

3
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java
View File

@ -26,6 +26,7 @@ import morfologik.stemming.PolishStemmer.DICTIONARY;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.morfologik.MorfologikFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Filter factory for {@link MorfologikFilter}.
@ -44,7 +45,7 @@ import org.apache.lucene.analysis.morfologik.MorfologikFilter;
*
* @see <a href="http://morfologik.blogspot.com/">Morfologik web site</a>
*/
public class MorfologikFilterFactory extends BaseTokenFilterFactory {
public class MorfologikFilterFactory extends TokenFilterFactory {
/** Dictionary. */
private DICTIONARY dictionary = DICTIONARY.MORFOLOGIK;

3
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseSentenceTokenizerFactory.java
View File

@ -21,12 +21,13 @@ import java.io.Reader;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.cn.smart.SentenceTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
/**
* Factory for the SmartChineseAnalyzer {@link SentenceTokenizer}
* @lucene.experimental
*/
public class SmartChineseSentenceTokenizerFactory extends BaseTokenizerFactory {
public class SmartChineseSentenceTokenizerFactory extends TokenizerFactory {
public Tokenizer create(Reader input) {
return new SentenceTokenizer(input);
}

3
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseWordTokenFilterFactory.java
View File

@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cn.smart.WordTokenFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for the SmartChineseAnalyzer {@link WordTokenFilter}
@ -30,7 +31,7 @@ import org.apache.lucene.analysis.cn.smart.WordTokenFilter;
* <code>words="org/apache/lucene/analysis/cn/smart/stopwords.txt"</code>
* @lucene.experimental
*/
public class SmartChineseWordTokenFilterFactory extends BaseTokenFilterFactory {
public class SmartChineseWordTokenFilterFactory extends TokenFilterFactory {
public TokenFilter create(TokenStream input) {
return new WordTokenFilter(input);
}

3
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java
View File

@ -26,12 +26,13 @@ import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.egothor.stemmer.Trie;
/**
* Factory for {@link StempelFilter} using a Polish stemming table.
*/
public class StempelPolishStemFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public class StempelPolishStemFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private Trie stemmer = null;
private static final String STEMTABLE = "org/apache/lucene/analysis/pl/stemmer_20000.tbl";

2
solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
View File

@ -22,9 +22,9 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.solr.analysis.CommonGramsFilterFactory;
import org.apache.solr.analysis.StopFilterFactory;
import org.apache.solr.analysis.TokenFilterFactory;
import org.apache.solr.analysis.TokenizerChain;
import org.apache.solr.schema.IndexSchema;
import org.carrot2.core.LanguageCode;

6
solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactory.java
View File

@ -18,16 +18,16 @@ package org.apache.solr.uima.analysis;
*/
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.analysis.uima.UIMAAnnotationsTokenizer;
import org.apache.solr.analysis.BaseTokenizerFactory;
import java.io.Reader;
import java.util.Map;
/**
* Solr {@link org.apache.solr.analysis.TokenizerFactory} for {@link UIMAAnnotationsTokenizer}
* {@link org.apache.lucene.analysis.util.TokenizerFactory} for {@link UIMAAnnotationsTokenizer}
*/
public class UIMAAnnotationsTokenizerFactory extends BaseTokenizerFactory {
public class UIMAAnnotationsTokenizerFactory extends TokenizerFactory {
private String descriptorPath;
private String tokenType;

6
solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactory.java
View File

@ -19,15 +19,15 @@ package org.apache.solr.uima.analysis;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.uima.UIMATypeAwareAnnotationsTokenizer;
import org.apache.solr.analysis.BaseTokenizerFactory;
import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
import java.util.Map;
/**
* Solr {@link org.apache.solr.analysis.TokenizerFactory} for {@link UIMATypeAwareAnnotationsTokenizer}
* {@link org.apache.lucene.analysis.util.TokenizerFactory} for {@link UIMATypeAwareAnnotationsTokenizer}
*/
public class UIMATypeAwareAnnotationsTokenizerFactory extends BaseTokenizerFactory {
public class UIMATypeAwareAnnotationsTokenizerFactory extends TokenizerFactory {
private String descriptorPath;
private String tokenType;

4
solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java
View File

@ -18,6 +18,8 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
import org.apache.lucene.analysis.TokenStream;
@ -32,7 +34,7 @@ import org.apache.lucene.analysis.TokenStream;
* &lt;/fieldType&gt;</pre>
*
*/
public class ASCIIFoldingFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class ASCIIFoldingFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
public ASCIIFoldingFilter create(TokenStream input) {
return new ASCIIFoldingFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
View File

@ -17,6 +17,7 @@ package org.apache.solr.analysis;
*/
import org.apache.lucene.analysis.ar.ArabicLetterTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -29,7 +30,7 @@ import java.util.Map;
* @deprecated (3.1) Use StandardTokenizerFactory instead.
**/
@Deprecated
public class ArabicLetterTokenizerFactory extends BaseTokenizerFactory{
public class ArabicLetterTokenizerFactory extends TokenizerFactory {
private static final Logger log = LoggerFactory.getLogger(ArabicLetterTokenizerFactory.class);

3
solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java
View File

@ -18,6 +18,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ar.ArabicNormalizationFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.ar.ArabicNormalizationFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class ArabicNormalizationFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class ArabicNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
public ArabicNormalizationFilter create(TokenStream input) {
return new ArabicNormalizationFilter(input);

3
solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java
View File

@ -18,6 +18,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ar.ArabicStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.ar.ArabicStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class ArabicStemFilterFactory extends BaseTokenFilterFactory{
public class ArabicStemFilterFactory extends TokenFilterFactory {
public ArabicStemFilter create(TokenStream input) {

64
solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java
View File

@ -1,64 +0,0 @@
/**
* 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.solr.analysis;
import org.apache.lucene.util.Version;
import java.util.Map;
/**
*
* @since Solr 1.4
*
*/
public abstract class BaseCharFilterFactory implements CharFilterFactory {
protected Version luceneMatchVersion;
/** The init args */
protected Map<String,String> args;
public Map<String, String> getArgs() {
return args;
}
public void init(Map<String, String> args) {
this.args = args;
}
public void setLuceneMatchVersion(Version luceneMatchVersion) {
this.luceneMatchVersion = luceneMatchVersion;
}
protected int getInt(String name) {
return getInt(name,-1,false);
}
protected int getInt(String name, int defaultVal) {
return getInt(name,defaultVal,true);
}
protected int getInt(String name, int defaultVal, boolean useDefault) {
String s = args.get(name);
if (s==null) {
if (useDefault) return defaultVal;
throw new InitializationException("Configuration Error: missing parameter '" + name + "'");
}
return Integer.parseInt(s);
}
}

3
solr/core/src/java/org/apache/solr/analysis/BeiderMorseFilterFactory.java
View File

@ -27,6 +27,7 @@ import org.apache.commons.codec.language.bm.PhoneticEngine;
import org.apache.commons.codec.language.bm.RuleType;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.phonetic.BeiderMorseFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link BeiderMorseFilter}.
@ -42,7 +43,7 @@ import org.apache.lucene.analysis.phonetic.BeiderMorseFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class BeiderMorseFilterFactory extends BaseTokenFilterFactory {
public class BeiderMorseFilterFactory extends TokenFilterFactory {
private PhoneticEngine engine;
private LanguageSet languageSet;

4
solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java
View File

@ -18,8 +18,10 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.br.BrazilianStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link BrazilianStemFilter}.
@ -33,7 +35,7 @@ import org.apache.lucene.analysis.br.BrazilianStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class BrazilianStemFilterFactory extends BaseTokenFilterFactory {
public class BrazilianStemFilterFactory extends TokenFilterFactory {
public BrazilianStemFilter create(TokenStream in) {
return new BrazilianStemFilter(in);
}

3
solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.bg.BulgarianStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link BulgarianStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.bg.BulgarianStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class BulgarianStemFilterFactory extends BaseTokenFilterFactory {
public class BulgarianStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new BulgarianStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/CJKBigramFilterFactory.java
View File

@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cjk.CJKBigramFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link CJKBigramFilter}.
@ -36,7 +37,7 @@ import org.apache.lucene.analysis.cjk.CJKBigramFilter;
* &lt;/analyzer&gt;
* &lt;/fieldType&gt;</pre>
*/
public class CJKBigramFilterFactory extends BaseTokenFilterFactory {
public class CJKBigramFilterFactory extends TokenFilterFactory {
int flags;
@Override

4
solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java
View File

@ -20,6 +20,8 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.cjk.CJKTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
/**
@ -33,7 +35,7 @@ import java.io.Reader;
* @deprecated
*/
@Deprecated
public class CJKTokenizerFactory extends BaseTokenizerFactory {
public class CJKTokenizerFactory extends TokenizerFactory {
public CJKTokenizer create(Reader in) {
return new CJKTokenizer(in);
}

3
solr/core/src/java/org/apache/solr/analysis/CJKWidthFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cjk.CJKWidthFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link CJKWidthFilter}.
@ -33,7 +34,7 @@ import org.apache.lucene.analysis.cjk.CJKWidthFilter;
* &lt;/fieldType&gt;</pre>
*/
public class CJKWidthFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class CJKWidthFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
@Override
public TokenStream create(TokenStream input) {

3
solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
View File

@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.CapitalizationFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.ArrayList;
import java.util.Collection;
@ -56,7 +57,7 @@ import java.util.StringTokenizer;
*
* @since solr 1.3
*/
public class CapitalizationFilterFactory extends BaseTokenFilterFactory {
public class CapitalizationFilterFactory extends TokenFilterFactory {
public static final String KEEP = "keep";
public static final String KEEP_IGNORE_CASE = "keepIgnoreCase";
public static final String OK_PREFIX = "okPrefix";

3
solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
View File

@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cn.ChineseFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
* @deprecated Use {@link StopFilterFactory} instead.
*/
@Deprecated
public class ChineseFilterFactory extends BaseTokenFilterFactory {
public class ChineseFilterFactory extends TokenFilterFactory {
private static final Logger log = LoggerFactory.getLogger(ChineseFilterFactory.class);

3
solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
View File

@ -23,6 +23,7 @@ import java.io.Reader;
import java.util.Map;
import org.apache.lucene.analysis.cn.ChineseTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -31,7 +32,7 @@ import org.slf4j.LoggerFactory;
* @deprecated Use {@link StandardTokenizerFactory} instead.
*/
@Deprecated
public class ChineseTokenizerFactory extends BaseTokenizerFactory {
public class ChineseTokenizerFactory extends TokenizerFactory {
private static final Logger log = LoggerFactory.getLogger(ChineseTokenizerFactory.class);

3
solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.standard.ClassicFilter;
/**
@ -33,7 +34,7 @@ import org.apache.lucene.analysis.standard.ClassicFilter;
*
*
*/
public class ClassicFilterFactory extends BaseTokenFilterFactory {
public class ClassicFilterFactory extends TokenFilterFactory {
public TokenFilter create(TokenStream input) {
return new ClassicFilter(input);
}

4
solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java
View File

@ -20,6 +20,8 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.ClassicTokenizer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
import java.util.Map;
@ -35,7 +37,7 @@ import java.util.Map;
*
*/
public class ClassicTokenizerFactory extends BaseTokenizerFactory {
public class ClassicTokenizerFactory extends TokenizerFactory {
private int maxTokenLength;

4
solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java
View File

@ -26,6 +26,8 @@ import java.util.Locale;
import org.apache.commons.io.IOUtils;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.collation.CollationKeyFilter;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
@ -70,7 +72,7 @@ import org.apache.lucene.analysis.util.ResourceLoaderAware;
* @deprecated use {@link org.apache.solr.schema.CollationField} instead.
*/
@Deprecated
public class CollationKeyFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent,ResourceLoaderAware {
public class CollationKeyFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent, ResourceLoaderAware {
private Collator collator;
public void inform(ResourceLoader loader) {

6
solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
View File

@ -21,9 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
import org.apache.lucene.analysis.core.StopAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.*;
/**
* Constructs a {@link CommonGramsFilter}.
@ -40,7 +38,7 @@ import org.apache.lucene.analysis.util.ResourceLoaderAware;
/*
* This is pretty close to a straight copy from StopFilterFactory
*/
public class CommonGramsFilterFactory extends BaseTokenFilterFactory implements
public class CommonGramsFilterFactory extends TokenFilterFactory implements
ResourceLoaderAware {
public void inform(ResourceLoader loader) {

6
solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
View File

@ -23,9 +23,7 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
import org.apache.lucene.analysis.commongrams.CommonGramsQueryFilter;
import org.apache.lucene.analysis.core.StopAnalyzer;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.*;
/**
* Construct {@link CommonGramsQueryFilter}.
@ -41,7 +39,7 @@ import org.apache.lucene.analysis.util.ResourceLoaderAware;
* &lt;/fieldType&gt;</pre>
*
*/
public class CommonGramsQueryFilterFactory extends BaseTokenFilterFactory
public class CommonGramsQueryFilterFactory extends TokenFilterFactory
implements ResourceLoaderAware {
@Override

3
solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cz.CzechStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link CzechStemFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.cz.CzechStemFilter;
* &lt;/analyzer&gt;
* &lt;/fieldType&gt;</pre>
*/
public class CzechStemFilterFactory extends BaseTokenFilterFactory {
public class CzechStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new CzechStemFilter(input);
}

4
solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java
View File

@ -22,8 +22,10 @@ import org.apache.lucene.analysis.payloads.PayloadEncoder;
import org.apache.lucene.analysis.payloads.FloatEncoder;
import org.apache.lucene.analysis.payloads.IntegerEncoder;
import org.apache.lucene.analysis.payloads.IdentityEncoder;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
@ -41,7 +43,7 @@ import java.util.Map;
*
*
*/
public class DelimitedPayloadTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public class DelimitedPayloadTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
public static final String ENCODER_ATTR = "encoder";
public static final String DELIMITER_ATTR = "delimiter";

6
solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
View File

@ -19,9 +19,7 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.compound.*;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.*;
import org.apache.lucene.analysis.TokenStream;
import java.util.Map;
@ -39,7 +37,7 @@ import java.io.IOException;
* &lt;/fieldType&gt;</pre>
*
*/
public class DictionaryCompoundWordTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public class DictionaryCompoundWordTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private CharArraySet dictionary;
private String dictFile;
private int minWordSize;

3
solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java
View File

@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link DoubleMetaphoneFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class DoubleMetaphoneFilterFactory extends BaseTokenFilterFactory
public class DoubleMetaphoneFilterFactory extends TokenFilterFactory
{
public static final String INJECT = "inject";
public static final String MAX_CODE_LENGTH = "maxCodeLength";

3
solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
View File

@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Creates new instances of {@link EdgeNGramTokenFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class EdgeNGramFilterFactory extends BaseTokenFilterFactory {
public class EdgeNGramFilterFactory extends TokenFilterFactory {
private int maxGramSize = 0;
private int minGramSize = 0;

3
solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java
View File

@ -18,6 +18,7 @@ package org.apache.solr.analysis;
*/
import org.apache.lucene.analysis.ngram.EdgeNGramTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
import java.util.Map;
@ -32,7 +33,7 @@ import java.util.Map;
* &lt;/fieldType&gt;</pre>
*
*/
public class EdgeNGramTokenizerFactory extends BaseTokenizerFactory {
public class EdgeNGramTokenizerFactory extends TokenizerFactory {
private int maxGramSize = 0;
private int minGramSize = 0;

6
solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java
View File

@ -19,10 +19,8 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.*;
import org.apache.lucene.analysis.fr.*;
import org.apache.lucene.analysis.util.CharArraySet;
import java.io.IOException;
import org.apache.lucene.analysis.TokenStream;
@ -40,7 +38,7 @@ import org.apache.lucene.analysis.TokenStream;
* &lt;/fieldType&gt;</pre>
*
*/
public class ElisionFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public class ElisionFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private CharArraySet articles;

3
solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.en.EnglishMinimalStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link EnglishMinimalStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.en.EnglishMinimalStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class EnglishMinimalStemFilterFactory extends BaseTokenFilterFactory {
public class EnglishMinimalStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new EnglishMinimalStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java
View File

@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.en.EnglishPossessiveFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link EnglishPossessiveFilter}.
@ -34,7 +35,7 @@ import org.apache.lucene.analysis.en.EnglishPossessiveFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class EnglishPossessiveFilterFactory extends BaseTokenFilterFactory {
public class EnglishPossessiveFilterFactory extends TokenFilterFactory {
@Override
public void init(Map<String,String> args) {

6
solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java
View File

@ -26,7 +26,6 @@ import java.nio.charset.CharsetDecoder;
import java.nio.charset.CodingErrorAction;
import java.text.ParseException;
import java.util.List;
import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@ -37,10 +36,9 @@ import org.apache.lucene.analysis.synonym.SynonymFilter;
import org.apache.lucene.analysis.synonym.SynonymMap;
import org.apache.lucene.analysis.synonym.SolrSynonymParser;
import org.apache.lucene.analysis.synonym.WordnetSynonymParser;
import org.apache.lucene.analysis.util.*;
import org.apache.lucene.util.Version;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.util.StrUtils;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -50,7 +48,7 @@ import org.slf4j.LoggerFactory;
*/
// NOTE: rename this to "SynonymFilterFactory" and nuke that delegator in Lucene 5.0!
@Deprecated
final class FSTSynonymFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
final class FSTSynonymFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
public static final Logger log = LoggerFactory.getLogger(FSTSynonymFilterFactory.class);

3
solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.fi.FinnishLightStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link FinnishLightStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.fi.FinnishLightStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class FinnishLightStemFilterFactory extends BaseTokenFilterFactory {
public class FinnishLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new FinnishLightStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.fr.FrenchLightStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link FrenchLightStemFilter}.
@ -33,7 +34,7 @@ import org.apache.lucene.analysis.fr.FrenchLightStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class FrenchLightStemFilterFactory extends BaseTokenFilterFactory {
public class FrenchLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new FrenchLightStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.fr.FrenchMinimalStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link FrenchMinimalStemFilter}.
@ -33,7 +34,7 @@ import org.apache.lucene.analysis.fr.FrenchMinimalStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class FrenchMinimalStemFilterFactory extends BaseTokenFilterFactory {
public class FrenchMinimalStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new FrenchMinimalStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/GalicianMinimalStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.gl.GalicianMinimalStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GalicianMinimalStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.gl.GalicianMinimalStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class GalicianMinimalStemFilterFactory extends BaseTokenFilterFactory {
public class GalicianMinimalStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new GalicianMinimalStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.gl.GalicianStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GalicianStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.gl.GalicianStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class GalicianStemFilterFactory extends BaseTokenFilterFactory {
public class GalicianStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new GalicianStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.de.GermanLightStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GermanLightStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.de.GermanLightStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class GermanLightStemFilterFactory extends BaseTokenFilterFactory {
public class GermanLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new GermanLightStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.de.GermanMinimalStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GermanMinimalStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.de.GermanMinimalStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class GermanMinimalStemFilterFactory extends BaseTokenFilterFactory {
public class GermanMinimalStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new GermanMinimalStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/GermanNormalizationFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.de.GermanNormalizationFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GermanNormalizationFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.de.GermanNormalizationFilter;
* &lt;/analyzer&gt;
* &lt;/fieldType&gt;</pre>
*/
public class GermanNormalizationFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class GermanNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
public TokenStream create(TokenStream input) {
return new GermanNormalizationFilter(input);

3
solr/core/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java
View File

@ -21,6 +21,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.de.GermanStemFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GermanStemFilter}.
@ -34,7 +35,7 @@ import org.apache.lucene.analysis.TokenStream;
* &lt;/fieldType&gt;</pre>
*
*/
public class GermanStemFilterFactory extends BaseTokenFilterFactory {
public class GermanStemFilterFactory extends TokenFilterFactory {
public GermanStemFilter create(TokenStream in) {
return new GermanStemFilter(in);
}

5
solr/core/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java
View File

@ -22,6 +22,8 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.el.GreekLowerCaseFilter;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GreekLowerCaseFilter}.
@ -34,8 +36,7 @@ import org.apache.lucene.analysis.el.GreekLowerCaseFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class GreekLowerCaseFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent
{
public class GreekLowerCaseFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
@Override
public void init(Map<String, String> args) {

3
solr/core/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.el.GreekStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GreekStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.el.GreekStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class GreekStemFilterFactory extends BaseTokenFilterFactory {
public class GreekStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new GreekStemFilter(input);

3
solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java
View File

@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter;
import org.apache.lucene.analysis.util.CharFilterFactory;
import java.util.HashSet;
import java.util.Map;
@ -38,7 +39,7 @@ import java.util.regex.Pattern;
* &lt;/fieldType&gt;</pre>
*
*/
public class HTMLStripCharFilterFactory extends BaseCharFilterFactory {
public class HTMLStripCharFilterFactory extends CharFilterFactory {
Set<String> escapedTags = null;
Pattern TAG_NAME_PATTERN = Pattern.compile("[^\\s,]+");

3
solr/core/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.hi.HindiNormalizationFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link HindiNormalizationFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.hi.HindiNormalizationFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class HindiNormalizationFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class HindiNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
public TokenStream create(TokenStream input) {
return new HindiNormalizationFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.hi.HindiStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link HindiStemFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.hi.HindiStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class HindiStemFilterFactory extends BaseTokenFilterFactory {
public class HindiStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new HindiStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.hu.HungarianLightStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link HungarianLightStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.hu.HungarianLightStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class HungarianLightStemFilterFactory extends BaseTokenFilterFactory {
public class HungarianLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new HungarianLightStemFilter(input);
}

4
solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java
View File

@ -24,8 +24,10 @@ import java.util.List;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.hunspell.HunspellDictionary;
import org.apache.lucene.analysis.hunspell.HunspellStemFilter;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* TokenFilterFactory that creates instances of {@link org.apache.lucene.analysis.hunspell.HunspellStemFilter}.
@ -43,7 +45,7 @@ import org.apache.lucene.analysis.util.ResourceLoaderAware;
*
* See <a href="http://wiki.apache.org/solr/Hunspell">http://wiki.apache.org/solr/Hunspell</a>
*/
public class HunspellStemFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public class HunspellStemFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private static final String PARAM_DICTIONARY = "dictionary";
private static final String PARAM_AFFIX = "affix";

4
solr/core/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java
View File

@ -19,7 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.HyphenatedWordsFilter;
import org.apache.solr.analysis.BaseTokenFilterFactory;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link HyphenatedWordsFilter}.
@ -32,7 +32,7 @@ import org.apache.solr.analysis.BaseTokenFilterFactory;
* &lt;/fieldType&gt;</pre>
*
*/
public class HyphenatedWordsFilterFactory extends BaseTokenFilterFactory {
public class HyphenatedWordsFilterFactory extends TokenFilterFactory {
public HyphenatedWordsFilter create(TokenStream input) {
return new HyphenatedWordsFilter(input);
}

7
solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
View File

@ -22,10 +22,7 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.compound.CompoundWordTokenFilterBase;
import org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter;
import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.solr.analysis.BaseTokenFilterFactory;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.*;
import java.util.Map;
import java.io.InputStream;
@ -58,7 +55,7 @@ import org.xml.sax.InputSource;
*
* @see HyphenationCompoundWordTokenFilter
*/
public class HyphenationCompoundWordTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public class HyphenationCompoundWordTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private CharArraySet dictionary;
private HyphenationTree hyphenator;
private String dictFile;

3
solr/core/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.in.IndicNormalizationFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link IndicNormalizationFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.in.IndicNormalizationFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class IndicNormalizationFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class IndicNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
public TokenStream create(TokenStream input) {
return new IndicNormalizationFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
View File

@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.id.IndonesianStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link IndonesianStemFilter}.
@ -34,7 +35,7 @@ import org.apache.lucene.analysis.id.IndonesianStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class IndonesianStemFilterFactory extends BaseTokenFilterFactory {
public class IndonesianStemFilterFactory extends TokenFilterFactory {
private boolean stemDerivational = true;
@Override

3
solr/core/src/java/org/apache/solr/analysis/IrishLowerCaseFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ga.IrishLowerCaseFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link IrishLowerCaseFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.ga.IrishLowerCaseFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class IrishLowerCaseFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class IrishLowerCaseFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
@Override
public TokenStream create(TokenStream input) {

3
solr/core/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.it.ItalianLightStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link ItalianLightStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.it.ItalianLightStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class ItalianLightStemFilterFactory extends BaseTokenFilterFactory {
public class ItalianLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new ItalianLightStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/JapaneseBaseFormFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapaneseBaseFormFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link org.apache.lucene.analysis.ja.JapaneseBaseFormFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.ja.JapaneseBaseFormFilter;
* &lt;/fieldType&gt;
* </pre>
*/
public class JapaneseBaseFormFilterFactory extends BaseTokenFilterFactory {
public class JapaneseBaseFormFilterFactory extends TokenFilterFactory {
@Override
public TokenStream create(TokenStream input) {

4
solr/core/src/java/org/apache/solr/analysis/JapaneseKatakanaStemFilterFactory.java
View File

@ -19,6 +19,8 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapaneseKatakanaStemFilter;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
@ -34,7 +36,7 @@ import java.util.Map;
* &lt;/fieldType&gt;
* </pre>
*/
public class JapaneseKatakanaStemFilterFactory extends BaseTokenFilterFactory {
public class JapaneseKatakanaStemFilterFactory extends TokenFilterFactory {
private static final String MINIMUM_LENGTH_PARAM = "minimumLength";
private int minimumLength;

6
solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java
View File

@ -23,9 +23,7 @@ import java.util.Set;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.*;
/**
* Factory for {@link org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter}.
@ -40,7 +38,7 @@ import org.apache.lucene.analysis.util.ResourceLoaderAware;
* &lt;/fieldType&gt;
* </pre>
*/
public class JapanesePartOfSpeechStopFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public class JapanesePartOfSpeechStopFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private boolean enablePositionIncrements;
private Set<String> stopTags;

3
solr/core/src/java/org/apache/solr/analysis/JapaneseReadingFormFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ja.JapaneseReadingFormFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
@ -34,7 +35,7 @@ import java.util.Map;
* &lt;/fieldType&gt;
* </pre>
*/
public class JapaneseReadingFormFilterFactory extends BaseTokenFilterFactory {
public class JapaneseReadingFormFilterFactory extends TokenFilterFactory {
private static final String ROMAJI_PARAM = "useRomaji";
private boolean useRomaji;

4
solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java
View File

@ -30,6 +30,8 @@ import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.ja.JapaneseTokenizer;
import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
import org.apache.lucene.analysis.ja.dict.UserDictionary;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
@ -49,7 +51,7 @@ import org.apache.lucene.analysis.util.ResourceLoaderAware;
* &lt;/fieldType&gt;
* </pre>
*/
public class JapaneseTokenizerFactory extends BaseTokenizerFactory implements ResourceLoaderAware {
public class JapaneseTokenizerFactory extends TokenizerFactory implements ResourceLoaderAware {
private static final String MODE = "mode";
private static final String USER_DICT_PATH = "userDictionary";

3
solr/core/src/java/org/apache/solr/analysis/KStemFilterFactory.java
View File

@ -20,11 +20,12 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.en.KStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link KStemFilter}
*/
public class KStemFilterFactory extends BaseTokenFilterFactory {
public class KStemFilterFactory extends TokenFilterFactory {
public TokenFilter create(TokenStream input) {
return new KStemFilter(input);

6
solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
View File

@ -17,11 +17,9 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.*;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.KeepWordFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import java.util.Map;
import java.util.Set;
@ -38,7 +36,7 @@ import java.io.IOException;
* &lt;/fieldType&gt;</pre>
*
*/
public class KeepWordFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public class KeepWordFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
@Override
public void init(Map<String,String> args) {

6
solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java
View File

@ -3,10 +3,8 @@ package org.apache.solr.analysis;
import java.io.IOException;
import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.analysis.util.*;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -36,7 +34,7 @@ import org.apache.lucene.analysis.util.ResourceLoaderAware;
* &lt;/fieldType&gt;</pre>
*
*/
public class KeywordMarkerFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public class KeywordMarkerFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
public static final String PROTECTED_TOKENS = "protected";
private CharArraySet protectedWords;
private boolean ignoreCase;

3
solr/core/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
View File

@ -18,6 +18,7 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.core.KeywordTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
@ -31,7 +32,7 @@ import java.io.Reader;
* &lt;/fieldType&gt;</pre>
*
*/
public class KeywordTokenizerFactory extends BaseTokenizerFactory {
public class KeywordTokenizerFactory extends TokenizerFactory {
public KeywordTokenizer create(Reader input) {
return new KeywordTokenizer(input);
}

3
solr/core/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.lv.LatvianStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link LatvianStemFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.lv.LatvianStemFilter;
* &lt;/analyzer&gt;
* &lt;/fieldType&gt;</pre>
*/
public class LatvianStemFilterFactory extends BaseTokenFilterFactory {
public class LatvianStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new LatvianStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
*/
import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.analysis.util.CharFilterFactory;
/**
* Factory for {@link LegacyHTMLStripCharFilter}.
@ -49,7 +50,7 @@ import org.apache.lucene.analysis.CharStream;
* @deprecated use {@link HTMLStripCharFilterFactory}
*/
@Deprecated
public class LegacyHTMLStripCharFilterFactory extends BaseCharFilterFactory {
public class LegacyHTMLStripCharFilterFactory extends CharFilterFactory {
public LegacyHTMLStripCharFilter create(CharStream input) {
return new LegacyHTMLStripCharFilter(input);

3
solr/core/src/java/org/apache/solr/analysis/LengthFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.LengthFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
@ -33,7 +34,7 @@ import java.util.Map;
* &lt;/fieldType&gt;</pre>
*
*/
public class LengthFilterFactory extends BaseTokenFilterFactory {
public class LengthFilterFactory extends TokenFilterFactory {
int min,max;
boolean enablePositionIncrements;
public static final String MIN_KEY = "min";

3
solr/core/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java
View File

@ -18,6 +18,7 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.core.LetterTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
import java.util.Map;
@ -32,7 +33,7 @@ import java.util.Map;
* &lt;/fieldType&gt;</pre>
*
*/
public class LetterTokenizerFactory extends BaseTokenizerFactory {
public class LetterTokenizerFactory extends TokenizerFactory {
@Override
public void init(Map<String,String> args) {

3
solr/core/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java
View File

@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link LimitTokenCountFilter}.
@ -33,7 +34,7 @@ import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class LimitTokenCountFilterFactory extends BaseTokenFilterFactory {
public class LimitTokenCountFilterFactory extends TokenFilterFactory {
int maxTokenCount;

3
solr/core/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java
View File

@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link LowerCaseFilter}.
@ -33,7 +34,7 @@ import org.apache.lucene.analysis.core.LowerCaseFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class LowerCaseFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class LowerCaseFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
@Override
public void init(Map<String,String> args) {
super.init(args);

3
solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.core.LowerCaseFilter;
import org.apache.lucene.analysis.core.LowerCaseTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
import java.util.Map;
@ -33,7 +34,7 @@ import java.util.Map;
* &lt;/fieldType&gt;</pre>
*
*/
public class LowerCaseTokenizerFactory extends BaseTokenizerFactory implements MultiTermAwareComponent {
public class LowerCaseTokenizerFactory extends TokenizerFactory implements MultiTermAwareComponent {
@Override
public void init(Map<String,String> args) {
super.init(args);

4
solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
View File

@ -27,6 +27,8 @@ import java.util.regex.Pattern;
import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.analysis.charfilter.MappingCharFilter;
import org.apache.lucene.analysis.charfilter.NormalizeCharMap;
import org.apache.lucene.analysis.util.CharFilterFactory;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.util.StrUtils;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
@ -45,7 +47,7 @@ import org.apache.lucene.analysis.util.ResourceLoaderAware;
* @since Solr 1.4
*
*/
public class MappingCharFilterFactory extends BaseCharFilterFactory implements
public class MappingCharFilterFactory extends CharFilterFactory implements
ResourceLoaderAware, MultiTermAwareComponent {
protected NormalizeCharMap normMap;

3
solr/core/src/java/org/apache/solr/analysis/NGramFilterFactory.java
View File

@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ngram.NGramTokenFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link NGramTokenFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.ngram.NGramTokenFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class NGramFilterFactory extends BaseTokenFilterFactory {
public class NGramFilterFactory extends TokenFilterFactory {
private int maxGramSize = 0;
private int minGramSize = 0;

3
solr/core/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ngram.NGramTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
import java.util.Map;
@ -33,7 +34,7 @@ import java.util.Map;
* &lt;/fieldType&gt;</pre>
*
*/
public class NGramTokenizerFactory extends BaseTokenizerFactory {
public class NGramTokenizerFactory extends TokenizerFactory {
private int maxGramSize = 0;
private int minGramSize = 0;

3
solr/core/src/java/org/apache/solr/analysis/NorwegianLightStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.no.NorwegianLightStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link NorwegianLightStemFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.no.NorwegianLightStemFilter;
* &lt;/analyzer&gt;
* &lt;/fieldType&gt;</pre>
*/
public class NorwegianLightStemFilterFactory extends BaseTokenFilterFactory {
public class NorwegianLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new NorwegianLightStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/NorwegianMinimalStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.no.NorwegianMinimalStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link NorwegianMinimalStemFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.no.NorwegianMinimalStemFilter;
* &lt;/analyzer&gt;
* &lt;/fieldType&gt;</pre>
*/
public class NorwegianMinimalStemFilterFactory extends BaseTokenFilterFactory {
public class NorwegianMinimalStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new NorwegianMinimalStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
View File

@ -21,6 +21,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.payloads.NumericPayloadTokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
/**
@ -34,7 +35,7 @@ import java.util.Map;
* &lt;/fieldType&gt;</pre>
*
*/
public class NumericPayloadTokenFilterFactory extends BaseTokenFilterFactory {
public class NumericPayloadTokenFilterFactory extends TokenFilterFactory {
private float payload;
private String typeMatch;
@Override

4
solr/core/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java
View File

@ -22,6 +22,8 @@ import java.util.Map;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.path.PathHierarchyTokenizer;
import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenizerFactory;
/**
@ -34,7 +36,7 @@ import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer;
* &lt;/fieldType&gt;</pre>
*
*/
public class PathHierarchyTokenizerFactory extends BaseTokenizerFactory {
public class PathHierarchyTokenizerFactory extends TokenizerFactory {
private char delimiter;
private char replacement;

4
solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
View File

@ -23,6 +23,8 @@ import java.util.regex.PatternSyntaxException;
import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter;
import org.apache.lucene.analysis.util.CharFilterFactory;
import org.apache.lucene.analysis.util.InitializationException;
/**
* Factory for {@link PatternReplaceCharFilter}.
@ -38,7 +40,7 @@ import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter;
*
* @since Solr 3.1
*/
public class PatternReplaceCharFilterFactory extends BaseCharFilterFactory {
public class PatternReplaceCharFilterFactory extends CharFilterFactory {
private Pattern p;
private String replacement;

4
solr/core/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
View File

@ -18,6 +18,8 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.pattern.PatternReplaceFilter;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
import java.util.regex.Pattern;
@ -36,7 +38,7 @@ import java.util.regex.PatternSyntaxException;
*
* @see PatternReplaceFilter
*/
public class PatternReplaceFilterFactory extends BaseTokenFilterFactory {
public class PatternReplaceFilterFactory extends TokenFilterFactory {
Pattern p;
String replacement;
boolean all = true;

4
solr/core/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
View File

@ -24,6 +24,8 @@ import java.util.regex.Pattern;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.pattern.PatternTokenizer;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenizerFactory;
/**
@ -63,7 +65,7 @@ import org.apache.lucene.analysis.pattern.PatternTokenizer;
* @since solr1.2
*
*/
public class PatternTokenizerFactory extends BaseTokenizerFactory
public class PatternTokenizerFactory extends TokenizerFactory
{
public static final String PATTERN = "pattern";
public static final String GROUP = "group";

3
solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.CharStream;
import org.apache.lucene.analysis.fa.PersianCharFilter;
import org.apache.lucene.analysis.util.CharFilterFactory;
/**
* Factory for {@link PersianCharFilter}.
@ -31,7 +32,7 @@ import org.apache.lucene.analysis.fa.PersianCharFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class PersianCharFilterFactory extends BaseCharFilterFactory implements MultiTermAwareComponent {
public class PersianCharFilterFactory extends CharFilterFactory implements MultiTermAwareComponent {
@Override
public CharStream create(CharStream input) {

3
solr/core/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java
View File

@ -21,6 +21,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.fa.PersianNormalizationFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link PersianNormalizationFilter}.
@ -34,7 +35,7 @@ import org.apache.lucene.analysis.TokenStream;
* &lt;/fieldType&gt;</pre>
*
*/
public class PersianNormalizationFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
public class PersianNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
public PersianNormalizationFilter create(TokenStream input) {
return new PersianNormalizationFilter(input);
}

4
solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
View File

@ -27,6 +27,8 @@ import org.apache.commons.codec.Encoder;
import org.apache.commons.codec.language.*;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.phonetic.PhoneticFilter;
import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link PhoneticFilter}.
@ -55,7 +57,7 @@ import org.apache.lucene.analysis.phonetic.PhoneticFilter;
*
* @see PhoneticFilter
*/
public class PhoneticFilterFactory extends BaseTokenFilterFactory
public class PhoneticFilterFactory extends TokenFilterFactory
{
public static final String ENCODER = "encoder";
public static final String INJECT = "inject"; // boolean

3
solr/core/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.en.PorterStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link PorterStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.en.PorterStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class PorterStemFilterFactory extends BaseTokenFilterFactory {
public class PorterStemFilterFactory extends TokenFilterFactory {
public PorterStemFilter create(TokenStream input) {
return new PorterStemFilter(input);
}

3
solr/core/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.pt.PortugueseLightStemFilter;
import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link PortugueseLightStemFilter}.
@ -32,7 +33,7 @@ import org.apache.lucene.analysis.pt.PortugueseLightStemFilter;
* &lt;/fieldType&gt;</pre>
*
*/
public class PortugueseLightStemFilterFactory extends BaseTokenFilterFactory {
public class PortugueseLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new PortugueseLightStemFilter(input);
}

Some files were not shown because too many files have changed in this diff Show More