LUCENE-9317: Clean up split package in analyzers-common (#1836)

This commit is contained in:
Tomoko Uchida 2020-09-28 16:49:28 +09:00 committed by GitHub
parent e28e8c0e0c
commit 5e617ccc33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
385 changed files with 1010 additions and 735 deletions

View File

@ -101,8 +101,7 @@ configure(project(":lucene:analysis:common")) {
project.tasks.withType(RenderJavadocTask) {
// TODO: fix missing javadocs
javadocMissingLevel = "class"
// TODO: clean up split packages
javadocMissingIgnore = [ "org.apache.lucene.analysis.standard" ]
javadocMissingIgnore = [ "org.apache.lucene.analysis.classic", "org.apache.lucene.analysis.email" ]
}
}
@ -236,7 +235,6 @@ configure(project(":lucene:core")) {
// some packages are fixed already
javadocMissingMethod = [
"org.apache.lucene.util.automaton",
"org.apache.lucene.analysis",
"org.apache.lucene.analysis.standard",
"org.apache.lucene.analysis.tokenattributes",
"org.apache.lucene.document",

View File

@ -119,7 +119,7 @@ configure(project(":lucene:analysis:common")) {
description "Regenerate UAX29URLEmailTokenizerImpl.java"
group "generation"
jflexFile = file('src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex')
jflexFile = file('src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.jflex')
skeleton = project(":lucene:core").file("src/data/jflex/skeleton.disable.buffer.expansion.txt")
heapSize = "12g"
@ -129,7 +129,7 @@ configure(project(":lucene:analysis:common")) {
doLast {
ant.replace(
file: file('src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java'),
file: file('src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java'),
encoding: "UTF-8",
token: "private static final int ZZ_BUFFERSIZE =",
value: "private int ZZ_BUFFERSIZE ="

View File

@ -283,7 +283,7 @@ class ValidateSourcePatternsTask extends DefaultTask {
}
}
// make sure that SPI names of all tokenizers/charfilters/tokenfilters are documented
if (!f.name.contains("Test") && !f.name.contains("Mock") && !text.contains("abstract class") &&
if (!f.name.contains("Test") && !f.name.contains("Mock") && !f.name.contains("Fake") && !text.contains("abstract class") &&
!f.name.equals("TokenizerFactory.java") && !f.name.equals("CharFilterFactory.java") && !f.name.equals("TokenFilterFactory.java") &&
(f.name.contains("TokenizerFactory") && text.contains("extends TokenizerFactory") ||
f.name.contains("CharFilterFactory") && text.contains("extends CharFilterFactory") ||

View File

@ -12,6 +12,9 @@ System Requirements
API Changes
* LUCENE-9317: Clean up package name conflicts between core and analyzers-common.
See MIGRATE.md for details. (David Ryan, Tomoko Uchida, Uwe Schindler, Dawid Weiss)
* LUCENE-8474: RAMDirectory and associated deprecated classes have been
removed. (Dawid Weiss)

View File

@ -1,5 +1,23 @@
# Apache Lucene Migration Guide
## Base and concrete analysis factories are moved / package renamed (LUCENE-9317)
1. Base analysis factories are moved to `lucene-core`, also their package names are renamed.
- o.a.l.a.util.TokenizerFactory (lucene-analyzers-common) is moved to o.a.l.a.TokenizerFactory (lucene-core)
- o.a.l.a.util.CharFilterFactory (lucene-analyzers-common) is moved to o.a.l.a.CharFilterFactory (lucene-core)
- o.a.l.a.util.TokenFilterFactory (lucene-analyzers-common) is moved to o.a.l.a.TokenFilterFactory (lucene-core)
The service provider files placed in `META-INF/services` for custom analysis factories should be renamed as follows:
- META-INF/services/org.apache.lucene.analysis.TokenizerFactory
- META-INF/services/org.apache.lucene.analysis.CharFilterFactory
- META-INF/services/org.apache.lucene.analysis.TokenFilterFactory
2. o.a.l.a.standard.StandardTokenizerFactory is moved to `lucene-core` module.
3. o.a.l.a.standard package in `lucene-analyzers-common` module is split into o.a.l.a.classic and o.a.l.a.email.
## RegExpQuery now rejects invalid backslashes (LUCENE-9370)
We now follow the [Java rules](https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html#bs) for accepting backslashes.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ar;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link ArabicNormalizationFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ar;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link ArabicStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.bg;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link BulgarianStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.bn;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link BengaliNormalizationFilter}.

View File

@ -18,7 +18,7 @@ package org.apache.lucene.analysis.bn;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
import java.util.Map;

View File

@ -17,7 +17,7 @@
package org.apache.lucene.analysis.boost;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
import java.util.Map;

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.br;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link BrazilianStemFilter}.

View File

@ -17,7 +17,7 @@
package org.apache.lucene.analysis.charfilter;
import org.apache.lucene.analysis.util.CharFilterFactory;
import org.apache.lucene.analysis.CharFilterFactory;
import java.io.Reader;
import java.util.Map;

View File

@ -25,9 +25,9 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.lucene.analysis.util.CharFilterFactory;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.CharFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
/**
* Factory for {@link MappingCharFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.cjk;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link CJKBigramFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.cjk;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link CJKWidthFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ckb;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link SoraniNormalizationFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ckb;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link SoraniStemFilter}.

View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.classic;
import java.io.IOException;
@ -27,6 +27,7 @@ import org.apache.lucene.analysis.StopwordAnalyzerBase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.WordlistLoader;
import org.apache.lucene.analysis.en.EnglishAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
/**
* Filters {@link ClassicTokenizer} with {@link ClassicFilter}, {@link

View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.classic;
import org.apache.lucene.analysis.TokenFilter;

View File

@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.classic;
import java.util.Map;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link ClassicFilter}.

View File

@ -15,11 +15,13 @@
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.classic;
import java.io.IOException;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;

View File

@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.classic;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.analysis.TokenizerFactory;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.AttributeFactory;
import java.util.Map;

View File

@ -17,7 +17,7 @@
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.classic;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;

View File

@ -0,0 +1,37 @@
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<!--
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.
-->
<!-- not a package-info.java, because we already defined this package in spatial/ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body>
Fast, general-purpose grammar-based tokenizers.
<ul>
<li>{@link org.apache.lucene.analysis.classic.ClassicTokenizer ClassicTokenizer}:
this class was formerly (prior to Lucene 3.1) named
<code>StandardTokenizer</code>. (Its tokenization rules are not
based on the Unicode Text Segmentation algorithm.)
{@link org.apache.lucene.analysis.classic.ClassicAnalyzer ClassicAnalyzer} includes
{@link org.apache.lucene.analysis.classic.ClassicTokenizer ClassicTokenizer},
{@link org.apache.lucene.analysis.LowerCaseFilter LowerCaseFilter}
and {@link org.apache.lucene.analysis.StopFilter StopFilter}.
</li>
</ul>
</body>
</html>

View File

@ -24,9 +24,9 @@ import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.en.EnglishAnalyzer;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Constructs a {@link CommonGramsFilter}.

View File

@ -22,9 +22,9 @@ import java.util.Map;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link DictionaryCompoundWordTokenFilter}.

View File

@ -25,9 +25,9 @@ import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
import org.apache.lucene.util.IOUtils;
import org.xml.sax.InputSource;

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.core;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link DecimalDigitFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.core;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link FlattenGraphFilter}.

View File

@ -16,7 +16,7 @@
*/
package org.apache.lucene.analysis.core;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.analysis.TokenizerFactory;
import org.apache.lucene.util.AttributeFactory;
import java.util.Map;

View File

@ -18,7 +18,7 @@ package org.apache.lucene.analysis.core;
import org.apache.lucene.analysis.util.CharTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.analysis.TokenizerFactory;
import org.apache.lucene.util.AttributeFactory;
import java.util.Map;

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.core;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link LowerCaseFilter}.

View File

@ -24,9 +24,9 @@ import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.WordlistLoader;
import org.apache.lucene.analysis.en.EnglishAnalyzer;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link StopFilter}.

View File

@ -18,9 +18,9 @@ package org.apache.lucene.analysis.core;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
import java.io.IOException;
import java.util.HashSet;

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.core;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link UpperCaseFilter}.

View File

@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.util.CharTokenizer;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.analysis.TokenizerFactory;
import org.apache.lucene.util.AttributeFactory;
import static org.apache.lucene.analysis.standard.StandardTokenizer.MAX_TOKEN_LENGTH_LIMIT;

View File

@ -36,18 +36,18 @@ import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.miscellaneous.ConditionalTokenFilter;
import org.apache.lucene.analysis.miscellaneous.ConditionalTokenFilterFactory;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
import org.apache.lucene.analysis.util.CharFilterFactory;
import org.apache.lucene.analysis.util.ClasspathResourceLoader;
import org.apache.lucene.analysis.AbstractAnalysisFactory;
import org.apache.lucene.analysis.CharFilterFactory;
import org.apache.lucene.util.ClasspathResourceLoader;
import org.apache.lucene.analysis.util.FilesystemResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
import org.apache.lucene.analysis.TokenizerFactory;
import org.apache.lucene.util.SetOnce;
import org.apache.lucene.util.Version;
import static org.apache.lucene.analysis.util.AnalysisSPILoader.newFactoryClassInstance;
import static org.apache.lucene.analysis.AnalysisSPILoader.newFactoryClassInstance;
/**
* A general-purpose Analyzer that can be created with a builder-style API.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.cz;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link CzechStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.de;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link GermanLightStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.de;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link GermanMinimalStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.de;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link GermanNormalizationFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.de;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link GermanStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.el;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link GreekLowerCaseFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.el;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link GreekStemFilter}.

View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.email;
import java.io.IOException;
@ -26,9 +26,10 @@ import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.StopwordAnalyzerBase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.en.EnglishAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
/**
* Filters {@link org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer}
* Filters {@link UAX29URLEmailTokenizer}
* with {@link org.apache.lucene.analysis.LowerCaseFilter} and
* {@link org.apache.lucene.analysis.StopFilter}, using a list of
* English stop words.

View File

@ -15,12 +15,14 @@
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.email;
import java.io.IOException;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;

View File

@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.email;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.analysis.TokenizerFactory;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.AttributeFactory;
import java.util.Map;

View File

@ -17,7 +17,7 @@
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.email;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;

View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.lucene.analysis.standard;
package org.apache.lucene.analysis.email;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;

View File

@ -21,32 +21,19 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>
<body>
Fast, general-purpose grammar-based tokenizers.
Fast, general-purpose URLs and email addresses tokenizers.
<ul>
<li>{@link org.apache.lucene.analysis.standard.ClassicTokenizer ClassicTokenizer}:
this class was formerly (prior to Lucene 3.1) named
<code>StandardTokenizer</code>. (Its tokenization rules are not
based on the Unicode Text Segmentation algorithm.)
{@link org.apache.lucene.analysis.standard.ClassicAnalyzer ClassicAnalyzer} includes
{@link org.apache.lucene.analysis.standard.ClassicTokenizer ClassicTokenizer},
{@link org.apache.lucene.analysis.LowerCaseFilter LowerCaseFilter}
and {@link org.apache.lucene.analysis.StopFilter StopFilter}.
</li>
<li>{@link org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer UAX29URLEmailTokenizer}:
<li>{@link org.apache.lucene.analysis.email.UAX29URLEmailTokenizer UAX29URLEmailTokenizer}:
implements the Word Break rules from the Unicode Text Segmentation
algorithm, as specified in
<a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a>, except
URLs and email addresses are also tokenized according to the relevant RFCs.
<br>
{@link org.apache.lucene.analysis.standard.UAX29URLEmailAnalyzer UAX29URLEmailAnalyzer} includes
{@link org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer UAX29URLEmailTokenizer},
{@link org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer UAX29URLEmailAnalyzer} includes
{@link org.apache.lucene.analysis.email.UAX29URLEmailTokenizer UAX29URLEmailTokenizer},
{@link org.apache.lucene.analysis.LowerCaseFilter LowerCaseFilter}
and {@link org.apache.lucene.analysis.StopFilter StopFilter}.
</li>
</ul>
<p>
This Java package additionally contains {@code StandardAnalyzer} and {@code StandardTokenizer},
which are not visible here, because they moved to Lucene Core.
The factories for those components (e.g., used in Solr) are still part of this module.
</body>
</html>

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.en;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link EnglishMinimalStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.en;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link EnglishPossessiveFilter}.

View File

@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link KStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.en;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link PorterStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.es;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link SpanishLightStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.es;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link SpanishMinimalStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.fa;
import java.io.Reader;
import java.util.Map;
import org.apache.lucene.analysis.util.CharFilterFactory;
import org.apache.lucene.analysis.CharFilterFactory;
/**
* Factory for {@link PersianCharFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.fa;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link PersianNormalizationFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.fi;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link FinnishLightStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.fr;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link FrenchLightStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.fr;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link FrenchMinimalStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ga;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link IrishLowerCaseFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.gl;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link GalicianMinimalStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.gl;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link GalicianStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.hi;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link HindiNormalizationFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.hi;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link HindiStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.hu;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link HungarianLightStemFilter}.

View File

@ -27,9 +27,9 @@ import java.util.List;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.IOUtils;

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.id;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link IndonesianStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.in;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link IndicNormalizationFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.it;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link ItalianLightStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.lv;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link LatvianStemFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.minhash;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* {@link TokenFilterFactory} for {@link MinHashFilter}.
@ -59,7 +59,7 @@ public class MinHashFilterFactory extends TokenFilterFactory {
/*
* (non-Javadoc)
*
* @see org.apache.lucene.analysis.util.TokenFilterFactory#create(org.apache.lucene.analysis.TokenStream)
* @see org.apache.lucene.analysis.TokenFilterFactory#create(org.apache.lucene.analysis.TokenStream)
*/
@Override
public TokenStream create(TokenStream input) {

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link ASCIIFoldingFilter}.

View File

@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link CapitalizationFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link CodepointCountFilter}.

View File

@ -19,7 +19,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
import org.apache.lucene.util.Version;
import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;

View File

@ -24,9 +24,9 @@ import java.util.function.Function;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Abstract parent class for analysis factories that create {@link ConditionalTokenFilter} instances

View File

@ -23,7 +23,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link DateRecognizerFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link DelimitedTermFrequencyTokenFilter}. The field must have {@code omitPositions=true}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link FingerprintFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link FixBrokenOffsetsFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link HyphenatedWordsFilter}.

View File

@ -22,9 +22,9 @@ import java.util.Map;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link KeepWordFilter}.

View File

@ -23,9 +23,9 @@ import java.util.regex.Pattern;
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link KeywordMarkerFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link KeywordRepeatFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link LengthFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link LimitTokenCountFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link LimitTokenOffsetFilter}.

View File

@ -19,7 +19,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link LimitTokenPositionFilter}.

View File

@ -30,9 +30,9 @@ import java.util.function.Predicate; // javadocs
import org.apache.lucene.analysis.CharArraySet;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for a {@link ProtectedTermFilter}

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link RemoveDuplicatesTokenFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link ScandinavianFoldingFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link org.apache.lucene.analysis.miscellaneous.ScandinavianNormalizationFilter}.

View File

@ -23,9 +23,9 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter.StemmerOverrideMap;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.util.ResourceLoader;
import org.apache.lucene.util.ResourceLoaderAware;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link StemmerOverrideFilter}.

View File

@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
/**
* Factory for {@link TrimFilter}.

View File

@ -18,7 +18,7 @@ package org.apache.lucene.analysis.miscellaneous;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.TokenFilterFactory;
import java.util.Map;

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