diff --git a/gradle/documentation/render-javadoc.gradle b/gradle/documentation/render-javadoc.gradle index 3b0b8d47ff7..d3c93106a2b 100644 --- a/gradle/documentation/render-javadoc.gradle +++ b/gradle/documentation/render-javadoc.gradle @@ -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", diff --git a/gradle/generation/jflex.gradle b/gradle/generation/jflex.gradle index e7c65dff8c3..57c80697ae3 100644 --- a/gradle/generation/jflex.gradle +++ b/gradle/generation/jflex.gradle @@ -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 =" diff --git a/gradle/validation/validate-source-patterns.gradle b/gradle/validation/validate-source-patterns.gradle index 7363308e364..5d9c72c53aa 100644 --- a/gradle/validation/validate-source-patterns.gradle +++ b/gradle/validation/validate-source-patterns.gradle @@ -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") || diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 6a0b741e808..4fffed00b24 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -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) diff --git a/lucene/MIGRATE.md b/lucene/MIGRATE.md index ec078720163..d215c5d92fb 100644 --- a/lucene/MIGRATE.md +++ b/lucene/MIGRATE.md @@ -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. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java index 142cadd6cbf..5f604f58a00 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java index 15a74413019..96c225afee1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java index 95fd4a82787..29fee9fe8a4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bn/BengaliNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bn/BengaliNormalizationFilterFactory.java index 930959ddc7a..8956e6d3aa6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bn/BengaliNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bn/BengaliNormalizationFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bn/BengaliStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bn/BengaliStemFilterFactory.java index 16bbba3f562..ca84aca5ca9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bn/BengaliStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bn/BengaliStemFilterFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/boost/DelimitedBoostTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/boost/DelimitedBoostTokenFilterFactory.java index 79674f36713..7965ecee20f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/boost/DelimitedBoostTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/boost/DelimitedBoostTokenFilterFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java index 9c74f6c9e4d..b88446f09f9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java index 243d99d66e4..171222706e8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java index fcef2882544..82967192879 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java index 30bef3dfbb0..1eceaf93331 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java index 56df25670e2..3e522e376cf 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilterFactory.java index bbe38439193..26a9a68b4a8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilterFactory.java index bdc2f025030..ca12bc9df2c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicAnalyzer.java similarity index 97% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicAnalyzer.java index 0c18cdd7bae..f646e1ee502 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicAnalyzer.java @@ -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 diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicFilter.java similarity index 98% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilter.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicFilter.java index bc75f42bc97..9de1235626f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicFilter.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicFilterFactory.java similarity index 94% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicFilterFactory.java index e36fba51658..75d4865b6b9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizer.java similarity index 97% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizer.java index 339ab8bb116..261d84378a6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizer.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizerFactory.java similarity index 92% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizerFactory.java index 4dd8adf5a9a..42ded7c89fb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizerFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizerImpl.java similarity index 99% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizerImpl.java index d96e920e025..163027b81ba 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizerImpl.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizerImpl.jflex similarity index 100% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/ClassicTokenizerImpl.jflex diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/package.html b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/package.html new file mode 100644 index 00000000000..d978878201f --- /dev/null +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/classic/package.html @@ -0,0 +1,37 @@ + + + + + + + + + Fast, general-purpose grammar-based tokenizers. + + + diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java index 562982045ef..a181f4ab80b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java index fa50f3cd077..347a5bacba0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java index fefc50bec13..2d70346d399 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilterFactory.java index b8c2cd71a4e..8301d0d37ce 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/FlattenGraphFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/FlattenGraphFilterFactory.java index f1ef0ee91da..b9b924e3abe 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/FlattenGraphFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/FlattenGraphFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java index 63cd93637b2..a3232126a33 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java index ddf77b90e8e..a2ce5e2fa6e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java index 0d3e6a567a8..d85eb57d79e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java index 02ab28228dc..155b26e1ac9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java index bdb7d20021b..5adc24fa672 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilterFactory.java index 4e884f8f65e..c3bfa6a9865 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java index d33aff347be..cd4823a7372 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/CustomAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/CustomAnalyzer.java index 8e5e966da03..0dc7f7b2751 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/CustomAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/CustomAnalyzer.java @@ -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. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java index 90ab00030f0..98c5049dbf9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java index 52855a27cf7..41ea1e5e143 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java index 9a081b0e4a0..1b01c15ed95 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java index cf00e689bfc..a507c1747e1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java index 980150b17bc..53bfde02dd4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java index 37bef0b64eb..d408b4ed948 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java index 915d61274c9..b966ab44163 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex-macro similarity index 100% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex-macro diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailAnalyzer.java similarity index 96% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailAnalyzer.java index 59b0de01be1..5ede5c013d3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailAnalyzer.java @@ -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. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizer.java similarity index 97% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizer.java index 65848f2c4e4..16677873dbf 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizer.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerFactory.java similarity index 93% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerFactory.java index e3a2b10495d..713911cebec 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java similarity index 99% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java index 08db0147a3a..fa5b7887c85 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.jflex similarity index 99% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.jflex index e4b10afe8ef..6f2028f0827 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.jflex @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package.html b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/package.html similarity index 55% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package.html rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/email/package.html index 05b50757c01..59970c80562 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package.html +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/package.html @@ -21,32 +21,19 @@ - Fast, general-purpose grammar-based tokenizers. + Fast, general-purpose URLs and email addresses tokenizers. -

