diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 89f5c0798cd..246df338144 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -47,6 +47,9 @@ API Changes * LUCENE-8144: Moved QueryCachingPolicy.ALWAYS_CACHE to the test framework. (Nhat Nguyen via Adrien Grand) +* LUCENE-8356: StandardFilter and StandardFilterFactory have been removed + (Alan Woodward) + Changes in Runtime Behavior * LUCENE-8333: Switch MoreLikeThis.setMaxDocFreqPct to use maxDoc instead of diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java deleted file mode 100644 index 7a8a70fe145..00000000000 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java +++ /dev/null @@ -1,52 +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.lucene.analysis.standard; - - -import java.util.Map; - -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; - -/** - * Factory for {@link StandardFilter}. - *
- * <fieldType name="text_stndrd" class="solr.TextField" positionIncrementGap="100">
- *   <analyzer>
- *     <tokenizer class="solr.StandardTokenizerFactory"/>
- *     <filter class="solr.StandardFilterFactory"/>
- *   </analyzer>
- * </fieldType>
- * - * @deprecated StandardFilter is a no-op and can be removed from filter chains - */ -@Deprecated -public class StandardFilterFactory extends TokenFilterFactory { - - /** Creates a new StandardFilterFactory */ - public StandardFilterFactory(Map args) { - super(args); - if (!args.isEmpty()) { - throw new IllegalArgumentException("Unknown parameters: " + args); - } - } - - @Override - public StandardFilter create(TokenStream input) { - return new StandardFilter(input); - } -} diff --git a/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory index df868a0a1e6..12c8b80d7be 100644 --- a/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory +++ b/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory @@ -107,7 +107,6 @@ org.apache.lucene.analysis.shingle.FixedShingleFilterFactory org.apache.lucene.analysis.snowball.SnowballPorterFilterFactory org.apache.lucene.analysis.sr.SerbianNormalizationFilterFactory org.apache.lucene.analysis.standard.ClassicFilterFactory -org.apache.lucene.analysis.standard.StandardFilterFactory org.apache.lucene.analysis.sv.SwedishLightStemFilterFactory org.apache.lucene.analysis.synonym.SynonymFilterFactory org.apache.lucene.analysis.synonym.SynonymGraphFilterFactory diff --git a/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardFilter.java b/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardFilter.java deleted file mode 100644 index 01645945399..00000000000 --- a/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardFilter.java +++ /dev/null @@ -1,42 +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.lucene.analysis.standard; - - -import java.io.IOException; - -import org.apache.lucene.analysis.TokenFilter; -import org.apache.lucene.analysis.TokenStream; - -/** - * Normalizes tokens extracted with {@link StandardTokenizer}. - * - * @deprecated StandardFilter is a no-op and can be removed from code - */ -@Deprecated -public class StandardFilter extends TokenFilter { - - /** Sole constructor */ - public StandardFilter(TokenStream in) { - super(in); - } - - @Override - public final boolean incrementToken() throws IOException { - return input.incrementToken(); // TODO: add some niceties for the new grammar - } -}