From fa734b88b9716d590ea1515b84015ecbe43cec93 Mon Sep 17 00:00:00 2001 From: Peter Somogyi Date: Wed, 17 Oct 2018 23:00:53 +0200 Subject: [PATCH 1/2] SOLR-12881: Remove unneeded import statements --- .../ar/ArabicNormalizationFilterFactory.java | 1 - .../lucene/analysis/ar/ArabicStemFilterFactory.java | 1 - .../analysis/bg/BulgarianStemFilterFactory.java | 1 - .../analysis/br/BrazilianStemFilterFactory.java | 1 - .../lucene/analysis/cjk/CJKBigramFilterFactory.java | 1 - .../lucene/analysis/cjk/CJKWidthFilterFactory.java | 1 - .../commongrams/CommonGramsQueryFilterFactory.java | 2 -- .../lucene/analysis/core/UpperCaseFilterFactory.java | 1 - .../lucene/analysis/cz/CzechStemFilterFactory.java | 1 - .../analysis/de/GermanLightStemFilterFactory.java | 1 - .../analysis/de/GermanMinimalStemFilterFactory.java | 1 - .../de/GermanNormalizationFilterFactory.java | 1 - .../lucene/analysis/de/GermanStemFilterFactory.java | 1 - .../analysis/el/GreekLowerCaseFilterFactory.java | 1 - .../lucene/analysis/el/GreekStemFilterFactory.java | 1 - .../analysis/en/EnglishMinimalStemFilterFactory.java | 1 - .../analysis/en/EnglishPossessiveFilterFactory.java | 1 - .../lucene/analysis/en/KStemFilterFactory.java | 1 - .../lucene/analysis/en/PorterStemFilterFactory.java | 1 - .../analysis/es/SpanishLightStemFilterFactory.java | 1 - .../lucene/analysis/fa/PersianCharFilterFactory.java | 1 - .../fa/PersianNormalizationFilterFactory.java | 1 - .../analysis/fi/FinnishLightStemFilterFactory.java | 1 - .../analysis/fr/FrenchLightStemFilterFactory.java | 1 - .../analysis/fr/FrenchMinimalStemFilterFactory.java | 1 - .../analysis/ga/IrishLowerCaseFilterFactory.java | 1 - .../gl/GalicianMinimalStemFilterFactory.java | 1 - .../analysis/gl/GalicianStemFilterFactory.java | 1 - .../analysis/hi/HindiNormalizationFilterFactory.java | 1 - .../lucene/analysis/hi/HindiStemFilterFactory.java | 1 - .../analysis/hu/HungarianLightStemFilterFactory.java | 1 - .../analysis/id/IndonesianStemFilterFactory.java | 1 - .../analysis/in/IndicNormalizationFilterFactory.java | 1 - .../analysis/it/ItalianLightStemFilterFactory.java | 1 - .../lucene/analysis/lv/LatvianStemFilterFactory.java | 1 - .../miscellaneous/ASCIIFoldingFilterFactory.java | 1 - .../miscellaneous/HyphenatedWordsFilterFactory.java | 1 - .../RemoveDuplicatesTokenFilterFactory.java | 1 - .../analysis/miscellaneous/TrimFilterFactory.java | 1 - .../analysis/no/NorwegianLightStemFilterFactory.java | 1 - .../no/NorwegianMinimalStemFilterFactory.java | 1 - .../TokenOffsetPayloadTokenFilterFactory.java | 1 - .../payloads/TypeAsPayloadTokenFilterFactory.java | 1 - .../pt/PortugueseLightStemFilterFactory.java | 1 - .../pt/PortugueseMinimalStemFilterFactory.java | 1 - .../analysis/pt/PortugueseStemFilterFactory.java | 1 - .../analysis/reverse/ReverseStringFilterFactory.java | 1 - .../analysis/ru/RussianLightStemFilterFactory.java | 1 - .../analysis/standard/ClassicFilterFactory.java | 1 - .../analysis/sv/SwedishLightStemFilterFactory.java | 1 - .../analysis/tr/TurkishLowerCaseFilterFactory.java | 1 - .../analysis/commongrams/CommonGramsFilterTest.java | 6 +++++- .../TestDelimitedPayloadTokenFilterFactory.java | 1 - .../analysis/standard/TestUAX29URLEmailAnalyzer.java | 1 - .../standard/TestUAX29URLEmailTokenizer.java | 2 -- .../analysis/standard/GenerateJflexTLDMacros.java | 2 -- .../lucene/analysis/icu/ICUFoldingFilterFactory.java | 1 - .../lucene/collation/ICUCollationKeyAnalyzer.java | 1 - .../analysis/ja/JapaneseBaseFormFilterFactory.java | 1 - .../ja/JapaneseIterationMarkCharFilterFactory.java | 1 - .../ja/JapaneseKatakanaStemFilterFactory.java | 1 - .../ja/JapaneseReadingFormFilterFactory.java | 1 - .../phonetic/DoubleMetaphoneFilterFactory.java | 1 - .../phonetic/TestDoubleMetaphoneFilterFactory.java | 1 - .../stempel/StempelPolishStemFilterFactory.java | 2 -- .../lucene/index/TestManyPointsInOldIndex.java | 2 -- .../codecs/memory/DirectDocValuesProducer.java | 1 - .../codecs/simpletext/SimpleTextBKDReader.java | 1 - .../codecs/simpletext/SimpleTextDocValuesReader.java | 1 - .../TestVarGapDocFreqIntervalPostingsFormat.java | 1 - .../TestVarGapFixedIntervalPostingsFormat.java | 1 - .../org/apache/lucene/analysis/CharArrayMap.java | 2 -- .../org/apache/lucene/analysis/LowerCaseFilter.java | 3 --- .../java/org/apache/lucene/analysis/StopFilter.java | 3 --- .../apache/lucene/analysis/StopwordAnalyzerBase.java | 1 - .../apache/lucene/store/ByteBuffersDataInput.java | 2 -- .../apache/lucene/store/ByteBuffersIndexInput.java | 3 --- .../lucene/store/GrowableByteArrayDataOutput.java | 1 - .../apache/lucene/store/InputStreamDataInput.java | 2 -- .../org/apache/lucene/store/NRTCachingDirectory.java | 1 - .../java/org/apache/lucene/util/MergedIterator.java | 2 -- .../org/apache/lucene/analysis/TestCharArrayMap.java | 2 -- .../org/apache/lucene/analysis/TestCharArraySet.java | 1 - .../apache/lucene/analysis/TestWordlistLoader.java | 2 -- .../test/org/apache/lucene/codecs/TestCodecUtil.java | 1 - .../codecs/lucene70/TestLucene70DocValuesFormat.java | 1 - .../org/apache/lucene/index/TestMultiTermsEnum.java | 11 ----------- .../test/org/apache/lucene/index/TestOrdinalMap.java | 1 - .../org/apache/lucene/index/TestPointValues.java | 1 - .../org/apache/lucene/index/TestTermVectors.java | 4 ---- .../apache/lucene/store/TestSleepingLockWrapper.java | 4 ---- .../org/apache/lucene/util/TestBytesRefArray.java | 6 ------ .../apache/lucene/util/packed/TestDirectPacked.java | 2 -- .../lucene/expressions/js/JavascriptLexer.java | 6 ++++-- .../taxonomy/writercache/LruTaxonomyWriterCache.java | 1 - .../writercache/UTF8TaxonomyWriterCache.java | 1 - .../lucene/facet/TestLongValueFacetCounts.java | 3 --- .../apache/lucene/facet/taxonomy/TestLRUHashMap.java | 1 - .../org/apache/lucene/store/NativeUnixDirectory.java | 1 - .../org/apache/lucene/store/WindowsDirectory.java | 2 -- .../org/apache/lucene/spatial3d/geom/Geo3DUtil.java | 12 ------------ .../lucene/search/spell/WordBreakSpellChecker.java | 1 - .../apache/lucene/analysis/CannedTokenStream.java | 1 - .../lucene/codecs/blockterms/LuceneFixedGap.java | 6 ------ .../blockterms/LuceneVarGapDocFreqInterval.java | 7 ------- .../codecs/blockterms/LuceneVarGapFixedInterval.java | 7 ------- .../java/org/apache/lucene/util/LuceneTestCase.java | 1 - .../apache/lucene/mockfile/TestHandleTrackingFS.java | 5 ----- .../org/apache/lucene/mockfile/TestWindowsFS.java | 2 -- .../org/apache/lucene/util/TestGroupFiltering.java | 2 -- .../org/apache/lucene/util/TestMaxFailuresRule.java | 1 - .../org/apache/lucene/util/TestReproduceMessage.java | 1 - .../org/apache/lucene/util/TestSeedFromUncaught.java | 1 - .../lucene/util/TestSetupTeardownChaining.java | 1 - .../lucene/util/TestWorstCaseTestBehavior.java | 1 - .../test/org/apache/lucene/util/WithNestedTests.java | 7 ------- .../lucene/dependencies/InterpolatedProperties.java | 4 ---- .../lucene/validation/LibVersionsCheckTask.java | 1 - solr/CHANGES.txt | 2 ++ .../function/reduction/data/CountCollector.java | 1 - .../function/reduction/data/MaxCollector.java | 1 - .../function/reduction/data/MinCollector.java | 1 - .../function/reduction/data/SortedListCollector.java | 1 - .../function/reduction/data/SumCollector.java | 1 - .../function/reduction/data/UniqueCollector.java | 1 - .../function/mapping/EqualFunctionTest.java | 1 - .../function/mapping/ExistsFunctionTest.java | 1 - .../solr/handler/dataimport/TestContextImpl.java | 1 - .../apache/solr/ltr/model/NeuralNetworkModel.java | 1 - .../solr/ltr/store/rest/TestManagedFeatureStore.java | 1 - .../java/org/apache/solr/handler/IndexFetcher.java | 1 - .../solr/index/SlowCompositeReaderWrapper.java | 1 - .../search/similarities/IBSimilarityFactory.java | 1 - .../apache/solr/cloud/ChaosMonkeyShardSplitTest.java | 4 ---- .../org/apache/solr/cloud/TestStressLiveNodes.java | 1 - .../org/apache/solr/core/TestSolrIndexConfig.java | 1 - .../PhrasesIdentificationComponentTest.java | 1 - .../component/TestHttpShardHandlerFactory.java | 2 -- .../org/apache/solr/legacy/TestLegacyFieldReuse.java | 3 --- .../apache/solr/legacy/TestLegacyNumericUtils.java | 1 - .../legacy/TestMultiValuedNumericRangeQuery.java | 2 -- .../apache/solr/legacy/TestNumericTokenStream.java | 2 -- .../response/TestPHPSerializedResponseWriter.java | 3 --- .../apache/solr/response/TestSolrQueryResponse.java | 2 -- .../apache/solr/schema/ChangedSchemaMergeTest.java | 1 - .../org/apache/solr/schema/TestCloudSchemaless.java | 1 - .../apache/solr/search/TestHashQParserPlugin.java | 4 +++- .../solr/update/TestAtomicUpdateErrorCases.java | 1 - .../processor/CustomUpdateRequestProcessor.java | 2 -- .../CustomUpdateRequestProcessorFactory.java | 2 -- .../processor/DefaultValueUpdateProcessorTest.java | 2 -- .../DocExpirationUpdateProcessorFactoryTest.java | 2 -- .../update/processor/URLClassifyProcessorTest.java | 2 -- .../java/org/apache/solr/common/util/PathTrie.java | 2 -- .../io/stream/expr/StreamExpressionParserTest.java | 4 ---- .../solrj/request/TestCollectionAdminRequest.java | 1 - .../org/apache/solr/common/SolrDocumentTest.java | 2 -- .../apache/solr/common/TestToleratedUpdateError.java | 2 +- .../org/apache/solr/common/util/TestPathTrie.java | 1 - 159 files changed, 15 insertions(+), 265 deletions(-) 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 8921cd8e0a6c..8e8a83be5170 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.ar.ArabicNormalizationFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 c83ab87ab969..93864e779c8a 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.ar.ArabicStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 32dae380392f..380adbd11e16 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.bg.BulgarianStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 2ceb3639d3fa..065bdcc2db9c 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.br.BrazilianStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 58cc83b2ddec..e0c60977b884 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.cjk.CJKBigramFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 f1ee59c0e37a..fbad5f4332c1 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.cjk.CJKWidthFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java index 1523e3002c9b..2d65c57a7919 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java @@ -21,8 +21,6 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.commongrams.CommonGramsFilter; -import org.apache.lucene.analysis.commongrams.CommonGramsQueryFilter; /** * Construct {@link CommonGramsQueryFilter}. 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 5c45763af026..9e3b3729eb86 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.core.UpperCaseFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 0fa30ae5a7b8..2e4ff76415ce 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.cz.CzechStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 73912be114aa..b85faa466c17 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.de.GermanLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 ffa6cbfd54a8..f0ccfa9464bd 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.de.GermanMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 d6662fbb21a5..77c3f553bfb7 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.de.GermanNormalizationFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 0112ee781ec7..545fcfff8e22 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 @@ -19,7 +19,6 @@ import java.util.Map; -import org.apache.lucene.analysis.de.GermanStemFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 57d542ea56e3..c47bfd3f9983 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.el.GreekLowerCaseFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 b021f89c870f..4ced77949fc9 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.el.GreekStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 e6a600eff0c3..062579bff7fb 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.en.EnglishMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 23525a79209d..ef090937c7db 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.en.EnglishPossessiveFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 9333eb53351c..b72c805b33db 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,6 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.en.KStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 644a263b75de..b62865c90d58 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.en.PorterStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 6777b4152ce9..7ad81faccfa7 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.es.SpanishLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 61d0e76939f2..8a661f3dc978 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 @@ -21,7 +21,6 @@ import java.util.Map; import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.fa.PersianCharFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.CharFilterFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; 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 584a7a85b462..9775f484cc21 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 @@ -19,7 +19,6 @@ import java.util.Map; -import org.apache.lucene.analysis.fa.PersianNormalizationFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; 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 3e49ed8c77ee..02719ff781d4 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.fi.FinnishLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 9da5f5cab3f4..1f957d230086 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.fr.FrenchLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 b2c2a3e6979d..b6e91a2ec3c6 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.fr.FrenchMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 b6b3cb2acd12..5ece3651f1cd 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.ga.IrishLowerCaseFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 09065ee39008..c739c7ed4166 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.gl.GalicianMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 968aee47e27a..bd4bcf1409d0 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.gl.GalicianStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 8a9dec2f0c61..80d50a43be36 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.hi.HindiNormalizationFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 33fb1b5a5a07..e0562a46cff9 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.hi.HindiStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 da78479838b5..6720fd18b48f 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.hu.HungarianLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 1d4058db29cc..d81426b151c3 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.id.IndonesianStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 5a742a6570b8..07ac2142db44 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.in.IndicNormalizationFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 9e9929ceb91f..2c324a4fc302 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.it.ItalianLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 03ba3551694e..0be282891d6d 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.lv.LatvianStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 31e7ba22edb9..b42c878d835c 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 @@ -23,7 +23,6 @@ import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter; import org.apache.lucene.analysis.TokenStream; /** 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 a81bb98d1dc9..f55a49df8dae 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.miscellaneous.HyphenatedWordsFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 06e8bb0986e9..0c97245e962b 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 eeb3da31432e..63abf0790e87 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.miscellaneous.TrimFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 418c1ccb1bc7..5f6be56829a7 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.no.NorwegianLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.BOKMAAL; 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 7453822a3c36..03d5090a318d 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.no.NorwegianMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; import static org.apache.lucene.analysis.no.NorwegianLightStemmer.BOKMAAL; 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 f7d760b7e2ce..1836f9693332 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 @@ -19,7 +19,6 @@ import java.util.Map; -import org.apache.lucene.analysis.payloads.TokenOffsetPayloadTokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 3f072daf3006..5209758ac64e 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 @@ -19,7 +19,6 @@ import java.util.Map; -import org.apache.lucene.analysis.payloads.TypeAsPayloadTokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; 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 2d1c1f9039ff..10601791c0d6 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.pt.PortugueseLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 d3eb57ce5a27..15b4fd08dc45 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.pt.PortugueseMinimalStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 ed89727c333f..c9e082fba2e5 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.pt.PortugueseStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 310fc9162eca..f186b9544448 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.reverse.ReverseStringFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 9aa456419f8e..64769a39091d 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.ru.RussianLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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/standard/ClassicFilterFactory.java index 742a2b57317c..a81dcd61445b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; -import org.apache.lucene.analysis.standard.ClassicFilter; /** * Factory for {@link ClassicFilter}. 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 74a344fef0b2..c7eb11978d98 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.sv.SwedishLightStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 c4394c1fe407..5565a2af9795 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java index e9404899a276..45d08e8bd665 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java @@ -19,8 +19,12 @@ import java.io.StringReader; import java.util.Arrays; -import org.apache.lucene.analysis.*; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.MockTokenizer; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; 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 65f5b72bd7ba..f846fd5c5a78 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 @@ -23,7 +23,6 @@ import org.apache.lucene.analysis.MockTokenizer; 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; 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/standard/TestUAX29URLEmailAnalyzer.java index b9321784dd07..b3b0ce11aa6f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java @@ -19,7 +19,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.standard.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/standard/TestUAX29URLEmailTokenizer.java index f408ee87581b..d9d8381a8695 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java @@ -21,8 +21,6 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer; -import org.apache.lucene.analysis.standard.WordBreakTestUnicode_6_3_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/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java b/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java index f4979385708f..2afcd977e9c6 100644 --- a/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java +++ b/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java @@ -20,10 +20,8 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; -import java.io.Reader; import java.io.Writer; import java.net.URL; import java.net.URLConnection; 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 1065cbfac81e..c35ab6185bfc 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 @@ -20,7 +20,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.icu.ICUFoldingFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; // javadocs import org.apache.lucene.analysis.util.MultiTermAwareComponent; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java index 8bc70c352bc9..1c5436c68abd 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java @@ -21,7 +21,6 @@ import com.ibm.icu.text.Collator; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.KeywordTokenizer; -import org.apache.lucene.collation.CollationKeyAnalyzer; // javadocs /** *

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 11bd99d27565..504953b28b9c 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.ja.JapaneseBaseFormFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** 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 f888b2b971d4..8ee545794d4c 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 @@ -18,7 +18,6 @@ import org.apache.lucene.analysis.CharFilter; -import org.apache.lucene.analysis.ja.JapaneseIterationMarkCharFilter; import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.CharFilterFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; 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 eda3e2ec5e26..d5b240b8a0a4 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,6 @@ import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.ja.JapaneseKatakanaStemFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; import java.util.Map; 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 b5fd587f0cf9..082eae8c2480 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,6 @@ import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.ja.JapaneseReadingFormFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; import java.util.Map; 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 3a74dee9ca38..112944a6f7fb 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,6 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilter; import org.apache.lucene.analysis.util.TokenFilterFactory; /** diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java index aaf30d6a6d1c..a91b694c52c7 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java @@ -22,7 +22,6 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilter; public class TestDoubleMetaphoneFilterFactory extends BaseTokenStreamTestCase { 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 ce86bb56d935..3b6e28603f7d 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,8 +21,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pl.PolishAnalyzer; -import org.apache.lucene.analysis.stempel.StempelFilter; -import org.apache.lucene.analysis.stempel.StempelStemmer; import org.apache.lucene.analysis.util.TokenFilterFactory; /** diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestManyPointsInOldIndex.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestManyPointsInOldIndex.java index c567bec9d543..f4d97dceb059 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestManyPointsInOldIndex.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestManyPointsInOldIndex.java @@ -23,8 +23,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.IntPoint; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java index fe6c8f6456a5..96cd99636356 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java @@ -29,7 +29,6 @@ import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.codecs.DocValuesProducer; import org.apache.lucene.index.*; -import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.store.ChecksumIndexInput; import org.apache.lucene.store.IndexInput; import org.apache.lucene.util.Accountable; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java index 5227d6d525a7..82879640f4b2 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -import org.apache.lucene.codecs.simpletext.SimpleTextUtil; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.PointValues; import org.apache.lucene.store.IndexInput; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java index 09f97aba8023..170a15b57a45 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java @@ -31,7 +31,6 @@ import org.apache.lucene.codecs.DocValuesProducer; import org.apache.lucene.index.*; -import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.BufferedChecksumIndexInput; import org.apache.lucene.store.ChecksumIndexInput; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java index fa7dbcc13e20..502a34052caa 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java @@ -18,7 +18,6 @@ import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.blockterms.LuceneVarGapFixedInterval; import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.util.TestUtil; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java index db9b4f538ff4..23cf58208354 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java @@ -18,7 +18,6 @@ import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.blockterms.LuceneVarGapDocFreqInterval; import org.apache.lucene.index.BasePostingsFormatTestCase; import org.apache.lucene.util.TestUtil; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/CharArrayMap.java b/lucene/core/src/java/org/apache/lucene/analysis/CharArrayMap.java index e7e610ad446c..cad339b380fa 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/CharArrayMap.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/CharArrayMap.java @@ -24,8 +24,6 @@ import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.CharacterUtils; - /** * A simple class that stores key Strings as char[]'s in a * hash table. Note that this is not a general purpose diff --git a/lucene/core/src/java/org/apache/lucene/analysis/LowerCaseFilter.java b/lucene/core/src/java/org/apache/lucene/analysis/LowerCaseFilter.java index bc31d08828e2..e89678b6ce51 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/LowerCaseFilter.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/LowerCaseFilter.java @@ -19,10 +19,7 @@ import java.io.IOException; -import org.apache.lucene.analysis.TokenFilter; -import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.analysis.CharacterUtils; /** * Normalizes token text to lower case. diff --git a/lucene/core/src/java/org/apache/lucene/analysis/StopFilter.java b/lucene/core/src/java/org/apache/lucene/analysis/StopFilter.java index f5a22907cca6..8cb562bf4c31 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/StopFilter.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/StopFilter.java @@ -20,10 +20,7 @@ import java.util.Arrays; import java.util.List; -import org.apache.lucene.analysis.FilteringTokenFilter; -import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.analysis.CharArraySet; /** * Removes stop words from a token stream. diff --git a/lucene/core/src/java/org/apache/lucene/analysis/StopwordAnalyzerBase.java b/lucene/core/src/java/org/apache/lucene/analysis/StopwordAnalyzerBase.java index 0de83e57aebe..452ef9ad32e4 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/StopwordAnalyzerBase.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/StopwordAnalyzerBase.java @@ -22,7 +22,6 @@ import java.nio.file.Files; import java.nio.file.Path; -import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.util.IOUtils; /** diff --git a/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataInput.java b/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataInput.java index e8418ed0146a..9b4f4af41f0d 100644 --- a/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/ByteBuffersDataInput.java @@ -25,8 +25,6 @@ import java.util.Locale; import java.util.stream.Collectors; -import org.apache.lucene.store.DataInput; -import org.apache.lucene.store.RandomAccessInput; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.RamUsageEstimator; diff --git a/lucene/core/src/java/org/apache/lucene/store/ByteBuffersIndexInput.java b/lucene/core/src/java/org/apache/lucene/store/ByteBuffersIndexInput.java index 7b899b081665..48c681aa833b 100644 --- a/lucene/core/src/java/org/apache/lucene/store/ByteBuffersIndexInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/ByteBuffersIndexInput.java @@ -21,9 +21,6 @@ import java.util.Map; import java.util.Set; -import org.apache.lucene.store.IndexInput; -import org.apache.lucene.store.RandomAccessInput; - /** * An {@link IndexInput} implementing {@link RandomAccessInput} and backed * by a {@link ByteBuffersDataInput}. diff --git a/lucene/core/src/java/org/apache/lucene/store/GrowableByteArrayDataOutput.java b/lucene/core/src/java/org/apache/lucene/store/GrowableByteArrayDataOutput.java index 5f00d4a6ab0e..c74d4efaa822 100644 --- a/lucene/core/src/java/org/apache/lucene/store/GrowableByteArrayDataOutput.java +++ b/lucene/core/src/java/org/apache/lucene/store/GrowableByteArrayDataOutput.java @@ -19,7 +19,6 @@ import java.io.IOException; -import org.apache.lucene.store.DataOutput; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.UnicodeUtil; diff --git a/lucene/core/src/java/org/apache/lucene/store/InputStreamDataInput.java b/lucene/core/src/java/org/apache/lucene/store/InputStreamDataInput.java index 62e4b5dff1ed..c6c3b6ecc9d1 100644 --- a/lucene/core/src/java/org/apache/lucene/store/InputStreamDataInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/InputStreamDataInput.java @@ -19,8 +19,6 @@ import java.io.*; -import org.apache.lucene.store.DataInput; - /** * A {@link DataInput} wrapping a plain {@link InputStream}. */ diff --git a/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java b/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java index 696fafea2c46..0bbc5aedaad4 100644 --- a/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java @@ -26,7 +26,6 @@ import java.util.HashSet; import java.util.Set; -import org.apache.lucene.store.RAMDirectory; // javadocs import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Accountables; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java b/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java index 16932ae061a5..ea36ff0999d2 100644 --- a/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java @@ -20,8 +20,6 @@ import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.lucene.util.PriorityQueue; - /** * Provides a merged sorted view from several sorted iterators. *

diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArrayMap.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArrayMap.java index 2d63b665a04b..83da127c462c 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArrayMap.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArrayMap.java @@ -18,8 +18,6 @@ import java.util.*; -import org.apache.lucene.analysis.CharArrayMap; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.util.LuceneTestCase; public class TestCharArrayMap extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java index b1065638ba1c..2fd8ca4dd7f0 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java @@ -19,7 +19,6 @@ import java.util.*; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.SuppressForbidden; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestWordlistLoader.java b/lucene/core/src/test/org/apache/lucene/analysis/TestWordlistLoader.java index 943e427021ba..108ecd4394b0 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestWordlistLoader.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestWordlistLoader.java @@ -23,8 +23,6 @@ import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.analysis.WordlistLoader; - public class TestWordlistLoader extends LuceneTestCase { public void testWordlistLoading() throws IOException { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/TestCodecUtil.java b/lucene/core/src/test/org/apache/lucene/codecs/TestCodecUtil.java index 0ff7f7c9cf88..a15475b4ebac 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/TestCodecUtil.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/TestCodecUtil.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; -import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.store.BufferedChecksumIndexInput; import org.apache.lucene.store.ChecksumIndexInput; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene70/TestLucene70DocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene70/TestLucene70DocValuesFormat.java index 6cca55e3a48a..1355a9ddfad6 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene70/TestLucene70DocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene70/TestLucene70DocValuesFormat.java @@ -33,7 +33,6 @@ import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.asserting.AssertingCodec; -import org.apache.lucene.codecs.lucene70.Lucene70DocValuesFormat; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java index dbd685ac77ed..aa325a1aad79 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java @@ -27,17 +27,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; -import org.apache.lucene.index.CodecReader; -import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.FieldInfo; -import org.apache.lucene.index.FieldInfos; -import org.apache.lucene.index.FilterCodecReader; -import org.apache.lucene.index.FilteredTermsEnum; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.Terms; -import org.apache.lucene.index.TermsEnum; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.Accountable; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java index 6120985fb43d..2b2ec3d59762 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java @@ -25,7 +25,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.SortedSetDocValuesField; -import org.apache.lucene.index.OrdinalMap; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LongValues; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java index ae8605df5024..a92170994568 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java @@ -33,7 +33,6 @@ import org.apache.lucene.document.Field.Store; import org.apache.lucene.index.PointValues.IntersectVisitor; import org.apache.lucene.index.PointValues.Relation; -import org.apache.lucene.index.PointValues; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.RAMDirectory; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java index dd8616aed718..eb5631f86792 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java @@ -23,10 +23,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.util.English; import org.apache.lucene.util.IOUtils; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java b/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java index 3b0ec3c75b71..22dbc6834e5f 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java @@ -20,10 +20,6 @@ import java.io.IOException; import java.nio.file.Path; -import org.apache.lucene.store.BaseLockFactoryTestCase; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.SingleInstanceLockFactory; -import org.apache.lucene.store.SleepingLockWrapper; import org.apache.lucene.util.TestUtil; /** Simple tests for SleepingLockWrapper */ diff --git a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java index 048eae0e3315..1d1126068ceb 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java @@ -19,12 +19,6 @@ import java.io.IOException; import java.util.*; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.BytesRefIterator; -import org.apache.lucene.util.Counter; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; - public class TestBytesRefArray extends LuceneTestCase { public void testAppend() throws IOException { diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java index 3c5d5d82a0f0..2ab0a6a59ad0 100644 --- a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java +++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java @@ -27,8 +27,6 @@ import org.apache.lucene.util.LongValues; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TestUtil; -import org.apache.lucene.util.packed.DirectReader; -import org.apache.lucene.util.packed.DirectWriter; public class TestDirectPacked extends LuceneTestCase { diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java index ad40e9cf4ac9..36e8a9fdd64c 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptLexer.java @@ -1,8 +1,10 @@ // ANTLR GENERATED CODE: DO NOT EDIT package org.apache.lucene.expressions.js; -import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.*; +import org.antlr.v4.runtime.Lexer; +import org.antlr.v4.runtime.RuntimeMetaData; +import org.antlr.v4.runtime.Vocabulary; +import org.antlr.v4.runtime.VocabularyImpl; import org.antlr.v4.runtime.atn.*; import org.antlr.v4.runtime.dfa.DFA; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LruTaxonomyWriterCache.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LruTaxonomyWriterCache.java index d70698b017ca..bab29f6453a5 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LruTaxonomyWriterCache.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LruTaxonomyWriterCache.java @@ -17,7 +17,6 @@ package org.apache.lucene.facet.taxonomy.writercache; import org.apache.lucene.facet.taxonomy.FacetLabel; -import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache; /** * LRU {@link TaxonomyWriterCache} - good choice for huge taxonomies. diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/UTF8TaxonomyWriterCache.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/UTF8TaxonomyWriterCache.java index f27ac638bd16..7de12670d1cb 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/UTF8TaxonomyWriterCache.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/UTF8TaxonomyWriterCache.java @@ -17,7 +17,6 @@ package org.apache.lucene.facet.taxonomy.writercache; import org.apache.lucene.facet.taxonomy.FacetLabel; -import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.ByteBlockPool.DirectTrackingAllocator; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java index 18808c2cdb19..4aa370df3771 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestLongValueFacetCounts.java @@ -28,9 +28,6 @@ import org.apache.lucene.document.IntPoint; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.SortedNumericDocValuesField; -import org.apache.lucene.facet.FacetResult; -import org.apache.lucene.facet.Facets; -import org.apache.lucene.facet.FacetsCollector; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java index dec2d43b50ed..b23278d679f1 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java @@ -17,7 +17,6 @@ package org.apache.lucene.facet.taxonomy; import org.apache.lucene.facet.FacetTestCase; -import org.apache.lucene.facet.taxonomy.LRUHashMap; import org.junit.Test; public class TestLRUHashMap extends FacetTestCase { diff --git a/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java b/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java index a0e39c06d9cb..44fe4182a4e1 100644 --- a/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java +++ b/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java @@ -25,7 +25,6 @@ import java.nio.channels.FileChannel; import java.nio.file.Path; -import org.apache.lucene.store.Directory; // javadoc import org.apache.lucene.store.IOContext.Context; import org.apache.lucene.util.SuppressForbidden; diff --git a/lucene/misc/src/java/org/apache/lucene/store/WindowsDirectory.java b/lucene/misc/src/java/org/apache/lucene/store/WindowsDirectory.java index d38539975bcd..ff4c15f0a636 100644 --- a/lucene/misc/src/java/org/apache/lucene/store/WindowsDirectory.java +++ b/lucene/misc/src/java/org/apache/lucene/store/WindowsDirectory.java @@ -20,8 +20,6 @@ import java.io.EOFException; import java.nio.file.Path; -import org.apache.lucene.store.Directory; // javadoc - /** * Native {@link Directory} implementation for Microsoft Windows. *

diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/Geo3DUtil.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/Geo3DUtil.java index 9a22abd7a53d..52115cfe0c3e 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/Geo3DUtil.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/Geo3DUtil.java @@ -16,18 +16,6 @@ */ package org.apache.lucene.spatial3d.geom; -import org.apache.lucene.spatial3d.geom.PlanetModel; -import org.apache.lucene.spatial3d.geom.GeoPolygonFactory; -import org.apache.lucene.spatial3d.geom.GeoPathFactory; -import org.apache.lucene.spatial3d.geom.GeoCircleFactory; -import org.apache.lucene.spatial3d.geom.GeoBBoxFactory; -import org.apache.lucene.spatial3d.geom.GeoPath; -import org.apache.lucene.spatial3d.geom.GeoPolygon; -import org.apache.lucene.spatial3d.geom.GeoCircle; -import org.apache.lucene.spatial3d.geom.GeoBBox; -import org.apache.lucene.spatial3d.geom.GeoCompositePolygon; -import org.apache.lucene.spatial3d.geom.GeoPoint; - import org.apache.lucene.geo.Polygon; import org.apache.lucene.geo.GeoUtils; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java index c075ad47918e..4ceb83b0333f 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java @@ -23,7 +23,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; -import org.apache.lucene.search.spell.SuggestMode; /** *

diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java index 31c3d5f362f4..5c882e6868e4 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java @@ -18,7 +18,6 @@ import java.io.IOException; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java index 1cb852b44b79..e79638a1d451 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java @@ -23,12 +23,6 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.PostingsReaderBase; import org.apache.lucene.codecs.PostingsWriterBase; -import org.apache.lucene.codecs.blockterms.BlockTermsReader; -import org.apache.lucene.codecs.blockterms.BlockTermsWriter; -import org.apache.lucene.codecs.blockterms.FixedGapTermsIndexReader; -import org.apache.lucene.codecs.blockterms.FixedGapTermsIndexWriter; -import org.apache.lucene.codecs.blockterms.TermsIndexReaderBase; -import org.apache.lucene.codecs.blockterms.TermsIndexWriterBase; import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat; // javadocs import org.apache.lucene.codecs.lucene50.Lucene50PostingsReader; import org.apache.lucene.codecs.lucene50.Lucene50PostingsWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java index 12cd27464545..67110fecfb9e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java @@ -23,13 +23,6 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.PostingsReaderBase; import org.apache.lucene.codecs.PostingsWriterBase; -import org.apache.lucene.codecs.blockterms.BlockTermsReader; -import org.apache.lucene.codecs.blockterms.BlockTermsWriter; -import org.apache.lucene.codecs.blockterms.FixedGapTermsIndexWriter; -import org.apache.lucene.codecs.blockterms.TermsIndexReaderBase; -import org.apache.lucene.codecs.blockterms.TermsIndexWriterBase; -import org.apache.lucene.codecs.blockterms.VariableGapTermsIndexReader; -import org.apache.lucene.codecs.blockterms.VariableGapTermsIndexWriter; import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat; // javadocs import org.apache.lucene.codecs.lucene50.Lucene50PostingsReader; import org.apache.lucene.codecs.lucene50.Lucene50PostingsWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java index c7f2309b5590..fe9cedf51070 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java @@ -23,13 +23,6 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.PostingsReaderBase; import org.apache.lucene.codecs.PostingsWriterBase; -import org.apache.lucene.codecs.blockterms.BlockTermsReader; -import org.apache.lucene.codecs.blockterms.BlockTermsWriter; -import org.apache.lucene.codecs.blockterms.FixedGapTermsIndexWriter; -import org.apache.lucene.codecs.blockterms.TermsIndexReaderBase; -import org.apache.lucene.codecs.blockterms.TermsIndexWriterBase; -import org.apache.lucene.codecs.blockterms.VariableGapTermsIndexReader; -import org.apache.lucene.codecs.blockterms.VariableGapTermsIndexWriter; import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat; // javadocs import org.apache.lucene.codecs.lucene50.Lucene50PostingsReader; import org.apache.lucene.codecs.lucene50.Lucene50PostingsWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java index 343687180f91..948b2e0cb67a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java @@ -76,7 +76,6 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.*; -import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.mockfile.FilterPath; import org.apache.lucene.mockfile.VirusCheckingFS; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java index 72415f04ef7b..6519df9fc6e6 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java @@ -19,8 +19,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.lang.Object; -import java.lang.Override; import java.net.URI; import java.nio.channels.SeekableByteChannel; import java.nio.file.DirectoryStream; @@ -28,9 +26,6 @@ import java.nio.file.Files; import java.nio.file.Path; -import org.apache.lucene.mockfile.HandleTrackingFS; -import org.apache.lucene.mockfile.LeakFS; - /** Basic tests for HandleTrackingFS */ public class TestHandleTrackingFS extends MockFileSystemTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java index dd6c35cee17a..635e653b3af8 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java @@ -20,8 +20,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.lang.Exception; -import java.lang.RuntimeException; import java.net.URI; import java.nio.file.FileSystem; import java.nio.file.Files; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java index 1e519b75d676..9093a8cd9327 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java @@ -21,8 +21,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import org.apache.lucene.util.LuceneTestCase; - import com.carrotsearch.randomizedtesting.annotations.TestGroup; public class TestGroupFiltering extends LuceneTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java index 216c35c5abde..2859f62bc2cb 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java @@ -18,7 +18,6 @@ import java.util.concurrent.CountDownLatch; -import org.apache.lucene.util.WithNestedTests; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java index 952d8bb6d7f0..5fbeebae53ff 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java @@ -18,7 +18,6 @@ import java.util.Arrays; -import org.apache.lucene.util.LuceneTestCase; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java index 5dd92c14b570..81cf5e6568b3 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java @@ -16,7 +16,6 @@ */ package org.apache.lucene.util; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.JUnitCore; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java index 6078015dc853..b2ddbd44e8a6 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java @@ -16,7 +16,6 @@ */ package org.apache.lucene.util; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Assert; import org.junit.Test; import org.junit.runner.JUnitCore; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java index 427b5013dd0f..c07c8dabb9c4 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java @@ -16,7 +16,6 @@ */ package org.apache.lucene.util; -import org.apache.lucene.util.LuceneTestCase; import org.junit.Ignore; import com.carrotsearch.randomizedtesting.RandomizedTest; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java b/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java index 523b18dc04d1..e3d03df684f0 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java @@ -22,13 +22,6 @@ import java.nio.charset.StandardCharsets; import java.util.List; -import org.apache.lucene.util.FailureMarker; -import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestRuleIgnoreAfterMaxFailures; -import org.apache.lucene.util.TestRuleIgnoreTestSuites; -import org.apache.lucene.util.TestRuleMarkFailure; -import org.apache.lucene.util.TestRuleRestoreSystemProperties; import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; import org.junit.After; import org.junit.Assert; diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/InterpolatedProperties.java b/lucene/tools/src/java/org/apache/lucene/dependencies/InterpolatedProperties.java index 08a8407bd31b..073db7bde292 100644 --- a/lucene/tools/src/java/org/apache/lucene/dependencies/InterpolatedProperties.java +++ b/lucene/tools/src/java/org/apache/lucene/dependencies/InterpolatedProperties.java @@ -21,16 +21,12 @@ import java.io.Reader; import java.util.Arrays; import java.util.Enumeration; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.function.BiFunction; -import java.util.function.Consumer; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java b/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java index 42fc6f84995a..02c9e9d6e7b0 100644 --- a/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java +++ b/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java @@ -28,7 +28,6 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; -import org.apache.tools.ant.types.LogLevel; import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.FileResource; diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 8a0e36bb1421..3762ecd476eb 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -98,6 +98,8 @@ Other Changes * SOLR-12620: Remove the Admin UI Cloud -> Graph (Radial) view (janhoy) +* SOLR-12881: Remove unneeded import statements (Peter Somogyi) + ================== 7.7.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/CountCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/CountCollector.java index 135b587c7514..bb5ae7aac422 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/CountCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/CountCollector.java @@ -18,7 +18,6 @@ import java.util.function.Consumer; -import org.apache.solr.analytics.function.reduction.data.ReductionData; import org.apache.solr.analytics.stream.reservation.LongReservation; import org.apache.solr.analytics.stream.reservation.ReductionDataReservation; import org.apache.solr.analytics.value.AnalyticsValueStream; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MaxCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MaxCollector.java index bf49907a191d..d7b427f0ae2b 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MaxCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MaxCollector.java @@ -18,7 +18,6 @@ import java.util.function.Consumer; -import org.apache.solr.analytics.function.reduction.data.ReductionData; import org.apache.solr.analytics.stream.reservation.DoubleCheckedReservation; import org.apache.solr.analytics.stream.reservation.FloatCheckedReservation; import org.apache.solr.analytics.stream.reservation.IntCheckedReservation; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MinCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MinCollector.java index 3a33660f009d..382c478eb765 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MinCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/MinCollector.java @@ -18,7 +18,6 @@ import java.util.function.Consumer; -import org.apache.solr.analytics.function.reduction.data.ReductionData; import org.apache.solr.analytics.stream.reservation.DoubleCheckedReservation; import org.apache.solr.analytics.stream.reservation.FloatCheckedReservation; import org.apache.solr.analytics.stream.reservation.IntCheckedReservation; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SortedListCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SortedListCollector.java index bc0c4d4049d2..76e749518279 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SortedListCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SortedListCollector.java @@ -23,7 +23,6 @@ import java.util.Set; import java.util.function.Consumer; -import org.apache.solr.analytics.function.reduction.data.ReductionData; import org.apache.solr.analytics.stream.reservation.DoubleArrayReservation; import org.apache.solr.analytics.stream.reservation.FloatArrayReservation; import org.apache.solr.analytics.stream.reservation.IntArrayReservation; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SumCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SumCollector.java index 6f4fc1892e69..2d4f02fc0891 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SumCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/SumCollector.java @@ -18,7 +18,6 @@ import java.util.function.Consumer; -import org.apache.solr.analytics.function.reduction.data.ReductionData; import org.apache.solr.analytics.stream.reservation.DoubleCheckedReservation; import org.apache.solr.analytics.stream.reservation.ReductionDataReservation; import org.apache.solr.analytics.value.AnalyticsValueStream; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/UniqueCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/UniqueCollector.java index 3e3011461f81..0a5a23802abe 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/UniqueCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/reduction/data/UniqueCollector.java @@ -21,7 +21,6 @@ import java.util.Set; import java.util.function.Consumer; -import org.apache.solr.analytics.function.reduction.data.ReductionData; import org.apache.solr.analytics.stream.reservation.DoubleArrayReservation; import org.apache.solr.analytics.stream.reservation.FloatArrayReservation; import org.apache.solr.analytics.stream.reservation.IntArrayReservation; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.java index 6495f961c8f7..b9caa6df61e7 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/EqualFunctionTest.java @@ -20,7 +20,6 @@ import java.util.Iterator; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.analytics.function.mapping.EqualFunction; import org.apache.solr.analytics.value.AnalyticsValueStream; import org.apache.solr.analytics.value.BooleanValue; import org.apache.solr.analytics.value.BooleanValueStream; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ExistsFunctionTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ExistsFunctionTest.java index 89fcf426d929..0b270328fda5 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ExistsFunctionTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/mapping/ExistsFunctionTest.java @@ -17,7 +17,6 @@ package org.apache.solr.analytics.function.mapping; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.analytics.function.mapping.ExistsFunction; import org.apache.solr.analytics.value.AnalyticsValueStream; import org.apache.solr.analytics.value.BooleanValue; import org.apache.solr.analytics.value.FillableTestValue.TestBooleanValue; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContextImpl.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContextImpl.java index 419355008abe..0747e98b65d8 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContextImpl.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContextImpl.java @@ -18,7 +18,6 @@ import java.util.HashMap; -import org.apache.solr.handler.dataimport.RequestInfo; import org.junit.Test; public class TestContextImpl extends AbstractDataImportHandlerTestCase { diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.java index 8c43296cbf3d..d72b29b8120b 100644 --- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.java +++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/NeuralNetworkModel.java @@ -16,7 +16,6 @@ */ package org.apache.solr.ltr.model; -import java.lang.Math; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestManagedFeatureStore.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestManagedFeatureStore.java index e849d3f0b12b..4fe9523af285 100644 --- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestManagedFeatureStore.java +++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestManagedFeatureStore.java @@ -25,7 +25,6 @@ import org.apache.solr.ltr.feature.OriginalScoreFeature; import org.apache.solr.ltr.feature.ValueFeature; import org.apache.solr.ltr.store.FeatureStore; -import org.apache.solr.ltr.store.rest.ManagedFeatureStore; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java index 8df0fb0e9b23..32e86517bd67 100644 --- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java +++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java @@ -87,7 +87,6 @@ import org.apache.solr.core.DirectoryFactory.DirContext; import org.apache.solr.core.IndexDeletionPolicyWrapper; import org.apache.solr.core.SolrCore; -import org.apache.solr.handler.ReplicationHandler.*; import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.search.SolrIndexSearcher; diff --git a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java index 11299e4bb05b..4f1b56cecaaa 100644 --- a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java +++ b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java @@ -23,7 +23,6 @@ import org.apache.lucene.index.*; import org.apache.lucene.index.MultiDocValues.MultiSortedDocValues; -import org.apache.lucene.index.OrdinalMap; import org.apache.lucene.util.Bits; import org.apache.lucene.util.Version; diff --git a/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java index 2d938e27ef72..0e13e7563e64 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java @@ -27,7 +27,6 @@ import org.apache.lucene.search.similarities.Similarity; import org.apache.solr.common.params.SolrParams; import org.apache.solr.schema.SimilarityFactory; -import org.apache.solr.search.similarities.DFRSimilarityFactory; // javadoc /** * Factory for {@link IBSimilarity} diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java index 0af70c1a8da5..1a13652b63e6 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java @@ -26,10 +26,6 @@ import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrClient; -import org.apache.solr.cloud.AbstractDistribZkTestBase; -import org.apache.solr.cloud.ElectionContext; -import org.apache.solr.cloud.LeaderElector; -import org.apache.solr.cloud.Overseer; import org.apache.solr.cloud.api.collections.ShardSplitTest; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.cloud.ClusterState; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java index 52ab3a3def2f..771ae0aeaafc 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestStressLiveNodes.java @@ -26,7 +26,6 @@ import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.TestUtil; -import org.apache.solr.cloud.SolrCloudTestCase; import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.cloud.ZkStateReader; diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java b/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java index 30afbc9e688a..6cad20e95796 100644 --- a/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java @@ -21,7 +21,6 @@ import org.apache.lucene.index.LiveIndexWriterConfig; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.core.SolrCore; import org.apache.solr.util.RefCounted; import org.apache.solr.util.RandomMergePolicy; import org.apache.solr.update.LoggingInfoStream; diff --git a/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java index 61e44040ac48..b54b7a9bb4a7 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/PhrasesIdentificationComponentTest.java @@ -27,7 +27,6 @@ import java.util.stream.Stream; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.handler.component.PhrasesIdentificationComponent; import org.apache.solr.handler.component.PhrasesIdentificationComponent.Phrase; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java index 523e31d41d87..01aff97c0f77 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TestHttpShardHandlerFactory.java @@ -29,8 +29,6 @@ import org.apache.solr.common.params.ShardParams; import org.apache.solr.common.util.StrUtils; import org.apache.solr.core.CoreContainer; -import org.apache.solr.handler.component.HttpShardHandlerFactory; -import org.apache.solr.handler.component.ShardHandlerFactory; import org.junit.BeforeClass; import org.junit.AfterClass; diff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java index 39d8d01f128c..af8dc7c99acc 100644 --- a/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java +++ b/solr/core/src/test/org/apache/solr/legacy/TestLegacyFieldReuse.java @@ -24,9 +24,6 @@ import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.Field; -import org.apache.solr.legacy.LegacyIntField; -import org.apache.solr.legacy.LegacyNumericTokenStream; -import org.apache.solr.legacy.LegacyNumericUtils; import org.apache.solr.legacy.LegacyNumericTokenStream.LegacyNumericTermAttribute; /** test tokenstream reuse by DefaultIndexingChain */ diff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java index a87e28a31cba..a94b18e1c7f0 100644 --- a/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java +++ b/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java @@ -22,7 +22,6 @@ import java.util.Iterator; import java.util.Random; -import org.apache.solr.legacy.LegacyNumericUtils; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.LongBitSet; diff --git a/solr/core/src/test/org/apache/solr/legacy/TestMultiValuedNumericRangeQuery.java b/solr/core/src/test/org/apache/solr/legacy/TestMultiValuedNumericRangeQuery.java index 5c6392da9278..d9642a25d54b 100644 --- a/solr/core/src/test/org/apache/solr/legacy/TestMultiValuedNumericRangeQuery.java +++ b/solr/core/src/test/org/apache/solr/legacy/TestMultiValuedNumericRangeQuery.java @@ -26,8 +26,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; -import org.apache.solr.legacy.LegacyIntField; -import org.apache.solr.legacy.LegacyNumericRangeQuery; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TopDocs; diff --git a/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java b/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java index b2e37819c227..4e7582015ef0 100644 --- a/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java +++ b/solr/core/src/test/org/apache/solr/legacy/TestNumericTokenStream.java @@ -21,8 +21,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; -import org.apache.solr.legacy.LegacyNumericTokenStream; -import org.apache.solr.legacy.LegacyNumericUtils; import org.apache.solr.legacy.LegacyNumericTokenStream.LegacyNumericTermAttributeImpl; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; diff --git a/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java index 5932d696b01d..641882584b4b 100644 --- a/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java @@ -22,10 +22,7 @@ import java.util.LinkedHashMap; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.response.PHPSerializedResponseWriter; import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.response.QueryResponseWriter; -import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java index 046582f8d1d2..723ee64cc597 100644 --- a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java +++ b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java @@ -17,7 +17,6 @@ package org.apache.solr.response; import java.io.IOException; -import java.lang.ArithmeticException; import java.util.Arrays; import java.util.Iterator; import java.util.Map; @@ -26,7 +25,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; -import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.search.ReturnFields; import org.apache.solr.search.SolrReturnFields; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java index 6cffc4ffae18..8ad547ae40e9 100644 --- a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java @@ -32,7 +32,6 @@ import org.apache.solr.core.SolrCore; import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.schema.SimilarityFactory; import org.apache.solr.search.similarities.LMJelinekMercerSimilarityFactory; import org.apache.solr.search.similarities.SchemaSimilarityFactory; import org.apache.solr.update.AddUpdateCommand; diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java b/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java index 12635ed07a83..e6a63036c9f2 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java +++ b/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java @@ -31,7 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.Math; import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java index 03e68defd71a..6e529dcab942 100644 --- a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java @@ -24,8 +24,10 @@ import org.junit.BeforeClass; import org.junit.Test; -import java.util.*; +import java.util.HashSet; +import java.util.Iterator; import java.util.Random; +import java.util.Set; @LuceneTestCase.SuppressCodecs({"Lucene3x", "Lucene40","Lucene41","Lucene42","Lucene45"}) public class TestHashQParserPlugin extends SolrTestCaseJ4 { diff --git a/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java b/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java index bacc85dfa237..9985130a9d8e 100644 --- a/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java +++ b/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java @@ -17,7 +17,6 @@ package org.apache.solr.update; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.update.DirectUpdateHandler2; import org.apache.solr.common.SolrException; public class TestAtomicUpdateErrorCases extends SolrTestCaseJ4 { diff --git a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessor.java b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessor.java index 051614b6e974..24d9a1273ab2 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessor.java +++ b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessor.java @@ -16,8 +16,6 @@ */ package org.apache.solr.update.processor; -import org.apache.solr.update.processor.UpdateRequestProcessor; - /** * A passthrough processor that does nothing. diff --git a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java index 81be95c5858a..8fb0924bd3f5 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java +++ b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java @@ -19,8 +19,6 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; -import org.apache.solr.update.processor.UpdateRequestProcessor; -import org.apache.solr.update.processor.UpdateRequestProcessorFactory; /** diff --git a/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java index e32826781d03..ddf5646cf5c0 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java @@ -34,8 +34,6 @@ import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; -import org.apache.solr.update.processor.UpdateRequestProcessor; -import org.apache.solr.update.processor.UpdateRequestProcessorChain; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactoryTest.java index 1b22411b0a87..428a94f22c10 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactoryTest.java @@ -18,8 +18,6 @@ import org.apache.solr.common.SolrInputDocument; -import org.apache.solr.update.processor.UpdateRequestProcessorChain; -import org.apache.solr.update.processor.UpdateRequestProcessorFactory; import org.apache.solr.update.UpdateCommand; import org.apache.solr.update.CommitUpdateCommand; import org.apache.solr.update.DeleteUpdateCommand; diff --git a/solr/core/src/test/org/apache/solr/update/processor/URLClassifyProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/URLClassifyProcessorTest.java index a3eae49a81cc..1b36bc6c0432 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/URLClassifyProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/URLClassifyProcessorTest.java @@ -23,8 +23,6 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.update.AddUpdateCommand; -import org.apache.solr.update.processor.URLClassifyProcessor; -import org.apache.solr.update.processor.URLClassifyProcessorFactory; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/PathTrie.java b/solr/solrj/src/java/org/apache/solr/common/util/PathTrie.java index b02a3237d481..1d64834f362e 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/PathTrie.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/PathTrie.java @@ -24,8 +24,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.solr.common.util.StrUtils; - import static java.util.Collections.emptyList; /**A utility class to efficiently parse/store/lookup hierarchical paths which are templatized diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java index 0fc2ca9d6ec6..ca811c961b59 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java @@ -17,10 +17,6 @@ package org.apache.solr.client.solrj.io.stream.expr; import org.apache.lucene.util.LuceneTestCase; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParser; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue; import org.junit.Test; /** diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCollectionAdminRequest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCollectionAdminRequest.java index 803898e9ae9e..5c62c535cd52 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCollectionAdminRequest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCollectionAdminRequest.java @@ -17,7 +17,6 @@ package org.apache.solr.client.solrj.request; import org.apache.lucene.util.LuceneTestCase; -import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.client.solrj.request.CollectionAdminRequest.CreateAlias; import org.apache.solr.client.solrj.request.CollectionAdminRequest.CreateShard; import org.apache.solr.common.SolrException; diff --git a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java index e05d4361475c..f81fc137a575 100644 --- a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java @@ -24,8 +24,6 @@ import java.util.Map; import org.apache.lucene.util.LuceneTestCase; -import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrInputDocument; /** */ diff --git a/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java b/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java index 36bac28691c4..2c4c53082db8 100644 --- a/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java +++ b/solr/solrj/src/test/org/apache/solr/common/TestToleratedUpdateError.java @@ -17,7 +17,7 @@ package org.apache.solr.common; import java.util.EnumSet; -import org.apache.solr.common.ToleratedUpdateError; + import org.apache.solr.common.ToleratedUpdateError.CmdType; import org.apache.solr.common.util.SimpleOrderedMap; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestPathTrie.java b/solr/solrj/src/test/org/apache/solr/common/util/TestPathTrie.java index 2eea2db7ca87..147535af031c 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestPathTrie.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestPathTrie.java @@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableSet; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.util.PathTrie; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; From be042731cdd02f7d6aa3900fcb184d04ef32a984 Mon Sep 17 00:00:00 2001 From: Peter Somogyi Date: Tue, 13 Nov 2018 13:46:42 +0100 Subject: [PATCH 2/2] SOLR-12881: Add java.lang pattern to check-source-patterns.groovy --- lucene/tools/src/groovy/check-source-patterns.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lucene/tools/src/groovy/check-source-patterns.groovy b/lucene/tools/src/groovy/check-source-patterns.groovy index 7fa4aa4c4a85..c08a7a14ccf4 100644 --- a/lucene/tools/src/groovy/check-source-patterns.groovy +++ b/lucene/tools/src/groovy/check-source-patterns.groovy @@ -45,8 +45,9 @@ def invalidPatterns = [ (~$/\$$Id\b/$) : 'svn keyword', (~$/\$$Header\b/$) : 'svn keyword', (~$/\$$Source\b/$) : 'svn keyword', - (~$/^\uFEFF/$) : 'UTF-8 byte order mark' -]; + (~$/^\uFEFF/$) : 'UTF-8 byte order mark', + (~$/import java\.lang\.\w+;/$) : 'java.lang import is unnecessary' +] def baseDir = properties['basedir']; def baseDirLen = baseDir.length() + 1;