- 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. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java index b81cdfb8ec1..3c2db08ea5b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java index 8bfd4ecce34..63b2eea746b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java index 1d696bfae5d..98d82e1d353 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java index fa8fe37ac93..fe6e74162b8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java index 97e9481416a..0305a2343ea 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishMinimalStemFilterFactory.java index edf4ecea708..1b79b626882 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishMinimalStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java index eddc69d198f..363da064fd4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java index 5a3df5828e9..fa69f442e87 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java index 26c096e4bef..47fb278c3b4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java index ff97b587801..e62e45e636f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java index 902ec391e46..ac0f23b35db 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java index 033fcca75dc..9702ec6cbac 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java index e2b78a7bdbc..4d2e1629d78 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java index 85395141942..799ca60316a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java index b471375473c..07a090a7b22 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java index 2968cc55d61..8fe0659a7fc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java index e5de66ce565..4606cb95e32 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java index 4e14a98dd93..2cf67fde8c2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java index 5b6d4ee43ba..4c3c28f1f42 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java index 1b514b739c4..5445d254039 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java index a961d29c4ee..13289e409f2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java index 4bb69fa6ec9..01e9a778ecb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilterFactory.java index facebdef87a..61fef8b7418 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/minhash/MinHashFilterFactory.java @@ -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) { diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java index b7a00bcc759..8f14cfa4d50 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java index 0ea2670ce6c..e993f1de3ae 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilterFactory.java index 1d1ed7021b2..bb797849957 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ConcatenateGraphFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ConcatenateGraphFilterFactory.java index 37a45348189..2829cc83e3f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ConcatenateGraphFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ConcatenateGraphFilterFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ConditionalTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ConditionalTokenFilterFactory.java index c99b4c5ab46..98333c48b09 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ConditionalTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ConditionalTokenFilterFactory.java @@ -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 diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactory.java index abadc6484a5..d0815c00715 100755 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DelimitedTermFrequencyTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DelimitedTermFrequencyTokenFilterFactory.java index 1adc671bfd6..ad511910965 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DelimitedTermFrequencyTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DelimitedTermFrequencyTokenFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilterFactory.java index e317e9e9198..dc51e1c5c5a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FixBrokenOffsetsFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FixBrokenOffsetsFilterFactory.java index b362b836217..40a925cc67b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FixBrokenOffsetsFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FixBrokenOffsetsFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java index a6adeda77c2..cc30b1d650e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java index 4ff496c8367..12b7662ba20 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java index 83963603c0e..85b8d25ce11 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilterFactory.java index 8fb7e9c30be..80c8371fe2e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java index 01de69fe03e..d69cdf0636c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java index 49151fc7a8d..8dbd94e6cb2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilterFactory.java index 9f53ab4552d..12fb8e36405 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilterFactory.java index 5df2f1cfe61..3a8c0f7f5ee 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ProtectedTermFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ProtectedTermFilterFactory.java index 0af44829ad1..b81e152013b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ProtectedTermFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ProtectedTermFilterFactory.java @@ -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} diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java index 6001604d376..35273b3d5e0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java index ca5037318b0..bc81a4bb8c0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java index a9f47c27ff1..7c41b1a6087 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java index b92da311eb3..7891576d165 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java index 09c343f57db..79e76e52236 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java @@ -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}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterFactory.java index a2df201507d..6c78178ba86 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterFactory.java @@ -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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TypeAsSynonymFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TypeAsSynonymFilterFactory.java index 1731f6070d4..446eb459736 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TypeAsSynonymFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TypeAsSynonymFilterFactory.java @@ -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 TypeAsSynonymFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java index 6228bf46638..5523278b1ac 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java @@ -28,9 +28,9 @@ import java.util.regex.Pattern; import org.apache.lucene.analysis.CharArraySet; 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; import org.apache.lucene.search.PhraseQuery; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterGraphFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterGraphFilterFactory.java index 51427326a6a..bc0bf3d8397 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterGraphFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterGraphFilterFactory.java @@ -28,9 +28,9 @@ import java.util.regex.Pattern; import org.apache.lucene.analysis.CharArraySet; 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; import static org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter.*; import static org.apache.lucene.analysis.miscellaneous.WordDelimiterIterator.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java index 056dd4f8506..46f07605da5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java @@ -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; /** * Creates new instances of {@link EdgeNGramTokenFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java index 21015206bc7..93a56107c1e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.ngram; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java index 1f0a2932b10..af2c6f50b03 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java @@ -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 NGramTokenFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java index 3b4ecc66366..5d0f5abbaf6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.ngram; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java index 9b455d6c807..66b330378ab 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.no; import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.BOKMAAL; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.NYNORSK; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java index 9d96a8cf074..f652a505581 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.no; import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.BOKMAAL; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.NYNORSK; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java index 27c16676cdb..06ad8265a4f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.path; import java.util.Map; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupFilterFactory.java index 40a15c6c53e..a6a49dd2aa6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupFilterFactory.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.regex.Pattern; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; /** * Factory for {@link PatternCaptureGroupTokenFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java index 348c86140b3..7a2f6bb05dc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.util.Map; import java.util.regex.Pattern; -import org.apache.lucene.analysis.util.CharFilterFactory; +import org.apache.lucene.analysis.CharFilterFactory; /** * Factory for {@link PatternReplaceCharFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java index 52b660720d6..10fb427ef48 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.pattern; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import java.util.Arrays; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java index f6da8810ff5..3726abb6987 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.pattern; import java.util.Map; import java.util.regex.Pattern; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/SimplePatternSplitTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/SimplePatternSplitTokenizerFactory.java index 87c0bb970ad..306dadbccc5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/SimplePatternSplitTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/SimplePatternSplitTokenizerFactory.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.pattern; import java.util.Map; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.Operations; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/SimplePatternTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/SimplePatternTokenizerFactory.java index a0d49526a47..635bbf0cc32 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/SimplePatternTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/SimplePatternTokenizerFactory.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.pattern; import java.util.Map; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.automaton.Automaton; import org.apache.lucene.util.automaton.Operations; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java index ec27c8973c9..37a71e68cbb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java @@ -18,9 +18,9 @@ package org.apache.lucene.analysis.payloads; 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.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java index 4693f55aad7..102d57f601d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.payloads; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import java.util.Map; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java index 4876096ca87..b5c6b440cd0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.payloads; 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 TokenOffsetPayloadTokenFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java index 4fa20adb7a5..01da15ce9eb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.payloads; 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 TypeAsPayloadTokenFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java index 5d55aa2459d..ffb39c659d3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.pt; 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 PortugueseLightStemFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java index bffc040e830..fdb2f884356 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.pt; 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 PortugueseMinimalStemFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java index c119ccf3de5..2419b0339b3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.pt; 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 PortugueseStemFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java index 0d404e1a5a8..536c955b681 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.reverse; 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 ReverseStringFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java index 45277fc8556..9035403caa4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ru; 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 RussianLightStemFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/FixedShingleFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/FixedShingleFilterFactory.java index ee6699a26f6..4157847ac87 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/FixedShingleFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/FixedShingleFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.shingle; 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 FixedShingleFilter} diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java index 88d2ee346c7..80bd6e10bcd 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.shingle; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java index 55a21b79b4f..60eda5349aa 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java @@ -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.miscellaneous.SetKeywordMarkerFilter; -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.tartarus.snowball.SnowballStemmer; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java index 14119b49a4f..e9649e6b791 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java @@ -21,7 +21,7 @@ import java.util.Arrays; 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 SerbianNormalizationFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java index 28dc4829d9c..67db7b23107 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.sv; 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 SwedishLightStemFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java index 12863b3e514..5abe1902c08 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java @@ -35,10 +35,10 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.FlattenGraphFilterFactory; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -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; /** * Factory for {@link SynonymFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymGraphFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymGraphFilterFactory.java index dc6a0fdae71..d1351c6cc77 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymGraphFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymGraphFilterFactory.java @@ -33,10 +33,10 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -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; /** * Factory for {@link SynonymGraphFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizerFactory.java index a2a0e752579..919f19a15d1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizerFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.th; import java.util.Map; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilterFactory.java index 5466deebdc4..c2209a1c736 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.tr; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java index adc472d9d10..91ed48d1d2e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.tr; 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 TurkishLowerCaseFilter}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java index 9bcfa2809d2..3bdececf581 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java @@ -21,6 +21,9 @@ import java.io.IOException; import java.util.Map; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.fr.FrenchAnalyzer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java index 4fbaa6d94b5..96dfeee98ab 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java @@ -17,6 +17,9 @@ package org.apache.lucene.analysis.util; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java index 564b5844c8a..c30bc7a0628 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; /** diff --git a/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory b/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.CharFilterFactory similarity index 100% rename from lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory rename to lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.CharFilterFactory 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.TokenFilterFactory similarity index 99% rename from lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory index fd13e6fc86c..1cc77c2dae1 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.TokenFilterFactory @@ -25,6 +25,7 @@ org.apache.lucene.analysis.cjk.CJKBigramFilterFactory org.apache.lucene.analysis.cjk.CJKWidthFilterFactory org.apache.lucene.analysis.ckb.SoraniNormalizationFilterFactory org.apache.lucene.analysis.ckb.SoraniStemFilterFactory +org.apache.lucene.analysis.classic.ClassicFilterFactory org.apache.lucene.analysis.commongrams.CommonGramsFilterFactory org.apache.lucene.analysis.commongrams.CommonGramsQueryFilterFactory org.apache.lucene.analysis.compound.DictionaryCompoundWordTokenFilterFactory @@ -108,7 +109,6 @@ org.apache.lucene.analysis.shingle.ShingleFilterFactory 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.sv.SwedishLightStemFilterFactory org.apache.lucene.analysis.synonym.SynonymFilterFactory org.apache.lucene.analysis.synonym.SynonymGraphFilterFactory diff --git a/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory b/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory similarity index 88% rename from lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory rename to lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory index e8bceff4cc2..6d0439b5b1f 100644 --- a/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory +++ b/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory @@ -13,17 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. +org.apache.lucene.analysis.classic.ClassicTokenizerFactory org.apache.lucene.analysis.core.KeywordTokenizerFactory org.apache.lucene.analysis.core.LetterTokenizerFactory org.apache.lucene.analysis.core.WhitespaceTokenizerFactory +org.apache.lucene.analysis.email.UAX29URLEmailTokenizerFactory org.apache.lucene.analysis.ngram.EdgeNGramTokenizerFactory org.apache.lucene.analysis.ngram.NGramTokenizerFactory org.apache.lucene.analysis.path.PathHierarchyTokenizerFactory org.apache.lucene.analysis.pattern.PatternTokenizerFactory org.apache.lucene.analysis.pattern.SimplePatternSplitTokenizerFactory org.apache.lucene.analysis.pattern.SimplePatternTokenizerFactory -org.apache.lucene.analysis.standard.ClassicTokenizerFactory -org.apache.lucene.analysis.standard.StandardTokenizerFactory -org.apache.lucene.analysis.standard.UAX29URLEmailTokenizerFactory org.apache.lucene.analysis.th.ThaiTokenizerFactory org.apache.lucene.analysis.wikipedia.WikipediaTokenizerFactory diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java index eb2018ffea0..f3f833d8337 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java @@ -22,7 +22,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Arabic filter Factories are working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java index 2cd8e84c4c5..ed4f69cf5ae 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java @@ -22,7 +22,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Bulgarian stem filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliFilters.java index 3ed1a07e14f..f0326dfa26b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bn/TestBengaliFilters.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Test Bengali Filter Factory diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java index af47bd24403..51e3163f7c0 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Brazilian stem filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java index bb5eff3df12..d11eb62e6b6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure this factory is working diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java index e24089cf55b..709abf559cb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.charfilter; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; public class TestMappingCharFilterFactory extends BaseTokenStreamFactoryTestCase { public void testParseString() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java index a917e0c1278..2a4b5231102 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java @@ -22,7 +22,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the CJK bigram factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java index a7e1422e802..dd007a35582 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the CJKWidthFilterFactory is working diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java index 61ef7b482c1..423d9ad11f3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Sorani normalization factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java index 1c4b1623c58..a021a1e626f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Sorani stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicAnalyzer.java similarity index 99% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicAnalyzer.java index c077c33fa43..d8fa26cec69 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicAnalyzer.java @@ -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; @@ -22,6 +22,7 @@ import java.util.Arrays; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.analysis.classic.ClassicAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicFactories.java new file mode 100644 index 00000000000..1dee17b529a --- /dev/null +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/classic/TestClassicFactories.java @@ -0,0 +1,81 @@ +/* + * 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.classic; + + +import java.io.Reader; +import java.io.StringReader; + +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; + +/** + * Simple tests to ensure the classic lucene factories are working. + */ +public class TestClassicFactories extends BaseTokenStreamFactoryTestCase { + /** + * Test ClassicTokenizerFactory + */ + public void testClassicTokenizer() throws Exception { + Reader reader = new StringReader("What's this thing do?"); + Tokenizer stream = tokenizerFactory("Classic").create(newAttributeFactory()); + stream.setReader(reader); + assertTokenStreamContents(stream, + new String[]{"What's", "this", "thing", "do"}); + } + + public void testClassicTokenizerMaxTokenLength() throws Exception { + StringBuilder builder = new StringBuilder(); + for (int i = 0 ; i < 100 ; ++i) { + builder.append("abcdefg"); // 7 * 100 = 700 char "word" + } + String longWord = builder.toString(); + String content = "one two three " + longWord + " four five six"; + Reader reader = new StringReader(content); + Tokenizer stream = tokenizerFactory("Classic", + "maxTokenLength", "1000").create(newAttributeFactory()); + stream.setReader(reader); + assertTokenStreamContents(stream, + new String[]{"one", "two", "three", longWord, "four", "five", "six"}); + } + + /** + * Test ClassicFilterFactory + */ + public void testClassicFilter() throws Exception { + Reader reader = new StringReader("What's this thing do?"); + Tokenizer tokenizer = tokenizerFactory("Classic").create(newAttributeFactory()); + tokenizer.setReader(reader); + TokenStream stream = tokenFilterFactory("Classic").create(tokenizer); + assertTokenStreamContents(stream, + new String[] { "What", "this", "thing", "do" }); + } + + /** Test that bogus arguments result in exception */ + public void testBogusArguments() throws Exception { + IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> { + tokenizerFactory("Classic", "bogusArg", "bogusValue"); + }); + assertTrue(expected.getMessage().contains("Unknown parameters")); + + expected = expectThrows(IllegalArgumentException.class, () -> { + tokenFilterFactory("Classic", "bogusArg", "bogusValue"); + }); + assertTrue(expected.getMessage().contains("Unknown parameters")); + } +} diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java index 5bcfb3d3d32..5689267a072 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java @@ -24,9 +24,9 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.TestStopFilterFactory; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.util.ClasspathResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.Version; /** diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java index fee6e886dd0..a3cd5fd7b8d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java @@ -20,9 +20,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.TestStopFilterFactory; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.util.ClasspathResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.Version; /** diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java index 886251987dc..3dec723fdaa 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Dictionary compound filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java index 0039e2008d7..be58178257a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Hyphenation compound filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java index b8bd23abde1..dae7c8e06ef 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java @@ -52,12 +52,12 @@ import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer; import org.apache.lucene.analysis.sinks.TeeSinkTokenFilter; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.apache.lucene.analysis.sr.SerbianNormalizationRegularFilter; -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; import org.apache.lucene.analysis.util.StringMockResourceLoader; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestCoreFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestCoreFactories.java new file mode 100644 index 00000000000..9f3510c16b2 --- /dev/null +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestCoreFactories.java @@ -0,0 +1,76 @@ +/* + * 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.core; + + +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.Tokenizer; + +import java.io.Reader; +import java.io.StringReader; + +/** + * Simple tests to ensure the core lucene factories are working. + */ +public class TestCoreFactories extends BaseTokenStreamFactoryTestCase { + + /** + * Test KeywordTokenizerFactory + */ + public void testKeywordTokenizer() throws Exception { + Reader reader = new StringReader("What's this thing do?"); + Tokenizer stream = tokenizerFactory("Keyword").create(); + stream.setReader(reader); + assertTokenStreamContents(stream, + new String[] { "What's this thing do?" }); + } + + /** + * Test WhitespaceTokenizerFactory + */ + public void testWhitespaceTokenizer() throws Exception { + Reader reader = new StringReader("What's this thing do?"); + Tokenizer stream = tokenizerFactory("Whitespace").create(newAttributeFactory()); + stream.setReader(reader); + assertTokenStreamContents(stream, + new String[] { "What's", "this", "thing", "do?" }); + } + + /** + * Test LetterTokenizerFactory + */ + public void testLetterTokenizer() throws Exception { + Reader reader = new StringReader("What's this thing do?"); + Tokenizer stream = tokenizerFactory("Letter").create(newAttributeFactory()); + stream.setReader(reader); + assertTokenStreamContents(stream, + new String[] { "What", "s", "this", "thing", "do" }); + } + + /** Test that bogus arguments result in exception */ + public void testBogusArguments() throws Exception { + IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> { + tokenizerFactory("Whitespace", "bogusArg", "bogusValue"); + }); + assertTrue(expected.getMessage().contains("Unknown parameters")); + + expected = expectThrows(IllegalArgumentException.class, () -> { + tokenizerFactory("Letter", "bogusArg", "bogusValue"); + }); + assertTrue(expected.getMessage().contains("Unknown parameters")); + } +} diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java index 8a484d4b094..a6d884ff445 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the digit normalization factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java index 19844f87e66..4fc78e83f2d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java @@ -33,12 +33,12 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.boost.DelimitedBoostTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.DelimitedTermFrequencyTokenFilterFactory; -import org.apache.lucene.analysis.util.AbstractAnalysisFactory; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.analysis.AbstractAnalysisFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.lucene.analysis.util.StringMockResourceLoader; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java index 0f24697570c..9c53fb9cc2f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java @@ -19,9 +19,9 @@ package org.apache.lucene.analysis.core; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.en.EnglishAnalyzer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.util.ClasspathResourceLoader; +import org.apache.lucene.util.ResourceLoader; public class TestStopFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java index 0cfa575445b..9376d332eb2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java @@ -20,8 +20,8 @@ package org.apache.lucene.analysis.core; import java.util.Set; import org.apache.lucene.analysis.CannedTokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.TokenFilterFactory; /** * Testcase for {@link TypeTokenFilterFactory} diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java index 3816b8111a5..479d9fb0942 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java @@ -37,11 +37,11 @@ import org.apache.lucene.analysis.core.StopFilterFactory; import org.apache.lucene.analysis.core.WhitespaceTokenizerFactory; import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilterFactory; import org.apache.lucene.analysis.reverse.ReverseStringFilterFactory; -import org.apache.lucene.analysis.standard.ClassicTokenizerFactory; +import org.apache.lucene.analysis.classic.ClassicTokenizerFactory; import org.apache.lucene.analysis.standard.StandardTokenizerFactory; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.SetOnce.AlreadySetException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java index 10a36ae3589..fee82f3d04f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Czech stem filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java index df71a9575bf..4dc02132b38 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the German light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java index 5c85894cc1e..e980e665723 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the German minimal stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java index fd6574624c9..f71f5ca2728 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the German normalization factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java index 952283a39b7..b4d1c23a619 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the German stem filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java index d5c56fbf4aa..9f526e7e886 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Greek lowercase filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java index 4a4f25f5296..f1c52f60b0e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Greek stem filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPage.html b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/LuceneResourcesWikiPage.html similarity index 100% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPage.html rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/email/LuceneResourcesWikiPage.html diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPageURLs.txt b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/LuceneResourcesWikiPageURLs.txt similarity index 100% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPageURLs.txt rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/email/LuceneResourcesWikiPageURLs.txt diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailAnalyzer.java similarity index 99% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailAnalyzer.java index bcd856303c9..5b029927394 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailAnalyzer.java @@ -14,11 +14,12 @@ * 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.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java similarity index 99% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java index 926fc36af10..eededade8c9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizer.java @@ -14,13 +14,16 @@ * 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.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.email.UAX29URLEmailTokenizer; +import org.apache.lucene.analysis.standard.EmojiTokenizationTestUnicode_11_0; +import org.apache.lucene.analysis.standard.WordBreakTestUnicode_9_0_0; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.TestUtil; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizerFactory.java similarity index 98% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizerFactory.java index 12a48651780..874258938ef 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TestUAX29URLEmailTokenizerFactory.java @@ -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.email; import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * A few tests based on org.apache.lucene.analysis.TestUAX29URLEmailTokenizer diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/email.addresses.from.random.text.with.email.addresses.txt b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/email.addresses.from.random.text.with.email.addresses.txt similarity index 100% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/email.addresses.from.random.text.with.email.addresses.txt rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/email/email.addresses.from.random.text.with.email.addresses.txt diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.email.addresses.txt b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/random.text.with.email.addresses.txt similarity index 100% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.email.addresses.txt rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/email/random.text.with.email.addresses.txt diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.urls.txt b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/random.text.with.urls.txt similarity index 100% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.urls.txt rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/email/random.text.with.urls.txt diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/urls.from.random.text.with.urls.txt b/lucene/analysis/common/src/test/org/apache/lucene/analysis/email/urls.from.random.text.with.urls.txt similarity index 100% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/urls.from.random.text.with.urls.txt rename to lucene/analysis/common/src/test/org/apache/lucene/analysis/email/urls.from.random.text.with.urls.txt diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java index 6c248b2b031..3e3e4cb6eae 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the English minimal stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java index a4ad23ce3c1..28391ed8273 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the kstem filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java index ccb2e760c36..44797f509fb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Porter stem filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java index 1e038e2aa1a..23be4805c36 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Spanish Light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilterFactory.java index aed87dccfa3..581f440bb64 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishMinimalStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the spanish minimal stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java index bb235712b08..a7a6f952268 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Persian normalization factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java index a433c95c3df..1921f3d26c8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Finnish light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java index eaf3c3c93f7..5d00e5d7225 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the French light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java index 820b5d007a1..0048e75841c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the French minimal stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java index 4a106ef6679..17101974429 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Irish lowercase filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java index a39613022b5..2761469256e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Galician plural stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java index 270151a276d..aa37482c32d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Galician stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java index 7bf5f0559d0..f526d94fa2e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Hindi filter Factories are working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java index 63f235bd058..2fcb09579df 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Hungarian light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java index 7c445521fd4..06da02309a9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Hunspell stemmer loads from factory diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java index ad382ecc31d..08b272275c6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Indonesian stem filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java index f6bce8b4656..3d6e15e6ba4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Italian light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java index 8ccdbafdd4d..10fb0359e1a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Latvian stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestAsciiFoldingFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestAsciiFoldingFilterFactory.java index 5990e59bcda..75aac134afe 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestAsciiFoldingFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestAsciiFoldingFilterFactory.java @@ -23,8 +23,8 @@ import java.util.HashMap; import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.TokenFilterFactory; public class TestAsciiFoldingFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java index 1a4f7267d76..6d1d454c9d8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; public class TestCapitalizationFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java index 985b309f52c..cd8704c3ed3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; public class TestCodepointCountFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilterFactory.java index 34c20882720..03ac78411dc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.Version; public class TestConcatenateGraphFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConditionalTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConditionalTokenFilter.java index 7b07bf9cb6f..5aa6f969cb4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConditionalTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConditionalTokenFilter.java @@ -42,7 +42,7 @@ import org.apache.lucene.analysis.in.IndicNormalizationFilter; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.apache.lucene.analysis.shingle.FixedShingleFilter; import org.apache.lucene.analysis.shingle.ShingleFilter; -import org.apache.lucene.analysis.standard.ClassicTokenizer; +import org.apache.lucene.analysis.classic.ClassicTokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.synonym.SolrSynonymParser; import org.apache.lucene.analysis.synonym.SynonymGraphFilter; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java index ed2bd3ee54d..616f85694a6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java @@ -22,7 +22,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; public class TestFingerprintFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java index dde6f946eac..ca3a1472b19 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java @@ -18,9 +18,9 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.util.ClasspathResourceLoader; +import org.apache.lucene.util.ResourceLoader; public class TestKeepFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java index 7bdf151f715..5a2b2ce8c5f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.util.StringMockResourceLoader; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java index 183d95f8823..0488975ca9b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; public class TestLengthFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java index 1f32994b195..6ca22374863 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java index 3840b9e309f..3f1a4b6972a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java @@ -22,7 +22,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; public class TestLimitTokenOffsetFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java index 014cc88e955..e6fae572c79 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestMiscellaneousFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestMiscellaneousFactories.java new file mode 100644 index 00000000000..0feb39d112a --- /dev/null +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestMiscellaneousFactories.java @@ -0,0 +1,49 @@ +/* + * 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.miscellaneous; + + +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.TokenStream; + +import java.io.Reader; +import java.io.StringReader; + +/** + * Simple tests to ensure the miscellaneous lucene factories are working. + */ +public class TestMiscellaneousFactories extends BaseTokenStreamFactoryTestCase { + /** + * Ensure the ASCIIFoldingFilterFactory works + */ + public void testASCIIFolding() throws Exception { + Reader reader = new StringReader("Česká"); + TokenStream stream = whitespaceMockTokenizer(reader); + stream = tokenFilterFactory("ASCIIFolding").create(stream); + assertTokenStreamContents(stream, new String[]{"Ceska"}); + } + + /** + * Test that bogus arguments result in exception + */ + public void testBogusArguments() throws Exception { + IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> { + tokenFilterFactory("ASCIIFolding", "bogusArg", "bogusValue"); + }); + assertTrue(expected.getMessage().contains("Unknown parameters")); + } +} diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilterFactory.java index a1aac68acc7..bf9ec7d7e2a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestProtectedTermFilterFactory.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the simple truncation filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java index 3b771f4b3f9..aead500f33f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** Simple tests to ensure this factory is working */ public class TestRemoveDuplicatesTokenFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java index 969e89195da..83ca4fcd7e6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java index f4dd48c1330..efa7285e83e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; public class TestScandinavianNormalizationFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java index 395f3439045..c17271c9c59 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.util.StringMockResourceLoader; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java index 054a16aafbf..8d596fe3cba 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure this factory is working diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java index d0e74c936f5..2804c9c75e4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilterFactory.java index 6beb139a584..db30069ff8b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTypeAsSynonymFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; public class TestTypeAsSynonymFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java index 7db89412f59..1bd73954d94 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.payloads.PayloadHelper; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.util.BytesRef; /** diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java index a8948d1b005..aebb4dab437 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Norwegian Light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java index 91d021b8a0c..b4d23cc1ec5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Norwegian Minimal stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java index 04f926927fd..6add680f24c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure this factory is working diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java index 2f77ead9582..34a2ed88d4d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.pattern; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java index 02126f165f2..54eefc36abd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** Simple Tests to ensure this factory is working */ public class TestPatternTokenizerFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java index f846fd5c5a7..7e3ea04832a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; public class TestDelimitedPayloadTokenFilterFactory extends BaseTokenStreamFactoryTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java index 5db7a596888..be813e73eda 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Portuguese Light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java index 4fe74bb7567..ceccb10283a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Portuguese Minimal stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java index fcd0f4b7b41..511f977abfe 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Portuguese stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java index 306c0cdc0d5..616d7f03bb4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Reverse string filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java index 946fa223d8a..e3ca55d3f3e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Russian light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java index 389d52428b6..f49ad033108 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Shingle filter factory works. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java index 5696bf38639..74302c410f3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.snowball; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.util.StringMockResourceLoader; import org.apache.lucene.util.Version; import org.tartarus.snowball.ext.EnglishStemmer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java index 772f6fc0118..726068b9696 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Serbian normalization factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java deleted file mode 100644 index 3f3d5c22d04..00000000000 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java +++ /dev/null @@ -1,170 +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.Reader; -import java.io.StringReader; - -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; - -/** - * Simple tests to ensure the standard lucene factories are working. - */ -public class TestStandardFactories extends BaseTokenStreamFactoryTestCase { - /** - * Test StandardTokenizerFactory - */ - public void testStandardTokenizer() throws Exception { - Reader reader = new StringReader("Wha\u0301t's this thing do?"); - Tokenizer stream = tokenizerFactory("Standard").create(newAttributeFactory()); - stream.setReader(reader); - assertTokenStreamContents(stream, - new String[]{"Wha\u0301t's", "this", "thing", "do"}); - } - - public void testStandardTokenizerMaxTokenLength() throws Exception { - StringBuilder builder = new StringBuilder(); - for (int i = 0 ; i < 100 ; ++i) { - builder.append("abcdefg"); // 7 * 100 = 700 char "word" - } - String longWord = builder.toString(); - String content = "one two three " + longWord + " four five six"; - Reader reader = new StringReader(content); - Tokenizer stream = tokenizerFactory("Standard", - "maxTokenLength", "1000").create(newAttributeFactory()); - stream.setReader(reader); - assertTokenStreamContents(stream, - new String[]{"one", "two", "three", longWord, "four", "five", "six"}); - } - - /** - * Test ClassicTokenizerFactory - */ - public void testClassicTokenizer() throws Exception { - Reader reader = new StringReader("What's this thing do?"); - Tokenizer stream = tokenizerFactory("Classic").create(newAttributeFactory()); - stream.setReader(reader); - assertTokenStreamContents(stream, - new String[]{"What's", "this", "thing", "do"}); - } - - public void testClassicTokenizerMaxTokenLength() throws Exception { - StringBuilder builder = new StringBuilder(); - for (int i = 0 ; i < 100 ; ++i) { - builder.append("abcdefg"); // 7 * 100 = 700 char "word" - } - String longWord = builder.toString(); - String content = "one two three " + longWord + " four five six"; - Reader reader = new StringReader(content); - Tokenizer stream = tokenizerFactory("Classic", - "maxTokenLength", "1000").create(newAttributeFactory()); - stream.setReader(reader); - assertTokenStreamContents(stream, - new String[]{"one", "two", "three", longWord, "four", "five", "six"}); - } - - /** - * Test ClassicFilterFactory - */ - public void testStandardFilter() throws Exception { - Reader reader = new StringReader("What's this thing do?"); - Tokenizer tokenizer = tokenizerFactory("Classic").create(newAttributeFactory()); - tokenizer.setReader(reader); - TokenStream stream = tokenFilterFactory("Classic").create(tokenizer); - assertTokenStreamContents(stream, - new String[] { "What", "this", "thing", "do" }); - } - - /** - * Test KeywordTokenizerFactory - */ - public void testKeywordTokenizer() throws Exception { - Reader reader = new StringReader("What's this thing do?"); - Tokenizer stream = tokenizerFactory("Keyword").create(); - stream.setReader(reader); - assertTokenStreamContents(stream, - new String[] { "What's this thing do?" }); - } - - /** - * Test WhitespaceTokenizerFactory - */ - public void testWhitespaceTokenizer() throws Exception { - Reader reader = new StringReader("What's this thing do?"); - Tokenizer stream = tokenizerFactory("Whitespace").create(newAttributeFactory()); - stream.setReader(reader); - assertTokenStreamContents(stream, - new String[] { "What's", "this", "thing", "do?" }); - } - - /** - * Test LetterTokenizerFactory - */ - public void testLetterTokenizer() throws Exception { - Reader reader = new StringReader("What's this thing do?"); - Tokenizer stream = tokenizerFactory("Letter").create(newAttributeFactory()); - stream.setReader(reader); - assertTokenStreamContents(stream, - new String[] { "What", "s", "this", "thing", "do" }); - } - - /** - * Ensure the ASCIIFoldingFilterFactory works - */ - public void testASCIIFolding() throws Exception { - Reader reader = new StringReader("Česká"); - TokenStream stream = whitespaceMockTokenizer(reader); - stream = tokenFilterFactory("ASCIIFolding").create(stream); - assertTokenStreamContents(stream, new String[] { "Ceska" }); - } - - /** Test that bogus arguments result in exception */ - public void testBogusArguments() throws Exception { - IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> { - tokenizerFactory("Standard", "bogusArg", "bogusValue"); - }); - assertTrue(expected.getMessage().contains("Unknown parameters")); - - expected = expectThrows(IllegalArgumentException.class, () -> { - tokenizerFactory("Classic", "bogusArg", "bogusValue"); - }); - assertTrue(expected.getMessage().contains("Unknown parameters")); - - expected = expectThrows(IllegalArgumentException.class, () -> { - tokenizerFactory("Whitespace", "bogusArg", "bogusValue"); - }); - assertTrue(expected.getMessage().contains("Unknown parameters")); - - expected = expectThrows(IllegalArgumentException.class, () -> { - tokenizerFactory("Letter", "bogusArg", "bogusValue"); - }); - assertTrue(expected.getMessage().contains("Unknown parameters")); - - expected = expectThrows(IllegalArgumentException.class, () -> { - tokenFilterFactory("ASCIIFolding", "bogusArg", "bogusValue"); - }); - assertTrue(expected.getMessage().contains("Unknown parameters")); - - expected = expectThrows(IllegalArgumentException.class, () -> { - tokenFilterFactory("Classic", "bogusArg", "bogusValue"); - }); - assertTrue(expected.getMessage().contains("Unknown parameters")); - } -} diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java index 7c4f55821e3..7ad2f257794 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Swedish Light stem factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java index 8a1a9165667..8ff57b526f1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.synonym; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.util.StringMockResourceLoader; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java index 13adaef9f2e..455418f8c0e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java @@ -21,8 +21,8 @@ import java.io.Reader; import java.io.StringReader; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternTokenizerFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.util.StringMockResourceLoader; import org.apache.lucene.analysis.cjk.CJKAnalyzer; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java index 428c36a43e5..727479daff7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.th; import java.io.StringReader; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Thai word filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java index b4ecc1c4d51..811035a3182 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java @@ -21,7 +21,7 @@ package org.apache.lucene.analysis.tr; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java index 9b1638f3f7e..65057e0b453 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the Turkish lowercase filter factory is working. diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java index f5384f403b9..7b01ea2d4c3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java @@ -17,6 +17,8 @@ package org.apache.lucene.analysis.util; +import org.apache.lucene.util.ResourceLoader; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java index 8b81a8934a0..39fe63573c1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java @@ -20,6 +20,7 @@ package org.apache.lucene.analysis.util; import java.io.Reader; import java.io.StringReader; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java index c37edca3609..34dafc047a9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java @@ -25,6 +25,8 @@ import java.nio.file.Files; import java.nio.file.Path; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.analysis.WordlistLoader; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java index 15ef245d4f8..3647d71042c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Set; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; /** * Simple tests to ensure the wikipedia tokenizer is working. diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java index de01c71da51..cf2e516aa43 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java @@ -23,7 +23,7 @@ import com.ibm.icu.text.FilteredNormalizer2; import com.ibm.icu.text.Normalizer2; import com.ibm.icu.text.UnicodeSet; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; /** * Factory for {@link ICUFoldingFilter}. diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilterFactory.java index e74fb0339de..390507c3cb7 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilterFactory.java @@ -24,7 +24,7 @@ import java.util.Map; import com.ibm.icu.text.FilteredNormalizer2; import com.ibm.icu.text.Normalizer2; import com.ibm.icu.text.UnicodeSet; -import org.apache.lucene.analysis.util.CharFilterFactory; +import org.apache.lucene.analysis.CharFilterFactory; /** * Factory for {@link ICUNormalizer2CharFilter} diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java index 964830cf2bf..1385bfa17f9 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java @@ -24,7 +24,7 @@ import com.ibm.icu.text.FilteredNormalizer2; import com.ibm.icu.text.Normalizer2; import com.ibm.icu.text.UnicodeSet; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; /** * Factory for {@link ICUNormalizer2Filter} diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java index 110aa72f2b0..e757013449a 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java @@ -22,7 +22,7 @@ import java.util.Map; import com.ibm.icu.text.Transliterator; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; /** * Factory for {@link ICUTransformFilter}. diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java index d97bec5f2a6..fa715c94d8e 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.IOUtils; diff --git a/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory b/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.CharFilterFactory similarity index 100% rename from lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory rename to lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.CharFilterFactory diff --git a/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory similarity index 100% rename from lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory diff --git a/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory b/lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory similarity index 100% rename from lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory rename to lucene/analysis/icu/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java index a9efb3b22e9..4f1e506c9a2 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java @@ -24,7 +24,7 @@ import java.util.Map; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; /** basic tests for {@link ICUTokenizerFactory} **/ public class TestICUTokenizerFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilterFactory.java index e573aad5809..8ad2771e7da 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ja; 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.ja.JapaneseBaseFormFilter}. diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java index e96c712f116..2063be77362 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ja; import java.io.Reader; import java.util.Map; -import org.apache.lucene.analysis.util.CharFilterFactory; +import org.apache.lucene.analysis.CharFilterFactory; /** * Factory for {@link org.apache.lucene.analysis.ja.JapaneseIterationMarkCharFilter}. diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilterFactory.java index 046ad740d98..2f75552c5ce 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.ja; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import java.util.Map; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilterFactory.java index a5d47ad4479..7e7b559f62b 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ja; 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 JapaneseNumberFilter}. diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java index f0e2a8048d2..9ba85c7e530 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java @@ -24,9 +24,9 @@ import java.util.Set; 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 org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter}. diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilterFactory.java index 549810794d3..8a3f463034c 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.lucene.analysis.ja; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import java.util.Map; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizerFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizerFactory.java index bc5c8957bef..884fc2a1fe6 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizerFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizerFactory.java @@ -29,11 +29,11 @@ import java.util.Map; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; import org.apache.lucene.analysis.ja.dict.UserDictionary; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; /** * Factory for {@link org.apache.lucene.analysis.ja.JapaneseTokenizer}. diff --git a/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory b/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.CharFilterFactory similarity index 100% rename from lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.CharFilterFactory rename to lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.CharFilterFactory diff --git a/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory similarity index 100% rename from lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory diff --git a/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory b/lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory similarity index 100% rename from lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory rename to lucene/analysis/kuromoji/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java index 887098fe255..10a0f059f61 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; /** Fake resource loader for tests: works if you want to fake reading a single file */ class StringMockResourceLoader implements ResourceLoader { diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java index 8fbaa309940..c475de6c5b1 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestFactories.java @@ -33,11 +33,11 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.boost.DelimitedBoostTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.DelimitedTermFrequencyTokenFilterFactory; -import org.apache.lucene.analysis.util.AbstractAnalysisFactory; -import org.apache.lucene.analysis.util.CharFilterFactory; -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.analysis.AbstractAnalysisFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.util.ResourceLoaderAware; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.lucene.util.Version; diff --git a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java index 158713b4513..687a94820d3 100644 --- a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java +++ b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java @@ -27,9 +27,9 @@ import morfologik.stemming.DictionaryMetadata; import morfologik.stemming.polish.PolishStemmer; 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; /** * Filter factory for {@link MorfologikFilter}. diff --git a/lucene/analysis/morfologik/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/analysis/morfologik/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory similarity index 100% rename from lucene/analysis/morfologik/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to lucene/analysis/morfologik/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory diff --git a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java index d971dbdf551..db78d860dba 100644 --- a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java +++ b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java @@ -26,8 +26,8 @@ import java.util.Map; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; +import org.apache.lucene.util.ResourceLoader; /** * Test for {@link MorfologikFilterFactory}. diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanNumberFilterFactory.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanNumberFilterFactory.java index 1e7c45471f8..0fc2f734e69 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanNumberFilterFactory.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanNumberFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.ko; 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 KoreanNumberFilter}. diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanPartOfSpeechStopFilterFactory.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanPartOfSpeechStopFilterFactory.java index 60b89974218..6a78b9720b5 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanPartOfSpeechStopFilterFactory.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanPartOfSpeechStopFilterFactory.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; /** * Factory for {@link KoreanPartOfSpeechStopFilter}. diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanReadingFormFilterFactory.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanReadingFormFilterFactory.java index 291cf75ed20..f5908c17aec 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanReadingFormFilterFactory.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanReadingFormFilterFactory.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.ko; 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 KoreanReadingFormFilter}. diff --git a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanTokenizerFactory.java b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanTokenizerFactory.java index cd52da881ef..c67da0a8123 100644 --- a/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanTokenizerFactory.java +++ b/lucene/analysis/nori/src/java/org/apache/lucene/analysis/ko/KoreanTokenizerFactory.java @@ -27,11 +27,11 @@ import java.util.Locale; import java.util.Map; import org.apache.lucene.analysis.ko.dict.UserDictionary; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.IOUtils; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.lucene.analysis.ko.KoreanTokenizer.DecompoundMode; /** diff --git a/lucene/analysis/nori/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/analysis/nori/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory similarity index 100% rename from lucene/analysis/nori/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to lucene/analysis/nori/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory diff --git a/lucene/analysis/nori/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory b/lucene/analysis/nori/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory similarity index 100% rename from lucene/analysis/nori/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory rename to lucene/analysis/nori/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory diff --git a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/StringMockResourceLoader.java b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/StringMockResourceLoader.java index 717814882e5..9cafa7f4d7f 100644 --- a/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/StringMockResourceLoader.java +++ b/lucene/analysis/nori/src/test/org/apache/lucene/analysis/ko/StringMockResourceLoader.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; /** Fake resource loader for tests: works if you want to fake reading a single file */ class StringMockResourceLoader implements ResourceLoader { diff --git a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPChunkerFilterFactory.java b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPChunkerFilterFactory.java index 5ff74648ef8..58af24c98c5 100644 --- a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPChunkerFilterFactory.java +++ b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPChunkerFilterFactory.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.opennlp.tools.NLPChunkerOp; import org.apache.lucene.analysis.opennlp.tools.OpenNLPOpsFactory; -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 OpenNLPChunkerFilter}. diff --git a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPLemmatizerFilterFactory.java b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPLemmatizerFilterFactory.java index 276fc1eeaab..29d0c17eeba 100644 --- a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPLemmatizerFilterFactory.java +++ b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPLemmatizerFilterFactory.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.opennlp.tools.NLPLemmatizerOp; import org.apache.lucene.analysis.opennlp.tools.OpenNLPOpsFactory; -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 OpenNLPLemmatizerFilter}. diff --git a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPPOSFilterFactory.java b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPPOSFilterFactory.java index bcfab0bbc20..3f4c8d8ce16 100644 --- a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPPOSFilterFactory.java +++ b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPPOSFilterFactory.java @@ -22,9 +22,9 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.opennlp.tools.OpenNLPOpsFactory; -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 OpenNLPPOSFilter}. diff --git a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPTokenizerFactory.java b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPTokenizerFactory.java index 49f8ff34b25..c91a4494caf 100644 --- a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPTokenizerFactory.java +++ b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/OpenNLPTokenizerFactory.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.lucene.analysis.opennlp.tools.NLPSentenceDetectorOp; import org.apache.lucene.analysis.opennlp.tools.NLPTokenizerOp; import org.apache.lucene.analysis.opennlp.tools.OpenNLPOpsFactory; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; /** diff --git a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/tools/OpenNLPOpsFactory.java b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/tools/OpenNLPOpsFactory.java index 84080af5b3d..96c196fcfaf 100644 --- a/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/tools/OpenNLPOpsFactory.java +++ b/lucene/analysis/opennlp/src/java/org/apache/lucene/analysis/opennlp/tools/OpenNLPOpsFactory.java @@ -32,7 +32,7 @@ import opennlp.tools.namefind.TokenNameFinderModel; import opennlp.tools.postag.POSModel; import opennlp.tools.sentdetect.SentenceModel; import opennlp.tools.tokenize.TokenizerModel; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; /** * Supply OpenNLP Named Entity Recognizer diff --git a/lucene/analysis/opennlp/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/analysis/opennlp/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory similarity index 100% rename from lucene/analysis/opennlp/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to lucene/analysis/opennlp/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory diff --git a/lucene/analysis/opennlp/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory b/lucene/analysis/opennlp/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory similarity index 100% rename from lucene/analysis/opennlp/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory rename to lucene/analysis/opennlp/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java index 013348c5bad..1a7a968d496 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPChunkerFilterFactory.java @@ -23,7 +23,7 @@ import java.util.Arrays; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.custom.CustomAnalyzer; import org.apache.lucene.analysis.payloads.TypeAsPayloadTokenFilterFactory; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; /** * Needs the OpenNLP Tokenizer because it creates full streams of punctuation. diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPLemmatizerFilterFactory.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPLemmatizerFilterFactory.java index 0491b9102c7..daa6b663e9b 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPLemmatizerFilterFactory.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPLemmatizerFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.custom.CustomAnalyzer; import org.apache.lucene.analysis.miscellaneous.KeywordRepeatFilterFactory; import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilterFactory; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; public class TestOpenNLPLemmatizerFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPPOSFilterFactory.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPPOSFilterFactory.java index 814f480ec10..e3dae56a04e 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPPOSFilterFactory.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPPOSFilterFactory.java @@ -24,7 +24,7 @@ import java.util.Arrays; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.custom.CustomAnalyzer; import org.apache.lucene.analysis.payloads.TypeAsPayloadTokenFilterFactory; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; /** * Needs the OpenNLP Tokenizer because it creates full streams of punctuation. diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPSentenceBreakIterator.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPSentenceBreakIterator.java index 4ee65706431..7585142d185 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPSentenceBreakIterator.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPSentenceBreakIterator.java @@ -24,7 +24,7 @@ import java.text.CharacterIterator; import org.apache.lucene.analysis.opennlp.tools.NLPSentenceDetectorOp; import org.apache.lucene.analysis.opennlp.tools.OpenNLPOpsFactory; import org.apache.lucene.analysis.util.CharArrayIterator; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; import org.apache.lucene.util.LuceneTestCase; import org.junit.BeforeClass; diff --git a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPTokenizerFactory.java b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPTokenizerFactory.java index 59a522040f4..bd8e1515abc 100644 --- a/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPTokenizerFactory.java +++ b/lucene/analysis/opennlp/src/test/org/apache/lucene/analysis/opennlp/TestOpenNLPTokenizerFactory.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.custom.CustomAnalyzer; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; import org.junit.Test; /** diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilterFactory.java index fa31ce4a77a..7e7cf3c96a4 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilterFactory.java @@ -25,7 +25,7 @@ import org.apache.commons.codec.language.bm.NameType; 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.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; /** * Factory for {@link BeiderMorseFilter}. diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilterFactory.java index f4877c09eca..62a6edbdb59 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilterFactory.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.phonetic; 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 DaitchMokotoffSoundexFilter}. diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java index 9b4a1f1b771..8f5fc5edf7c 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.phonetic; 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 DoubleMetaphoneFilter}. diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java index 1b461f2b3a1..cf2c4b99180 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java @@ -33,9 +33,9 @@ import org.apache.commons.codec.language.Nysiis; import org.apache.commons.codec.language.RefinedSoundex; import org.apache.commons.codec.language.Soundex; 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 PhoneticFilter}. diff --git a/lucene/analysis/phonetic/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/analysis/phonetic/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory similarity index 100% rename from lucene/analysis/phonetic/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to lucene/analysis/phonetic/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java index f2050767f1b..c1f83c666d5 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java @@ -26,7 +26,7 @@ import org.apache.commons.codec.language.Metaphone; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; public class TestPhoneticFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizerFactory.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizerFactory.java index e2d9e081e3b..685e6e02842 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizerFactory.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizerFactory.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.cn.smart; import java.util.Map; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; /** diff --git a/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory b/lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory similarity index 100% rename from lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenizerFactory rename to lucene/analysis/smartcn/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory diff --git a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java index c3294862dea..ad5349f7709 100644 --- a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java +++ b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java @@ -23,7 +23,7 @@ import java.util.HashMap; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; /** * Tests for {@link HMMChineseTokenizerFactory} diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java index 4488a548c78..88227adb485 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pl.PolishAnalyzer; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; /** * Factory for {@link StempelFilter} using a Polish stemming table. diff --git a/lucene/analysis/stempel/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/analysis/stempel/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory similarity index 100% rename from lucene/analysis/stempel/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to lucene/analysis/stempel/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java index 696b5805c2f..10b52101ca4 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java @@ -17,12 +17,12 @@ package org.apache.lucene.benchmark.byTask.tasks; -import org.apache.lucene.analysis.util.AbstractAnalysisFactory; -import org.apache.lucene.analysis.util.CharFilterFactory; +import org.apache.lucene.analysis.AbstractAnalysisFactory; +import org.apache.lucene.analysis.CharFilterFactory; import org.apache.lucene.analysis.util.FilesystemResourceLoader; -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.ResourceLoaderAware; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.utils.AnalyzerFactory; import org.apache.lucene.util.Version; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/AnalyzerFactory.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/AnalyzerFactory.java index c91f87328a1..e5c015abd3b 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/AnalyzerFactory.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/AnalyzerFactory.java @@ -20,9 +20,9 @@ package org.apache.lucene.benchmark.byTask.utils; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import java.io.Reader; import java.util.List; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java index b343d336d1a..de488eaefe6 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java @@ -179,7 +179,7 @@ public class TestQualityRun extends BenchmarkTestCase { String algLines[] = { "# ----- properties ", "content.source=org.apache.lucene.benchmark.byTask.feeds.LineDocSource", - "analyzer=org.apache.lucene.analysis.standard.ClassicAnalyzer", + "analyzer=org.apache.lucene.analysis.classic.ClassicAnalyzer", "docs.file=" + getWorkDirResourcePath("reuters.578.lines.txt.bz2"), "content.source.log.step=2500", "doc.term.vector=false", diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java b/lucene/core/src/java/org/apache/lucene/analysis/AbstractAnalysisFactory.java similarity index 98% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java rename to lucene/core/src/java/org/apache/lucene/analysis/AbstractAnalysisFactory.java index c795c3511fd..2ae8e2c5222 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/AbstractAnalysisFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.analysis; import java.io.IOException; @@ -37,10 +37,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.StopFilter; -import org.apache.lucene.analysis.WordlistLoader; import org.apache.lucene.util.IOUtils; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.lucene.util.Version; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java b/lucene/core/src/java/org/apache/lucene/analysis/AnalysisSPILoader.java similarity index 99% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java rename to lucene/core/src/java/org/apache/lucene/analysis/AnalysisSPILoader.java index 61e0b3dc6ad..47f7f27b4d0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/AnalysisSPILoader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.analysis; import java.lang.reflect.Field; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java b/lucene/core/src/java/org/apache/lucene/analysis/CharFilterFactory.java similarity index 97% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java rename to lucene/core/src/java/org/apache/lucene/analysis/CharFilterFactory.java index 9e7e1b55f7a..4a2a1aa302f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/CharFilterFactory.java @@ -14,15 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.analysis; import java.io.Reader; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.CharFilter; - /** * Abstract parent class for analysis factories that create {@link CharFilter} * instances. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java b/lucene/core/src/java/org/apache/lucene/analysis/TokenFilterFactory.java similarity index 97% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java rename to lucene/core/src/java/org/apache/lucene/analysis/TokenFilterFactory.java index 4ff27eb5819..022e80fc1d3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/TokenFilterFactory.java @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.analysis; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.TokenStream; - /** * Abstract parent class for analysis factories that create {@link org.apache.lucene.analysis.TokenFilter} * instances. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java b/lucene/core/src/java/org/apache/lucene/analysis/TokenizerFactory.java similarity index 96% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java rename to lucene/core/src/java/org/apache/lucene/analysis/TokenizerFactory.java index 240bbd76812..d4eb6f13252 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/TokenizerFactory.java @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.analysis; -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.util.AttributeFactory; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java b/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java similarity index 97% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java rename to lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java index d67ac4ca312..cfcf74c8e2e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.standard; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java b/lucene/core/src/java/org/apache/lucene/util/ClasspathResourceLoader.java similarity index 97% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java rename to lucene/core/src/java/org/apache/lucene/util/ClasspathResourceLoader.java index e74634732c7..180c96f59eb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java +++ b/lucene/core/src/java/org/apache/lucene/util/ClasspathResourceLoader.java @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.util; import java.io.IOException; import java.io.InputStream; -import org.apache.lucene.util.SuppressForbidden; - /** * Simple {@link ResourceLoader} that uses {@link ClassLoader#getResourceAsStream(String)} * and {@link Class#forName(String,boolean,ClassLoader)} to open resources and diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java b/lucene/core/src/java/org/apache/lucene/util/ResourceLoader.java similarity index 97% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java rename to lucene/core/src/java/org/apache/lucene/util/ResourceLoader.java index 3f5bbd35082..eac55a1c8d4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java +++ b/lucene/core/src/java/org/apache/lucene/util/ResourceLoader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.util; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java b/lucene/core/src/java/org/apache/lucene/util/ResourceLoaderAware.java similarity index 96% rename from lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java rename to lucene/core/src/java/org/apache/lucene/util/ResourceLoaderAware.java index 504c33a5c0f..7f7e19e53a9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java +++ b/lucene/core/src/java/org/apache/lucene/util/ResourceLoaderAware.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.util; import java.io.IOException; diff --git a/lucene/core/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory b/lucene/core/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory new file mode 100644 index 00000000000..9af90fb62ab --- /dev/null +++ b/lucene/core/src/resources/META-INF/services/org.apache.lucene.analysis.TokenizerFactory @@ -0,0 +1,16 @@ +# 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. + +org.apache.lucene.analysis.standard.StandardTokenizerFactory \ No newline at end of file diff --git a/lucene/core/src/test/META-INF/services/org.apache.lucene.analysis.CharFilterFactory b/lucene/core/src/test/META-INF/services/org.apache.lucene.analysis.CharFilterFactory new file mode 100644 index 00000000000..7d666b8091c --- /dev/null +++ b/lucene/core/src/test/META-INF/services/org.apache.lucene.analysis.CharFilterFactory @@ -0,0 +1,16 @@ +# 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. + +org.apache.lucene.analysis.FakeCharFilterFactory diff --git a/lucene/core/src/test/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory b/lucene/core/src/test/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory new file mode 100644 index 00000000000..4200c78a7e7 --- /dev/null +++ b/lucene/core/src/test/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory @@ -0,0 +1,16 @@ +# 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. + +org.apache.lucene.analysis.FakeTokenFilterFactory diff --git a/lucene/core/src/test/org/apache/lucene/analysis/FakeCharFilterFactory.java b/lucene/core/src/test/org/apache/lucene/analysis/FakeCharFilterFactory.java new file mode 100644 index 00000000000..439ecf6d36a --- /dev/null +++ b/lucene/core/src/test/org/apache/lucene/analysis/FakeCharFilterFactory.java @@ -0,0 +1,43 @@ +/* + * 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; + +import java.io.Reader; +import java.util.Map; + +/** + * Fake char filter factory for testing + */ +public class FakeCharFilterFactory extends CharFilterFactory { + + public static final String NAME = "fake"; + + /** Create a FakeCharFilterFactory */ + public FakeCharFilterFactory(Map args) { + super(args); + } + + /** Default ctor for compatibility with SPI */ + public FakeCharFilterFactory() { + defaultCtorException(); + } + + @Override + public Reader create(Reader input) { + return input; + } +} diff --git a/lucene/core/src/test/org/apache/lucene/analysis/FakeTokenFilterFactory.java b/lucene/core/src/test/org/apache/lucene/analysis/FakeTokenFilterFactory.java new file mode 100644 index 00000000000..4e397385357 --- /dev/null +++ b/lucene/core/src/test/org/apache/lucene/analysis/FakeTokenFilterFactory.java @@ -0,0 +1,42 @@ +/* + * 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; + +import java.util.Map; + +/** + * Fake token filter factory for testing + */ +public class FakeTokenFilterFactory extends TokenFilterFactory { + + public static final String NAME = "fake"; + + /** Create a FakeTokenFilterFactory */ + public FakeTokenFilterFactory(Map args) { + super(args); + } + + /** Default ctor for compatibility with SPI */ + public FakeTokenFilterFactory() { + defaultCtorException(); + } + + @Override + public TokenStream create(TokenStream input) { + return input; + } +} diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAbstractAnalysisFactory.java b/lucene/core/src/test/org/apache/lucene/analysis/TestAbstractAnalysisFactory.java similarity index 59% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAbstractAnalysisFactory.java rename to lucene/core/src/test/org/apache/lucene/analysis/TestAbstractAnalysisFactory.java index a0e0cfa7936..3743560825b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAbstractAnalysisFactory.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestAbstractAnalysisFactory.java @@ -15,27 +15,25 @@ * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.analysis; -import org.apache.lucene.analysis.charfilter.HTMLStripCharFilterFactory; -import org.apache.lucene.analysis.core.LowerCaseFilterFactory; -import org.apache.lucene.analysis.core.WhitespaceTokenizerFactory; +import org.apache.lucene.analysis.standard.StandardTokenizerFactory; import org.apache.lucene.util.LuceneTestCase; public class TestAbstractAnalysisFactory extends LuceneTestCase { public void testLookupTokenizerSPIName() throws NoSuchFieldException, IllegalAccessException { - assertEquals("whitespace", AnalysisSPILoader.lookupSPIName(WhitespaceTokenizerFactory.class)); - assertEquals("whitespace", TokenizerFactory.findSPIName(WhitespaceTokenizerFactory.class)); + assertEquals("standard", AnalysisSPILoader.lookupSPIName(StandardTokenizerFactory.class)); + assertEquals("standard", TokenizerFactory.findSPIName(StandardTokenizerFactory.class)); } public void testLookupCharFilterSPIName() throws NoSuchFieldException, IllegalAccessException { - assertEquals("htmlStrip", AnalysisSPILoader.lookupSPIName(HTMLStripCharFilterFactory.class)); - assertEquals("htmlStrip", CharFilterFactory.findSPIName(HTMLStripCharFilterFactory.class)); + assertEquals("fake", AnalysisSPILoader.lookupSPIName(FakeCharFilterFactory.class)); + assertEquals("fake", CharFilterFactory.findSPIName(FakeCharFilterFactory.class)); } public void testLookupTokenFilterSPIName() throws NoSuchFieldException, IllegalAccessException{ - assertEquals("lowercase", AnalysisSPILoader.lookupSPIName(LowerCaseFilterFactory.class)); - assertEquals("lowercase", TokenFilterFactory.findSPIName(LowerCaseFilterFactory.class)); + assertEquals("fake", AnalysisSPILoader.lookupSPIName(FakeTokenFilterFactory.class)); + assertEquals("fake", TokenFilterFactory.findSPIName(FakeTokenFilterFactory.class)); } } diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java b/lucene/core/src/test/org/apache/lucene/analysis/TestAnalysisSPILoader.java similarity index 54% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java rename to lucene/core/src/test/org/apache/lucene/analysis/TestAnalysisSPILoader.java index 2398c1e822c..1c83530ee49 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestAnalysisSPILoader.java @@ -14,16 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.analysis; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.charfilter.HTMLStripCharFilterFactory; -import org.apache.lucene.analysis.core.LowerCaseFilterFactory; -import org.apache.lucene.analysis.core.WhitespaceTokenizerFactory; -import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilterFactory; +import org.apache.lucene.analysis.standard.StandardTokenizerFactory; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.Version; @@ -36,9 +33,9 @@ public class TestAnalysisSPILoader extends LuceneTestCase { } public void testLookupTokenizer() { - assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.forName("Whitespace", versionArgOnly()).getClass()); - assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.forName("WHITESPACE", versionArgOnly()).getClass()); - assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.forName("whitespace", versionArgOnly()).getClass()); + assertSame(StandardTokenizerFactory.class, TokenizerFactory.forName("Standard", versionArgOnly()).getClass()); + assertSame(StandardTokenizerFactory.class, TokenizerFactory.forName("STANDARD", versionArgOnly()).getClass()); + assertSame(StandardTokenizerFactory.class, TokenizerFactory.forName("standard", versionArgOnly()).getClass()); } public void testBogusLookupTokenizer() { @@ -52,9 +49,9 @@ public class TestAnalysisSPILoader extends LuceneTestCase { } public void testLookupTokenizerClass() { - assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.lookupClass("Whitespace")); - assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.lookupClass("WHITESPACE")); - assertSame(WhitespaceTokenizerFactory.class, TokenizerFactory.lookupClass("whitespace")); + assertSame(StandardTokenizerFactory.class, TokenizerFactory.lookupClass("Standard")); + assertSame(StandardTokenizerFactory.class, TokenizerFactory.lookupClass("STANDARD")); + assertSame(StandardTokenizerFactory.class, TokenizerFactory.lookupClass("standard")); } public void testBogusLookupTokenizerClass() { @@ -68,17 +65,13 @@ public class TestAnalysisSPILoader extends LuceneTestCase { } public void testAvailableTokenizers() { - assertTrue(TokenizerFactory.availableTokenizers().contains("whitespace")); + assertTrue(TokenizerFactory.availableTokenizers().contains("standard")); } public void testLookupTokenFilter() { - assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.forName("Lowercase", versionArgOnly()).getClass()); - assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.forName("LOWERCASE", versionArgOnly()).getClass()); - assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.forName("lowercase", versionArgOnly()).getClass()); - - assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.forName("RemoveDuplicates", versionArgOnly()).getClass()); - assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.forName("REMOVEDUPLICATES", versionArgOnly()).getClass()); - assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.forName("removeduplicates", versionArgOnly()).getClass()); + assertSame(FakeTokenFilterFactory.class, TokenFilterFactory.forName("Fake", versionArgOnly()).getClass()); + assertSame(FakeTokenFilterFactory.class, TokenFilterFactory.forName("FAKE", versionArgOnly()).getClass()); + assertSame(FakeTokenFilterFactory.class, TokenFilterFactory.forName("fake", versionArgOnly()).getClass()); } public void testBogusLookupTokenFilter() { @@ -92,13 +85,9 @@ public class TestAnalysisSPILoader extends LuceneTestCase { } public void testLookupTokenFilterClass() { - assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.lookupClass("Lowercase")); - assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.lookupClass("LOWERCASE")); - assertSame(LowerCaseFilterFactory.class, TokenFilterFactory.lookupClass("lowercase")); - - assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.lookupClass("RemoveDuplicates")); - assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.lookupClass("REMOVEDUPLICATES")); - assertSame(RemoveDuplicatesTokenFilterFactory.class, TokenFilterFactory.lookupClass("removeduplicates")); + assertSame(FakeTokenFilterFactory.class, TokenFilterFactory.lookupClass("Fake")); + assertSame(FakeTokenFilterFactory.class, TokenFilterFactory.lookupClass("FAKE")); + assertSame(FakeTokenFilterFactory.class, TokenFilterFactory.lookupClass("fake")); } public void testBogusLookupTokenFilterClass() { @@ -112,14 +101,13 @@ public class TestAnalysisSPILoader extends LuceneTestCase { } public void testAvailableTokenFilters() { - assertTrue(TokenFilterFactory.availableTokenFilters().contains("lowercase")); - assertTrue(TokenFilterFactory.availableTokenFilters().contains("removeDuplicates")); + assertTrue(TokenFilterFactory.availableTokenFilters().contains("fake")); } public void testLookupCharFilter() { - assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.forName("HTMLStrip", versionArgOnly()).getClass()); - assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.forName("HTMLSTRIP", versionArgOnly()).getClass()); - assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.forName("htmlstrip", versionArgOnly()).getClass()); + assertSame(FakeCharFilterFactory.class, CharFilterFactory.forName("Fake", versionArgOnly()).getClass()); + assertSame(FakeCharFilterFactory.class, CharFilterFactory.forName("FAKE", versionArgOnly()).getClass()); + assertSame(FakeCharFilterFactory.class, CharFilterFactory.forName("fake", versionArgOnly()).getClass()); } public void testBogusLookupCharFilter() { @@ -133,9 +121,9 @@ public class TestAnalysisSPILoader extends LuceneTestCase { } public void testLookupCharFilterClass() { - assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.lookupClass("HTMLStrip")); - assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.lookupClass("HTMLSTRIP")); - assertSame(HTMLStripCharFilterFactory.class, CharFilterFactory.lookupClass("htmlstrip")); + assertSame(FakeCharFilterFactory.class, CharFilterFactory.lookupClass("Fake")); + assertSame(FakeCharFilterFactory.class, CharFilterFactory.lookupClass("FAKE")); + assertSame(FakeCharFilterFactory.class, CharFilterFactory.lookupClass("fake")); } public void testBogusLookupCharFilterClass() { @@ -149,6 +137,6 @@ public class TestAnalysisSPILoader extends LuceneTestCase { } public void testAvailableCharFilters() { - assertTrue(CharFilterFactory.availableCharFilters().contains("htmlStrip")); + assertTrue(CharFilterFactory.availableCharFilters().contains("fake")); } } diff --git a/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java b/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java new file mode 100644 index 00000000000..758d503b53c --- /dev/null +++ b/lucene/core/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java @@ -0,0 +1,63 @@ +/* + * 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 org.apache.lucene.analysis.BaseTokenStreamFactoryTestCase; +import org.apache.lucene.analysis.Tokenizer; + +import java.io.Reader; +import java.io.StringReader; + +/** + * Simple tests to ensure the standard lucene factories are working. + */ +public class TestStandardFactories extends BaseTokenStreamFactoryTestCase { + /** + * Test StandardTokenizerFactory + */ + public void testStandardTokenizer() throws Exception { + Reader reader = new StringReader("Wha\u0301t's this thing do?"); + Tokenizer stream = tokenizerFactory("Standard").create(newAttributeFactory()); + stream.setReader(reader); + assertTokenStreamContents(stream, + new String[]{"Wha\u0301t's", "this", "thing", "do"}); + } + + public void testStandardTokenizerMaxTokenLength() throws Exception { + StringBuilder builder = new StringBuilder(); + for (int i = 0 ; i < 100 ; ++i) { + builder.append("abcdefg"); // 7 * 100 = 700 char "word" + } + String longWord = builder.toString(); + String content = "one two three " + longWord + " four five six"; + Reader reader = new StringReader(content); + Tokenizer stream = tokenizerFactory("Standard", + "maxTokenLength", "1000").create(newAttributeFactory()); + stream.setReader(reader); + assertTokenStreamContents(stream, + new String[]{"one", "two", "three", longWord, "four", "five", "six"}); + } + + /** Test that bogus arguments result in exception */ + public void testBogusArguments() throws Exception { + IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> { + tokenizerFactory("Standard", "bogusArg", "bogusValue"); + }); + assertTrue(expected.getMessage().contains("Unknown parameters")); + } +} diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/analysis/AnalysisChainDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/analysis/AnalysisChainDialogFactory.java index 002fdca277f..6a79e322d37 100644 --- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/analysis/AnalysisChainDialogFactory.java +++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/analysis/AnalysisChainDialogFactory.java @@ -37,9 +37,9 @@ import java.awt.Window; import java.io.IOException; import org.apache.lucene.analysis.custom.CustomAnalyzer; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.luke.app.desktop.Preferences; import org.apache.lucene.luke.app.desktop.PreferencesFactory; import org.apache.lucene.luke.app.desktop.util.DialogOpener; diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/analysis/Analysis.java b/lucene/luke/src/java/org/apache/lucene/luke/models/analysis/Analysis.java index 355223febcd..2bcdaeefde1 100644 --- a/lucene/luke/src/java/org/apache/lucene/luke/models/analysis/Analysis.java +++ b/lucene/luke/src/java/org/apache/lucene/luke/models/analysis/Analysis.java @@ -23,9 +23,9 @@ import java.util.Map; import java.util.Objects; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.luke.models.LukeException; /** diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/analysis/AnalysisImpl.java b/lucene/luke/src/java/org/apache/lucene/luke/models/analysis/AnalysisImpl.java index 39bcbc7b8dc..8c58df976a2 100644 --- a/lucene/luke/src/java/org/apache/lucene/luke/models/analysis/AnalysisImpl.java +++ b/lucene/luke/src/java/org/apache/lucene/luke/models/analysis/AnalysisImpl.java @@ -43,9 +43,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.custom.CustomAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.luke.models.LukeException; import org.apache.lucene.luke.util.reflection.ClassScanner; import org.apache.lucene.util.AttributeImpl; diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/util/twentynewsgroups/Message.java b/lucene/luke/src/java/org/apache/lucene/luke/models/util/twentynewsgroups/Message.java index e62d2c052d4..e28b73ebefa 100644 --- a/lucene/luke/src/java/org/apache/lucene/luke/models/util/twentynewsgroups/Message.java +++ b/lucene/luke/src/java/org/apache/lucene/luke/models/util/twentynewsgroups/Message.java @@ -24,7 +24,7 @@ import java.util.Objects; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper; import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.analysis.standard.UAX29URLEmailAnalyzer; +import org.apache.lucene.analysis.email.UAX29URLEmailAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilterFactory.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilterFactory.java index 19b56262504..90f3c8aa8fd 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilterFactory.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilterFactory.java @@ -23,9 +23,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 SuggestStopFilter}. diff --git a/lucene/suggest/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/lucene/suggest/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory similarity index 100% rename from lucene/suggest/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to lucene/suggest/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java index 28cf7f62892..71dc4f6ee11 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java @@ -23,8 +23,8 @@ import java.util.Map; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.en.EnglishAnalyzer; -import org.apache.lucene.analysis.util.ClasspathResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ClasspathResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.Version; public class TestSuggestStopFilterFactory extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamFactoryTestCase.java similarity index 93% rename from lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java rename to lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamFactoryTestCase.java index 5a41454fc1c..4e5fb87d1a1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamFactoryTestCase.java @@ -14,14 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.lucene.analysis.util; +package org.apache.lucene.analysis; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.util.ClasspathResourceLoader; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.lucene.util.Version; /** @@ -37,10 +39,6 @@ import org.apache.lucene.util.Version; * assertTokenStreamContents(stream, new String[] { "some", "text", "to", "analyze" }); * */ -// TODO: this has to be here, since the abstract factories are not in lucene-core, -// so test-framework doesnt know about them... -// this also means we currently cannot use this in other analysis modules :( -// TODO: maybe after we improve the abstract factory/SPI apis, they can sit in core and resolve this. public abstract class BaseTokenStreamFactoryTestCase extends BaseTokenStreamTestCase { private AbstractAnalysisFactory analysisFactory(Class clazz, Version matchVersion, ResourceLoader loader, String... keysAndValues) throws Exception { diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java index eaf2aedc601..6fd464f54e1 100644 --- a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java +++ b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java @@ -27,7 +27,7 @@ import org.apache.commons.io.IOUtils; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.collation.ICUCollationKeyAnalyzer; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java index f164080a7b8..fcdf198887b 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java +++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java @@ -22,7 +22,7 @@ import java.io.FileOutputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.lucene.analysis.util.FilesystemResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.analysis.util.StringMockResourceLoader; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java index 569b1bb2307..8dc5f841c3b 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.commongrams.CommonGramsFilterFactory; import org.apache.lucene.analysis.core.StopFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.solr.analysis.TokenizerChain; import org.apache.solr.core.SolrCore; import org.apache.solr.schema.IndexSchema; diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java index 65bbbdd7d92..3e0931022e0 100644 --- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java +++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/search/LTRQParserPlugin.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java index cada1f0492a..9dfbc566331 100644 --- a/solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java @@ -20,7 +20,7 @@ import java.util.Map; import org.apache.lucene.analysis.core.LowerCaseFilterFactory; 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; diff --git a/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java index 560917d7538..4a8f36219a8 100644 --- a/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java @@ -19,7 +19,7 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.reverse.ReverseStringFilter; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; /** * Factory for {@link ReversedWildcardFilter}-s. When this factory is diff --git a/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java b/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java index 993804544be..9533f3dc394 100644 --- a/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java +++ b/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.custom.CustomAnalyzer; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; /** * An analyzer that uses a tokenizer and a list of token filters to diff --git a/solr/core/src/java/org/apache/solr/api/CustomContainerPlugins.java b/solr/core/src/java/org/apache/solr/api/CustomContainerPlugins.java index ef33c3e2a4c..93de2e3de50 100644 --- a/solr/core/src/java/org/apache/solr/api/CustomContainerPlugins.java +++ b/solr/core/src/java/org/apache/solr/api/CustomContainerPlugins.java @@ -30,7 +30,7 @@ import java.util.Objects; import java.util.Optional; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.request.beans.PluginMeta; import org.apache.solr.common.MapWriter; diff --git a/solr/core/src/java/org/apache/solr/core/PluginBag.java b/solr/core/src/java/org/apache/solr/core/PluginBag.java index 1708005e7de..bdafa722690 100644 --- a/solr/core/src/java/org/apache/solr/core/PluginBag.java +++ b/solr/core/src/java/org/apache/solr/core/PluginBag.java @@ -30,8 +30,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.solr.api.Api; import org.apache.solr.api.ApiBag; import org.apache.solr.api.ApiSupport; diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java index 955635aa456..15c8f107c74 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java @@ -64,7 +64,7 @@ import com.codahale.metrics.Timer; import com.google.common.collect.Iterators; import com.google.common.collect.MapMaker; import org.apache.commons.io.FileUtils; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexDeletionPolicy; diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java index 532f1dd3896..dbfb0d56485 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java +++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java @@ -48,12 +48,12 @@ import java.util.stream.Collectors; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; +import org.apache.lucene.analysis.CharFilterFactory; +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.analysis.WordlistLoader; -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.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; diff --git a/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java index 8dbbdc16d4f..9f478db8a19 100644 --- a/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java +++ b/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java @@ -39,9 +39,9 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeImpl; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java index 5bb122f49ce..67b60090536 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java @@ -31,9 +31,9 @@ import java.util.TreeMap; import java.util.TreeSet; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.DirectoryReader; diff --git a/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java index 575a358ae0f..ca182708ae8 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/PhrasesIdentificationComponent.java @@ -37,7 +37,7 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java index e2a9f90688f..c53fb7a1090 100644 --- a/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/tagger/TaggerRequestHandler.java @@ -38,7 +38,7 @@ import com.google.common.io.CharStreams; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.StopFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.ReaderUtil; import org.apache.lucene.index.Terms; diff --git a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java index 1a2795cfbaa..bea7df39f7d 100644 --- a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java +++ b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java @@ -30,7 +30,7 @@ import java.util.stream.Collectors; import com.google.common.base.Strings; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.reverse.ReverseStringFilter; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.index.Term; import org.apache.lucene.search.AutomatonQuery; import org.apache.lucene.search.BooleanClause; diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java b/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java index c10af0c2d29..bbdf66b6cc2 100644 --- a/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java +++ b/solr/core/src/java/org/apache/solr/pkg/PackageListeningClassLoader.java @@ -17,7 +17,7 @@ package org.apache.solr.pkg; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.solr.common.MapWriter; import org.apache.solr.common.SolrException; import org.apache.solr.core.CoreContainer; diff --git a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java index 3a2bf4d029b..332de74f962 100644 --- a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java +++ b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java @@ -20,7 +20,7 @@ package org.apache.solr.pkg; import java.io.IOException; import java.lang.invoke.MethodHandles; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.solr.common.MapWriter; import org.apache.solr.common.SolrException; import org.apache.solr.core.PluginBag; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/BaseManagedTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/BaseManagedTokenFilterFactory.java index 6cdd2786bb3..5632b004dfc 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/BaseManagedTokenFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/BaseManagedTokenFilterFactory.java @@ -18,9 +18,9 @@ package org.apache.solr.rest.schema.analysis; import java.io.IOException; import java.util.Map; -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.solr.core.SolrResourceLoader; import org.apache.solr.rest.ManagedResource; import org.apache.solr.rest.ManagedResourceObserver; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java index c9b4a7a959c..69dcf8050ec 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java @@ -32,7 +32,7 @@ import org.apache.lucene.analysis.core.FlattenGraphFilterFactory; // javadocs import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.synonym.SynonymFilterFactory; import org.apache.lucene.analysis.synonym.SynonymMap; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymGraphFilterFactory.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymGraphFilterFactory.java index 78d87573781..0f00947d784 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymGraphFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymGraphFilterFactory.java @@ -31,7 +31,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.synonym.SynonymGraphFilterFactory; import org.apache.lucene.analysis.synonym.SynonymMap; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/schema/CollationField.java b/solr/core/src/java/org/apache/solr/schema/CollationField.java index 3b5d2b8d931..5a4881cd467 100644 --- a/solr/core/src/java/org/apache/solr/schema/CollationField.java +++ b/solr/core/src/java/org/apache/solr/schema/CollationField.java @@ -31,7 +31,7 @@ import org.apache.commons.io.IOUtils; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.collation.CollationKeyAnalyzer; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; diff --git a/solr/core/src/java/org/apache/solr/schema/CurrencyField.java b/solr/core/src/java/org/apache/solr/schema/CurrencyField.java index 301dba396da..5acff21cfb6 100644 --- a/solr/core/src/java/org/apache/solr/schema/CurrencyField.java +++ b/solr/core/src/java/org/apache/solr/schema/CurrencyField.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java b/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java index f7f5dbf0669..38e2d570d96 100644 --- a/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/CurrencyFieldType.java @@ -24,8 +24,8 @@ import java.util.Currency; import java.util.List; import java.util.Map; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.lucene.document.StoredField; import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.LeafReaderContext; diff --git a/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java b/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java index 34c12e36027..7bcd12c1dd2 100644 --- a/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java +++ b/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java @@ -18,7 +18,7 @@ package org.apache.solr.schema; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.common.SolrException; /** diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.java index daac8c04bad..c29eecc9596 100644 --- a/solr/core/src/java/org/apache/solr/schema/FieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java @@ -33,9 +33,9 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.BytesTermAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.index.IndexableField; @@ -78,7 +78,7 @@ import org.apache.solr.uninverting.UninvertingReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.lucene.analysis.util.AbstractAnalysisFactory.LUCENE_MATCH_VERSION_PARAM; +import static org.apache.lucene.analysis.AbstractAnalysisFactory.LUCENE_MATCH_VERSION_PARAM; /** * Base class for all field types used by an index schema. diff --git a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java index a7843879717..4c9303d1a51 100644 --- a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java +++ b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java @@ -28,9 +28,9 @@ import java.util.Objects; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.KeywordAnalyzer; -import org.apache.lucene.analysis.util.CharFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.Version; import org.apache.solr.analysis.TokenizerChain; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/schema/FileExchangeRateProvider.java b/solr/core/src/java/org/apache/solr/schema/FileExchangeRateProvider.java index dabf688c888..01cafc09fdc 100644 --- a/solr/core/src/java/org/apache/solr/schema/FileExchangeRateProvider.java +++ b/solr/core/src/java/org/apache/solr/schema/FileExchangeRateProvider.java @@ -29,7 +29,7 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.util.SafeXMLParsing; import org.slf4j.Logger; diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java index f8c0c4fd1b4..c1815e01d45 100644 --- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java +++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java @@ -41,10 +41,10 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.io.IOUtils; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.util.CharFilterFactory; -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.analysis.CharFilterFactory; +import org.apache.lucene.util.ResourceLoaderAware; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.Version; import org.apache.solr.analysis.TokenizerChain; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java b/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java index d0a204be0c5..ee7b421291f 100644 --- a/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java +++ b/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java @@ -27,7 +27,7 @@ import java.util.Set; import org.apache.solr.common.util.SuppressForbidden; import org.noggit.JSONParser; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.slf4j.Logger; diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java index 8f234f0bc35..42fa5043a79 100644 --- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java +++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java @@ -33,7 +33,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.StopFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.FunctionScoreQuery; diff --git a/solr/core/src/java/org/apache/solr/security/MultiDestinationAuditLogger.java b/solr/core/src/java/org/apache/solr/security/MultiDestinationAuditLogger.java index c636405496c..7826c866620 100644 --- a/solr/core/src/java/org/apache/solr/security/MultiDestinationAuditLogger.java +++ b/solr/core/src/java/org/apache/solr/security/MultiDestinationAuditLogger.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.solr.common.SolrException; import org.apache.solr.metrics.SolrMetricsContext; import org.slf4j.Logger; diff --git a/solr/core/src/java/org/apache/solr/util/PayloadUtils.java b/solr/core/src/java/org/apache/solr/util/PayloadUtils.java index 2e404df40e6..7bcfd732f10 100644 --- a/solr/core/src/java/org/apache/solr/util/PayloadUtils.java +++ b/solr/core/src/java/org/apache/solr/util/PayloadUtils.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.payloads.DelimitedPayloadTokenFilterFactory; import org.apache.lucene.analysis.payloads.NumericPayloadTokenFilterFactory; import org.apache.lucene.analysis.payloads.PayloadHelper; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.index.Term; import org.apache.lucene.queries.payloads.AveragePayloadFunction; import org.apache.lucene.queries.payloads.MaxPayloadFunction; diff --git a/solr/core/src/java/org/apache/solr/util/SafeXMLParsing.java b/solr/core/src/java/org/apache/solr/util/SafeXMLParsing.java index 6d8dbf79ca8..18bd668817e 100644 --- a/solr/core/src/java/org/apache/solr/util/SafeXMLParsing.java +++ b/solr/core/src/java/org/apache/solr/util/SafeXMLParsing.java @@ -28,7 +28,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.io.input.CloseShieldInputStream; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.common.EmptyEntityResolver; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.SuppressForbidden; diff --git a/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java b/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java index c2085209a40..1be999a2c61 100644 --- a/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java +++ b/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java @@ -16,7 +16,7 @@ */ package org.apache.solr.util; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.xml.sax.InputSource; import org.xml.sax.EntityResolver; diff --git a/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java b/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java index baae45df49e..db18e1204b8 100644 --- a/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java +++ b/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java @@ -32,7 +32,7 @@ import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.util.SystemIdResolver; import org.apache.solr.common.util.XMLErrorLogger; import org.apache.solr.core.SolrConfig; diff --git a/solr/core/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory b/solr/core/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory similarity index 100% rename from solr/core/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory rename to solr/core/src/resources/META-INF/services/org.apache.lucene.analysis.TokenFilterFactory diff --git a/solr/core/src/test/org/apache/solr/analysis/ProtectedTermFilterFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/ProtectedTermFilterFactoryTest.java index 5c776dd2cd0..aaecb0f39c8 100644 --- a/solr/core/src/test/org/apache/solr/analysis/ProtectedTermFilterFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/analysis/ProtectedTermFilterFactoryTest.java @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.ProtectedTermFilterFactory; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.core.SolrResourceLoader; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java index 2becb665d27..61d1bb5c4d7 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilterFactory; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.lucene.util.Version; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.core.SolrResourceLoader; diff --git a/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java index 19b52c2f61a..0dc2a573b19 100644 --- a/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java @@ -18,7 +18,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.TokenFilterFactory; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/solr/core/src/test/org/apache/solr/analysis/TokenizerChainTest.java b/solr/core/src/test/org/apache/solr/analysis/TokenizerChainTest.java index d41e64108ae..c2c45b7a731 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TokenizerChainTest.java +++ b/solr/core/src/test/org/apache/solr/analysis/TokenizerChainTest.java @@ -20,7 +20,7 @@ import java.util.Collections; import org.apache.lucene.analysis.core.LowerCaseFilterFactory; import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilterFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.util.BytesRef; import org.apache.solr.SolrTestCaseJ4; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java index 493e352217a..2169cc44114 100644 --- a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java +++ b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java @@ -33,9 +33,9 @@ import java.util.jar.JarOutputStream; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.KeywordTokenizerFactory; import org.apache.lucene.analysis.ngram.NGramFilterFactory; -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.ResourceLoaderAware; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; import org.apache.solr.handler.admin.LukeRequestHandler; diff --git a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java index 4d905e2c5b6..5ab5a184c63 100644 --- a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java @@ -30,8 +30,8 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.FlagsAttribute; import org.apache.lucene.analysis.tokenattributes.FlagsAttributeImpl; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.solr.analysis.TokenizerChain; import org.apache.solr.client.solrj.request.FieldAnalysisRequest; diff --git a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java index 7e5bc9ba97c..4c37c1729ee 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java +++ b/solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java @@ -25,8 +25,8 @@ import java.util.concurrent.Callable; import com.google.common.collect.ImmutableMap; import org.apache.commons.io.IOUtils; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.solr.api.Command; import org.apache.solr.api.EndPoint; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/WordLengthTaggingFilterFactory.java b/solr/core/src/test/org/apache/solr/handler/tagger/WordLengthTaggingFilterFactory.java index 65a7c23a58b..89b725900a5 100644 --- a/solr/core/src/test/org/apache/solr/handler/tagger/WordLengthTaggingFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/handler/tagger/WordLengthTaggingFilterFactory.java @@ -26,7 +26,7 @@ import java.lang.invoke.MethodHandles; 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.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java index f28233f280a..0f5fbc87916 100644 --- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java +++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java @@ -26,8 +26,9 @@ import java.util.Map; import java.util.concurrent.Callable; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoaderAware; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrRequest; @@ -80,6 +81,7 @@ import static org.hamcrest.CoreMatchers.containsString; @LogLevel("org.apache.solr.pkg.PackageLoader=DEBUG;org.apache.solr.pkg.PackageAPI=DEBUG") //@org.apache.lucene.util.LuceneTestCase.AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-13822") // leaks files +@LuceneTestCase.AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-14901") public class TestPackages extends SolrCloudTestCase { @Before diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java index 88b9d862e3a..6cef7cd4d5a 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java @@ -268,7 +268,7 @@ public class TestBulkSchemaAPI extends RestTestBase { List errorList = (List)((Map)details.get(0)).get("errorMessages"); assertEquals(1, errorList.size()); assertTrue (((String)errorList.get(0)).contains - ("A SPI class of type org.apache.lucene.analysis.util.TokenizerFactory with name 'bogus' does not exist.")); + ("A SPI class of type org.apache.lucene.analysis.TokenizerFactory with name 'bogus' does not exist.")); } public void testAddFieldMatchingExistingDynamicField() throws Exception { diff --git a/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java b/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java index e837e5d2af6..c09eecf4a40 100644 --- a/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java +++ b/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java @@ -21,8 +21,8 @@ import java.util.Random; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.KeywordTokenizerFactory; -import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.util.CharFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.CharFilterFactory; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.analysis.TokenizerChain; diff --git a/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java b/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java index ec72837550a..2a05038805b 100644 --- a/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java +++ b/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java @@ -20,7 +20,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java index eb44c166011..1cab50629be 100644 --- a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java +++ b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java @@ -18,7 +18,7 @@ package org.apache.solr.schema; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.SuppressForbidden; diff --git a/solr/core/src/test/org/apache/solr/util/TestSafeXMLParsing.java b/solr/core/src/test/org/apache/solr/util/TestSafeXMLParsing.java index abdd88df655..542cd18a6a7 100644 --- a/solr/core/src/test/org/apache/solr/util/TestSafeXMLParsing.java +++ b/solr/core/src/test/org/apache/solr/util/TestSafeXMLParsing.java @@ -22,7 +22,7 @@ import java.io.InputStream; import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.SolrTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java b/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java index b1d585baf1f..18a7f70549b 100644 --- a/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java +++ b/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java @@ -22,7 +22,7 @@ import java.nio.file.Path; import java.util.Arrays; import org.apache.commons.io.IOUtils; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.core.SolrResourceLoader; import org.xml.sax.InputSource; diff --git a/solr/solr-ref-guide/src/filter-descriptions.adoc b/solr/solr-ref-guide/src/filter-descriptions.adoc index dca30260c45..d630b6b7135 100644 --- a/solr/solr-ref-guide/src/filter-descriptions.adoc +++ b/solr/solr-ref-guide/src/filter-descriptions.adoc @@ -50,7 +50,7 @@ You configure each filter with a `` element in `schema.xml` as a child o ==== -- -The name/class attribute names a factory class that will instantiate a filter object as needed. Filter factory classes must implement the `org.apache.lucene.analysis.util.TokenFilterFactory` interface. Like tokenizers, filters are also instances of TokenStream and thus are producers of tokens. Unlike tokenizers, filters also consume tokens from a TokenStream. This allows you to mix and match filters, in any order you prefer, downstream of a tokenizer. +The name/class attribute names a factory class that will instantiate a filter object as needed. Filter factory classes must implement the `org.apache.lucene.analysis.TokenFilterFactory` interface. Like tokenizers, filters are also instances of TokenStream and thus are producers of tokens. Unlike tokenizers, filters also consume tokens from a TokenStream. This allows you to mix and match filters, in any order you prefer, downstream of a tokenizer. Arguments may be passed to tokenizer factories to modify their behavior by setting attributes on the `` element. For example: diff --git a/solr/solr-ref-guide/src/tokenizers.adoc b/solr/solr-ref-guide/src/tokenizers.adoc index 5ed20645441..64ee6c19aab 100644 --- a/solr/solr-ref-guide/src/tokenizers.adoc +++ b/solr/solr-ref-guide/src/tokenizers.adoc @@ -50,7 +50,7 @@ You configure the tokenizer for a text field type in `schema.xml` with a `` element. diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java b/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java index 1dc25493600..54bca8c44dc 100644 --- a/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java @@ -20,7 +20,7 @@ import java.io.Reader; import java.util.Map; import org.apache.lucene.analysis.MockCharFilter; -import org.apache.lucene.analysis.util.CharFilterFactory; +import org.apache.lucene.analysis.CharFilterFactory; /** * Factory for {@link MockCharFilter} for testing purposes. diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java index 962a2f72810..7780da1c15b 100644 --- a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.lucene.analysis.MockTokenFilter; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.util.TokenFilterFactory; +import org.apache.lucene.analysis.TokenFilterFactory; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java index 5de6efb99f0..c8376abdd37 100644 --- a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.Map; import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.util.TokenizerFactory; +import org.apache.lucene.analysis.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; import org.apache.lucene.util.automaton.CharacterRunAutomaton; diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java b/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java index 4b79cf080c3..a28ecbcb6a6 100644 --- a/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java +++ b/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.util.ResourceLoader; class StringMockSolrResourceLoader implements ResourceLoader { String text;