From a0711a37e5090ba05cb85c23bc44d52706010bf1 Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Tue, 28 Mar 2017 15:15:45 +0200 Subject: [PATCH] LUCENE-7754: Inner classes should be static whenever possible. --- lucene/CHANGES.txt | 6 +++++- .../charfilter/HTMLStripCharFilter.java | 2 +- .../charfilter/HTMLStripCharFilter.jflex | 7 +++---- .../lucene/analysis/shingle/ShingleFilter.java | 2 +- .../analysis/hunspell/TestDictionary.java | 2 +- .../miscellaneous/TestWordDelimiterFilter.java | 2 +- .../TestWordDelimiterGraphFilter.java | 2 +- .../NumericPayloadTokenFilterTest.java | 2 +- .../payloads/TypeAsPayloadTokenFilterTest.java | 2 +- .../analysis/sinks/TestTeeSinkTokenFilter.java | 4 ++-- .../lucene/analysis/snowball/TestSnowball.java | 2 +- .../standard/TestUAX29URLEmailTokenizer.java | 4 ++-- .../analysis/icu/ICUTransformFilter.java | 2 +- .../CachingNaiveBayesClassifierTest.java | 2 +- .../SimpleNaiveBayesClassifierTest.java | 2 +- .../bloom/BloomFilteringPostingsFormat.java | 8 ++++---- .../codecs/memory/MemoryPostingsFormat.java | 2 +- .../SimpleTextTermVectorsReader.java | 2 +- .../CompressingTermVectorsReader.java | 2 +- .../lucene/index/ParallelLeafReader.java | 2 +- .../lucene/search/ConstantScoreQuery.java | 2 +- .../org/apache/lucene/index/TestCodecs.java | 8 ++++---- .../index/TestFlushByRamOrCountsPolicy.java | 2 +- .../index/TestIndexWriterExceptions.java | 2 +- .../lucene/index/TestIndexWriterMerging.java | 2 +- .../index/TestIndexWriterWithThreads.java | 2 +- .../lucene/index/TestIndexableField.java | 2 +- .../lucene/index/TestMaxTermFrequency.java | 2 +- .../org/apache/lucene/index/TestNorms.java | 2 +- .../lucene/index/TestPerSegmentDeletes.java | 2 +- .../lucene/index/TestStressIndexing2.java | 2 +- .../lucene/index/TestTermVectorsReader.java | 2 +- .../lucene/index/TestTransactionRollback.java | 6 +++--- .../lucene/index/TestUniqueTermCount.java | 2 +- .../lucene/search/TestCustomSearcherSort.java | 4 ++-- .../TestEarlyTerminatingSortingCollector.java | 4 ++-- .../apache/lucene/search/TestPrefixRandom.java | 4 ++-- .../lucene/search/TestRegexpRandom2.java | 2 +- .../lucene/search/TestSimilarityProvider.java | 6 +++--- .../apache/lucene/search/TestTermScorer.java | 2 +- .../search/TestTimeLimitingCollector.java | 2 +- .../apache/lucene/store/TestLockFactory.java | 4 ++-- .../lucene/util/TestCloseableThreadLocal.java | 2 +- .../apache/lucene/util/TestQueryBuilder.java | 2 +- .../org/apache/lucene/util/fst/TestFSTs.java | 2 +- .../taxonomy/writercache/CollisionMap.java | 2 +- .../grouping/GroupFacetCollectorTest.java | 4 ++-- .../TestUnifiedHighlighterExtensibility.java | 2 +- .../lucene/queries/CustomScoreQuery.java | 2 +- .../lucene/queries/TestCustomScoreQuery.java | 2 +- .../queries/payloads/TestPayloadSpans.java | 6 +++--- .../queryparser/classic/TestMultiAnalyzer.java | 8 ++++---- .../classic/TestMultiFieldQueryParser.java | 2 +- .../standard/TestMultiAnalyzerQPHelper.java | 8 ++++---- .../flexible/standard/TestQPHelper.java | 8 ++++---- .../queryparser/util/QueryParserTestBase.java | 10 +++++----- .../sandbox/queries/FuzzyLikeThisQuery.java | 2 +- .../lucene/payloads/TestPayloadSpanUtil.java | 4 ++-- .../search/spell/WordBreakSpellChecker.java | 10 +++++----- .../search/suggest/document/ContextQuery.java | 2 +- .../search/suggest/fst/ExternalRefSorter.java | 2 +- .../suggest/fst/WFSTCompletionLookup.java | 2 +- .../search/suggest/jaspell/JaspellLookup.java | 8 ++++---- .../jaspell/JaspellTernarySearchTrie.java | 2 +- .../search/suggest/DocumentDictionaryTest.java | 2 +- .../analyzing/AnalyzingInfixSuggesterTest.java | 2 +- .../suggest/analyzing/FuzzySuggesterTest.java | 2 +- .../lucene/store/BaseLockFactoryTestCase.java | 2 +- .../dependencies/GetMavenDependenciesTask.java | 2 +- .../validation/LibVersionsCheckTask.java | 2 +- .../dataimport/MailEntityProcessor.java | 4 ++-- .../handler/dataimport/VariableResolver.java | 2 +- .../dataimport/AbstractDIHCacheTestCase.java | 2 +- .../AbstractSqlEntityProcessorTestCase.java | 4 ++-- .../TestContentStreamDataSource.java | 2 +- .../handler/extraction/XLSXResponseWriter.java | 2 +- .../org/apache/solr/ltr/LTRScoringQuery.java | 2 +- .../solr/ltr/TestLTRReRankingPipeline.java | 2 +- .../solr/response/VelocityResponseWriter.java | 2 +- .../java/org/apache/solr/cloud/Overseer.java | 2 +- .../apache/solr/cloud/OverseerTaskQueue.java | 2 +- .../org/apache/solr/cloud/ZkController.java | 2 +- .../solr/core/CachingDirectoryFactory.java | 2 +- .../apache/solr/handler/CdcrReplicator.java | 2 +- .../solr/handler/CdcrReplicatorState.java | 6 +++--- .../org/apache/solr/handler/ExportWriter.java | 18 +++++++++--------- .../org/apache/solr/handler/IndexFetcher.java | 4 ++-- .../org/apache/solr/handler/SQLHandler.java | 2 +- .../handler/component/ExpandComponent.java | 6 +++--- .../component/HttpShardHandlerFactory.java | 2 +- .../PivotFacetFieldValueCollection.java | 4 ++-- .../solr/handler/component/TermsComponent.java | 2 +- .../solr/highlight/DefaultSolrHighlighter.java | 2 +- .../apache/solr/schema/ManagedIndexSchema.java | 4 ++-- .../apache/solr/schema/RandomSortField.java | 2 +- .../search/ComplexPhraseQParserPlugin.java | 4 ++-- .../solr/search/ExportQParserPlugin.java | 2 +- .../solr/search/ExtendedDismaxQParser.java | 4 ++-- .../apache/solr/search/HashQParserPlugin.java | 18 +++++++++--------- .../apache/solr/search/ReRankCollector.java | 2 +- .../solr/search/ReRankQParserPlugin.java | 2 +- .../solr/search/facet/FacetFieldMerger.java | 2 +- .../apache/solr/search/facet/UniqueAgg.java | 2 +- .../search/function/CollapseScoreFunction.java | 2 +- .../apache/solr/search/join/GraphQuery.java | 2 +- .../solr/spelling/PossibilityIterator.java | 6 +++--- .../java/org/apache/solr/update/UpdateLog.java | 2 +- .../src/java/org/apache/solr/util/RTimer.java | 2 +- .../org/apache/solr/util/SimplePostTool.java | 4 ++-- .../solr/cloud/BaseCdcrDistributedZkTest.java | 4 ++-- .../cloud/ChaosMonkeyNothingIsSafeTest.java | 4 ++-- .../solr/cloud/ConnectionManagerTest.java | 2 +- .../solr/cloud/DistributedQueueTest.java | 2 +- .../apache/solr/cloud/LeaderElectionTest.java | 4 ++-- ...riddenZkACLAndCredentialsProvidersTest.java | 4 ++-- ...erseerCollectionConfigSetProcessorTest.java | 2 +- .../apache/solr/cloud/ZkSolrClientTest.java | 2 +- .../solr/core/CachingDirectoryFactoryTest.java | 2 +- .../AnalysisRequestHandlerTestBase.java | 2 +- .../solr/handler/PingRequestHandlerTest.java | 2 +- .../handler/XmlUpdateRequestHandlerTest.java | 2 +- .../CoreMergeIndexesAdminHandlerTest.java | 2 +- .../solr/internal/csv/CSVParserTest.java | 2 +- .../reporters/SolrGraphiteReporterTest.java | 2 +- .../response/TestGraphMLResponseWriter.java | 2 +- .../apache/solr/rest/TestManagedResource.java | 4 ++-- .../org/apache/solr/rest/TestRestManager.java | 2 +- .../TestCloudManagedSchemaConcurrent.java | 2 +- .../search/AnalyticsTestQParserPlugin.java | 10 +++++----- .../solr/search/TestExtendedDismaxParser.java | 10 +++++----- .../org/apache/solr/search/TestFiltering.java | 2 +- .../solr/search/TestRankQueryPlugin.java | 14 +++++++------- .../ConjunctionSolrSpellCheckerTest.java | 4 ++-- .../spelling/IndexBasedSpellCheckerTest.java | 2 +- .../store/blockcache/BlockDirectoryTest.java | 2 +- .../apache/solr/util/SimplePostToolTest.java | 2 +- .../apache/solr/util/SolrPluginUtilsTest.java | 2 +- .../solr/util/TestSolrCLIRunExample.java | 2 +- .../solrj/impl/ConcurrentUpdateSolrClient.java | 2 +- .../solr/client/solrj/io/ModelCache.java | 4 ++-- .../solrj/io/graph/GatherNodesStream.java | 2 +- .../solrj/io/graph/ShortestPathStream.java | 2 +- .../client/solrj/io/ops/GroupOperation.java | 2 +- .../client/solrj/io/stream/RankStream.java | 2 +- .../io/stream/SignificantTermsStream.java | 2 +- .../solrj/io/stream/TextLogitStream.java | 2 +- .../solrj/response/SpellCheckResponse.java | 4 ++-- .../solr/common/cloud/ZkStateReader.java | 2 +- .../client/solrj/TestLBHttpSolrClient.java | 2 +- .../embedded/SolrExampleStreamingTest.java | 4 ++-- .../impl/ConcurrentUpdateSolrClientTest.java | 6 +++--- .../java/org/apache/solr/SolrTestCaseJ4.java | 2 +- 152 files changed, 253 insertions(+), 250 deletions(-) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 15f4ff3458a..e6da58639d3 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -81,7 +81,11 @@ Other * LUCENE-7681: MemoryIndex uses new DocValues API (Alan Woodward) ======================= Lucene 6.6.0 ======================= -(No Changes) + +Other + +* LUCENE-7754: Inner classes should be static whenever possible. + (Daniel Jelinski via Adrien Grand) ======================= Lucene 6.5.0 ======================= diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java index ba44dd8c40e..a2364975168 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java @@ -30021,7 +30021,7 @@ public final class HTMLStripCharFilter extends BaseCharFilter { return ZZ_BUFFERSIZE; } - private class TextSegment extends OpenStringBuilder { + private static class TextSegment extends OpenStringBuilder { /** The position from which the next char will be read. */ int pos = 0; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex index 98c39462179..d810d79babf 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex @@ -19,13 +19,12 @@ package org.apache.lucene.analysis.charfilter; import java.io.IOException; import java.io.Reader; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.util.CharArrayMap; -import org.apache.lucene.analysis.util.CharArraySet; +import org.apache.lucene.analysis.CharArrayMap; +import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.util.OpenStringBuilder; /** @@ -238,7 +237,7 @@ InlineElment = ( [aAbBiIqQsSuU] | return ZZ_BUFFERSIZE; } - private class TextSegment extends OpenStringBuilder { + private static class TextSegment extends OpenStringBuilder { /** The position from which the next char will be read. */ int pos = 0; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java index e3fa8033cf2..0775cf7d936 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java @@ -583,7 +583,7 @@ public final class ShingleFilter extends TokenFilter { } } - private class InputWindowToken { + private static class InputWindowToken { final AttributeSource attSource; final CharTermAttribute termAtt; final OffsetAttribute offsetAtt; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java index 5e32afe577f..b7312cb7563 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java @@ -157,7 +157,7 @@ public class TestDictionary extends LuceneTestCase { tempDir.close(); } - private class CloseCheckInputStream extends FilterInputStream { + private static class CloseCheckInputStream extends FilterInputStream { private boolean closed = false; public CloseCheckInputStream(InputStream delegate) { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java index 7f0481fb9fd..2804bfd5a07 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java @@ -184,7 +184,7 @@ public class TestWordDelimiterFilter extends BaseTokenStreamTestCase { /* * Set a large position increment gap of 10 if the token is "largegap" or "/" */ - private final class LargePosIncTokenFilter extends TokenFilter { + private static final class LargePosIncTokenFilter extends TokenFilter { private CharTermAttribute termAtt = addAttribute(CharTermAttribute.class); private PositionIncrementAttribute posIncAtt = addAttribute(PositionIncrementAttribute.class); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java index f4e8b7931d1..7516a23fd65 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java @@ -171,7 +171,7 @@ public class TestWordDelimiterGraphFilter extends BaseTokenStreamTestCase { /* * Set a large position increment gap of 10 if the token is "largegap" or "/" */ - private final class LargePosIncTokenFilter extends TokenFilter { + private static final class LargePosIncTokenFilter extends TokenFilter { private CharTermAttribute termAtt = addAttribute(CharTermAttribute.class); private PositionIncrementAttribute posIncAtt = addAttribute(PositionIncrementAttribute.class); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java index 3e54cc0c49a..81da458726d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java @@ -57,7 +57,7 @@ public class NumericPayloadTokenFilterTest extends BaseTokenStreamTestCase { assertTrue(seenDogs + " does not equal: " + true, seenDogs == true); } - private final class WordTokenFilter extends TokenFilter { + private static final class WordTokenFilter extends TokenFilter { private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class); private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java index f9010166714..5333cf0fc60 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java @@ -47,7 +47,7 @@ public class TypeAsPayloadTokenFilterTest extends BaseTokenStreamTestCase { assertTrue(count + " does not equal: " + 10, count == 10); } - private final class WordTokenFilter extends TokenFilter { + private static final class WordTokenFilter extends TokenFilter { private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class); private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class); diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java index c0127a330e3..5c2c2bb63d6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java @@ -223,7 +223,7 @@ public class TestTeeSinkTokenFilter extends BaseTokenStreamTestCase { } - class ModuloTokenFilter extends TokenFilter { + static class ModuloTokenFilter extends TokenFilter { int modCount; @@ -248,7 +248,7 @@ public class TestTeeSinkTokenFilter extends BaseTokenStreamTestCase { } } - class ModuloSinkFilter extends FilteringTokenFilter { + static class ModuloSinkFilter extends FilteringTokenFilter { int count = 0; int modCount; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java index 881bc2f576f..783b7073da3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java @@ -71,7 +71,7 @@ public class TestSnowball extends BaseTokenStreamTestCase { assertEquals(new BytesRef(new byte[]{0,1,2,3}), payloadAtt.getPayload()); } - private final class TestTokenStream extends TokenStream { + private static final class TestTokenStream extends TokenStream { private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class); private final OffsetAttribute offsetAtt = addAttribute(OffsetAttribute.class); private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class); 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 8d3c706ee1f..eaa5a4453f7 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 @@ -127,7 +127,7 @@ public class TestUAX29URLEmailTokenizer extends BaseTokenStreamTestCase { } /** Passes through tokens with type "" and blocks all other types. */ - private class URLFilter extends TokenFilter { + private static class URLFilter extends TokenFilter { private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class); public URLFilter(TokenStream in) { super(in); @@ -146,7 +146,7 @@ public class TestUAX29URLEmailTokenizer extends BaseTokenStreamTestCase { } /** Passes through tokens with type "" and blocks all other types. */ - private class EmailFilter extends TokenFilter { + private static class EmailFilter extends TokenFilter { private final TypeAttribute typeAtt = addAttribute(TypeAttribute.class); public EmailFilter(TokenStream in) { super(in); diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java index e48c4ba731d..bfe7c12a2a9 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java @@ -112,7 +112,7 @@ public final class ICUTransformFilter extends TokenFilter { /** * Wrap a {@link CharTermAttribute} with the Replaceable API. */ - final class ReplaceableTermAttribute implements Replaceable { + static final class ReplaceableTermAttribute implements Replaceable { private char buffer[]; private int length; private CharTermAttribute token; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java index acbfe82be9a..ccdb207659a 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java @@ -82,7 +82,7 @@ public class CachingNaiveBayesClassifierTest extends ClassificationTestBase fields; SimpleTVFields(SortedMap fields) { diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java index aa19f20e266..2e8ed630307 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java @@ -742,7 +742,7 @@ public final class CompressingTermVectorsReader extends TermVectorsReader implem } - private class TVTerms extends Terms { + private static class TVTerms extends Terms { private final int numTerms, flags; private final int[] prefixLengths, suffixLengths, termFreqs, positionIndex, positions, startOffsets, lengths, payloadIndex; diff --git a/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java b/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java index c67d07bfe1c..eee0c16a463 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java @@ -160,7 +160,7 @@ public class ParallelLeafReader extends LeafReader { } // Single instance of this, per ParallelReader instance - private final class ParallelFields extends Fields { + private static final class ParallelFields extends Fields { final Map fields = new TreeMap<>(); ParallelFields() { diff --git a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java index dbd05e8e96c..8827a9f9385 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java @@ -68,7 +68,7 @@ public final class ConstantScoreQuery extends Query { * wraps a query with its own optimized top-level * scorer (e.g. BooleanScorer) we can use that * top-level scorer. */ - protected class ConstantBulkScorer extends BulkScorer { + protected static class ConstantBulkScorer extends BulkScorer { final BulkScorer bulkScorer; final Weight weight; final float theScore; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java index 79783b500ca..c8426060921 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java @@ -75,7 +75,7 @@ public class TestCodecs extends LuceneTestCase { NUM_TEST_ITER = atLeast(20); } - class FieldData implements Comparable { + static class FieldData implements Comparable { final FieldInfo fieldInfo; final TermData[] terms; final boolean omitTF; @@ -107,7 +107,7 @@ public class TestCodecs extends LuceneTestCase { } } - class PositionData { + static class PositionData { int pos; BytesRef payload; @@ -117,7 +117,7 @@ public class TestCodecs extends LuceneTestCase { } } - class TermData implements Comparable { + static class TermData implements Comparable { String text2; final BytesRef text; int[] docs; @@ -300,7 +300,7 @@ public class TestCodecs extends LuceneTestCase { dir.close(); } - private class Verify extends Thread { + private static class Verify extends Thread { final Fields termsDict; final FieldData[] fields; final SegmentInfo si; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java index 993a521a36e..aa2901cabbe 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java @@ -290,7 +290,7 @@ public class TestFlushByRamOrCountsPolicy extends LuceneTestCase { assertEquals(bytesUsed, flushControl.activeBytes()); } - public class IndexThread extends Thread { + public static class IndexThread extends Thread { IndexWriter writer; LiveIndexWriterConfig iwc; LineFileDocs docs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java index 987852f8e26..c0907a5e682 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java @@ -346,7 +346,7 @@ public class TestIndexWriterExceptions extends LuceneTestCase { private static String CRASH_FAIL_MESSAGE = "I'm experiencing problems"; - private class CrashingFilter extends TokenFilter { + private static class CrashingFilter extends TokenFilter { String fieldName; int count; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java index e4d4018fe7a..6931efaed89 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java @@ -308,7 +308,7 @@ public class TestIndexWriterMerging extends LuceneTestCase { // Just intercepts all merges & verifies that we are never // merging a segment with >= 20 (maxMergeDocs) docs - private class MyMergeScheduler extends MergeScheduler { + private static class MyMergeScheduler extends MergeScheduler { @Override synchronized public void merge(IndexWriter writer, MergeTrigger trigger, boolean newMergesFound) throws IOException { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java index 6b599d2e4b8..6c950b84f9e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java @@ -51,7 +51,7 @@ import org.apache.lucene.util.LuceneTestCase.Slow; public class TestIndexWriterWithThreads extends LuceneTestCase { // Used by test cases below - private class IndexerThread extends Thread { + private static class IndexerThread extends Thread { boolean diskFull; Throwable error; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java index e60a3e17f4f..510a8997f9b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java @@ -41,7 +41,7 @@ import org.apache.lucene.util.TestUtil; public class TestIndexableField extends LuceneTestCase { - private class MyField implements IndexableField { + private static class MyField implements IndexableField { private final int counter; private final IndexableFieldType fieldType = new IndexableFieldType() { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java index 900ec2b6b1c..4f74c30cfe2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java @@ -99,7 +99,7 @@ public class TestMaxTermFrequency extends LuceneTestCase { /** * Simple similarity that encodes maxTermFrequency directly as a byte */ - class TestSimilarity extends TFIDFSimilarity { + static class TestSimilarity extends TFIDFSimilarity { @Override public float lengthNorm(FieldInvertState state) { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java index 363f57e7835..16ce61daf9d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java @@ -50,7 +50,7 @@ import org.apache.lucene.util.TestUtil; public class TestNorms extends LuceneTestCase { final String byteTestField = "normsTestByte"; - class CustomNormEncodingSimilarity extends TFIDFSimilarity { + static class CustomNormEncodingSimilarity extends TFIDFSimilarity { @Override public long encodeNormValue(float f) { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java index 34d8afbd19c..58ef89082d6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java @@ -242,7 +242,7 @@ public class TestPerSegmentDeletes extends LuceneTestCase { return Arrays.copyOf(docs, numDocs); } - public class RangeMergePolicy extends MergePolicy { + public static class RangeMergePolicy extends MergePolicy { boolean doMerge = false; int start; int length; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java index 3cd9a6a6c0a..d386f395edd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java @@ -686,7 +686,7 @@ public class TestStressIndexing2 extends LuceneTestCase { assertFalse(fieldsEnum2.hasNext()); } - private class IndexingThread extends Thread { + private static class IndexingThread extends Thread { IndexWriter w; int base; int range; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java index 4b2a06095a6..76947dd6852 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java @@ -50,7 +50,7 @@ public class TestTermVectorsReader extends LuceneTestCase { private FieldInfos fieldInfos = new FieldInfos(new FieldInfo[0]); private static int TERM_FREQ = 3; - private class TestToken implements Comparable { + private static class TestToken implements Comparable { String text; int pos; int startOffset; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java index e7de028cd68..eb08475f8b2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java @@ -157,7 +157,7 @@ public class TestTransactionRollback extends LuceneTestCase { } // Rolls back to previous commit point - class RollbackDeletionPolicy extends IndexDeletionPolicy { + static class RollbackDeletionPolicy extends IndexDeletionPolicy { private int rollbackPoint; public RollbackDeletionPolicy(int rollbackPoint) { @@ -197,7 +197,7 @@ public class TestTransactionRollback extends LuceneTestCase { } } - class DeleteLastCommitPolicy extends IndexDeletionPolicy { + static class DeleteLastCommitPolicy extends IndexDeletionPolicy { @Override public void onCommit(List commits) throws IOException {} @@ -222,7 +222,7 @@ public class TestTransactionRollback extends LuceneTestCase { } // Keeps all commit points (used to build index) - class KeepAllDeletionPolicy extends IndexDeletionPolicy { + static class KeepAllDeletionPolicy extends IndexDeletionPolicy { @Override public void onCommit(List commits) throws IOException {} @Override diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java index ee47fffbca1..a0fca4c62b4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java @@ -98,7 +98,7 @@ public class TestUniqueTermCount extends LuceneTestCase { /** * Simple similarity that encodes maxTermFrequency directly */ - class TestSimilarity extends Similarity { + static class TestSimilarity extends Similarity { @Override public long computeNorm(FieldInvertState state) { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java index a9bac609621..f09dfde0955 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java @@ -183,7 +183,7 @@ public class TestCustomSearcherSort extends LuceneTestCase { if (VERBOSE) System.out.println(message); } - public class CustomSearcher extends IndexSearcher { + public static class CustomSearcher extends IndexSearcher { private int switcher; public CustomSearcher(IndexReader r, int switcher) { @@ -212,7 +212,7 @@ public class TestCustomSearcherSort extends LuceneTestCase { } } - private class RandomGen { + private static class RandomGen { RandomGen(Random random) { this.random = random; base.set(1980, 1, 1); diff --git a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java index d12caf101d1..6d699e8a1c1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java @@ -201,7 +201,7 @@ public class TestEarlyTerminatingSortingCollector extends LuceneTestCase { } } - private class TestTerminatedEarlySimpleCollector extends SimpleCollector { + private static class TestTerminatedEarlySimpleCollector extends SimpleCollector { private boolean collectedSomething; public boolean collectedSomething() { return collectedSomething; @@ -216,7 +216,7 @@ public class TestEarlyTerminatingSortingCollector extends LuceneTestCase { } } - private class TestEarlyTerminatingSortingcollectorQueryTimeout implements QueryTimeout { + private static class TestEarlyTerminatingSortingcollectorQueryTimeout implements QueryTimeout { final private boolean shouldExit; public TestEarlyTerminatingSortingcollectorQueryTimeout(boolean shouldExit) { this.shouldExit = shouldExit; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java index 72fdc7aa689..f332a36a3ae 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java @@ -75,7 +75,7 @@ public class TestPrefixRandom extends LuceneTestCase { } /** a stupid prefix query that just blasts thru the terms */ - private class DumbPrefixQuery extends MultiTermQuery { + private static class DumbPrefixQuery extends MultiTermQuery { private final BytesRef prefix; DumbPrefixQuery(Term term) { @@ -88,7 +88,7 @@ public class TestPrefixRandom extends LuceneTestCase { return new SimplePrefixTermsEnum(terms.iterator(), prefix); } - private class SimplePrefixTermsEnum extends FilteredTermsEnum { + private static class SimplePrefixTermsEnum extends FilteredTermsEnum { private final BytesRef prefix; private SimplePrefixTermsEnum(TermsEnum tenum, BytesRef prefix) { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java index a704d5479e1..78a43525342 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java @@ -102,7 +102,7 @@ public class TestRegexpRandom2 extends LuceneTestCase { } /** a stupid regexp query that just blasts thru the terms */ - private class DumbRegexpQuery extends MultiTermQuery { + private static class DumbRegexpQuery extends MultiTermQuery { private final Automaton automaton; DumbRegexpQuery(Term term, int flags) { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java index de96755b1d6..fbc0b355a0d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java @@ -90,7 +90,7 @@ public class TestSimilarityProvider extends LuceneTestCase { assertTrue(foodocs.scoreDocs[0].score < bardocs.scoreDocs[0].score); } - private class ExampleSimilarityProvider extends PerFieldSimilarityWrapper { + private static class ExampleSimilarityProvider extends PerFieldSimilarityWrapper { private Similarity sim1 = new Sim1(); private Similarity sim2 = new Sim2(); @@ -104,7 +104,7 @@ public class TestSimilarityProvider extends LuceneTestCase { } } - private class Sim1 extends TFIDFSimilarity { + private static class Sim1 extends TFIDFSimilarity { @Override public long encodeNormValue(float f) { @@ -142,7 +142,7 @@ public class TestSimilarityProvider extends LuceneTestCase { } } - private class Sim2 extends TFIDFSimilarity { + private static class Sim2 extends TFIDFSimilarity { @Override public long encodeNormValue(float f) { diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java index d00e520a371..f0ad9b9d3b1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java @@ -153,7 +153,7 @@ public class TestTermScorer extends LuceneTestCase { assertTrue("doc should be number 5", ts.docID() == 5); } - private class TestHit { + private static class TestHit { public int doc; public float score; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java index d26006cad0a..6a02e587eb5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java @@ -320,7 +320,7 @@ public class TestTimeLimitingCollector extends LuceneTestCase { } // counting collector that can slow down at collect(). - private class MyHitCollector extends SimpleCollector { + private static class MyHitCollector extends SimpleCollector { private final BitSet bits = new BitSet(); private int slowdown = 0; private int lastDocCollected = -1; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java index fa7a3fb1c05..c2578612cad 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java @@ -76,7 +76,7 @@ public class TestLockFactory extends LuceneTestCase { } } - class MockLockFactory extends LockFactory { + static class MockLockFactory extends LockFactory { public Map locksCreated = Collections.synchronizedMap(new HashMap()); @@ -87,7 +87,7 @@ public class TestLockFactory extends LuceneTestCase { return lock; } - public class MockLock extends Lock { + public static class MockLock extends Lock { @Override public void close() { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java b/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java index 9f56d7b45ed..ca0f811e97d 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java @@ -40,7 +40,7 @@ public class TestCloseableThreadLocal extends LuceneTestCase { assertNull(ctl.get()); } - public class InitValueThreadLocal extends CloseableThreadLocal { + public static class InitValueThreadLocal extends CloseableThreadLocal { @Override protected Object initialValue() { return TEST_VALUE; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java index fc04c5ed286..a9d803bcc56 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java @@ -266,7 +266,7 @@ public class TestQueryBuilder extends LuceneTestCase { } } - private class SimpleCJKAnalyzer extends Analyzer { + private static class SimpleCJKAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { return new TokenStreamComponents(new SimpleCJKTokenizer()); diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java index 7a8e5f5f6e9..6f704c94f5b 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java @@ -1458,7 +1458,7 @@ public class TestFSTs extends LuceneTestCase { } // used by slowcompletor - class TwoLongs { + static class TwoLongs { long a; long b; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java index 205a540f35a..b80f2bd08cd 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java @@ -185,7 +185,7 @@ public class CollisionMap { return memoryUsage; } - private class EntryIterator implements Iterator { + private static class EntryIterator implements Iterator { Entry next; // next entry to return int index; // current slot Entry[] ents; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java index 46141bcdfb9..c590502f929 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java @@ -720,7 +720,7 @@ public class GroupFacetCollectorTest extends AbstractGroupingTestCase { return null; } - private class IndexContext { + private static class IndexContext { final int numDocs; final DirectoryReader indexReader; @@ -744,7 +744,7 @@ public class GroupFacetCollectorTest extends AbstractGroupingTestCase { } } - private class GroupedFacetResult { + private static class GroupedFacetResult { final int totalCount; final int totalMissingCount; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java index 08055a27298..e5d7e82e639 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java @@ -202,7 +202,7 @@ public class TestUnifiedHighlighterExtensibility extends LuceneTestCase { } /** Tests maintaining extensibility/visibility of {@link org.apache.lucene.search.uhighlight.FieldHighlighter} out of package. */ - private class CustomFieldHighlighter extends FieldHighlighter { + private static class CustomFieldHighlighter extends FieldHighlighter { CustomFieldHighlighter(String field, FieldOffsetStrategy fieldOffsetStrategy, BreakIterator breakIterator, PassageScorer passageScorer, int maxPassages, int maxNoHighlightPassages, PassageFormatter passageFormatter) { super(field, fieldOffsetStrategy, breakIterator, passageScorer, maxPassages, maxNoHighlightPassages, passageFormatter); } diff --git a/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java index 2ae6c0173f0..632bcc7b74d 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java @@ -238,7 +238,7 @@ public class CustomScoreQuery extends Query implements Cloneable { /** * A scorer that applies a (callback) function on scores of the subQuery. */ - private class CustomScorer extends FilterScorer { + private static class CustomScorer extends FilterScorer { private final float qWeight; private final Scorer subQueryScorer; private final Scorer[] valSrcScorers; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java index 540ecf8dc73..d001cc8f968 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java @@ -153,7 +153,7 @@ public class TestCustomScoreQuery extends FunctionTestSetup { } } - private final class CustomExternalQuery extends CustomScoreQuery { + private static final class CustomExternalQuery extends CustomScoreQuery { @Override protected CustomScoreProvider getCustomScoreProvider(LeafReaderContext context) throws IOException { diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java index 3c5b80f7cca..c39421b1e4f 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java @@ -461,7 +461,7 @@ public class TestPayloadSpans extends LuceneTestCase { assertEquals("expected numSpans", numSpans, cnt); } - final class PayloadAnalyzer extends Analyzer { + static final class PayloadAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { @@ -470,7 +470,7 @@ public class TestPayloadSpans extends LuceneTestCase { } } - final class PayloadFilter extends TokenFilter { + static final class PayloadFilter extends TokenFilter { Set entities = new HashSet<>(); Set nopayload = new HashSet<>(); int pos; @@ -515,7 +515,7 @@ public class TestPayloadSpans extends LuceneTestCase { } } - public final class TestPayloadAnalyzer extends Analyzer { + public static final class TestPayloadAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java index bdb6256d80e..85a5f3942e9 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java @@ -120,7 +120,7 @@ public class TestMultiAnalyzer extends BaseTokenStreamTestCase { * Expands "multi" to "multi" and "multi2", both at the same position, * and expands "triplemulti" to "triplemulti", "multi3", and "multi2". */ - private class MultiAnalyzer extends Analyzer { + private static class MultiAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { @@ -129,7 +129,7 @@ public class TestMultiAnalyzer extends BaseTokenStreamTestCase { } } - private final class TestFilter extends TokenFilter { + private static final class TestFilter extends TokenFilter { private String prevType; private int prevStartOffset; @@ -191,7 +191,7 @@ public class TestMultiAnalyzer extends BaseTokenStreamTestCase { * Analyzes "the quick brown" as: quick(incr=2) brown(incr=1). * Does not work correctly for input other than "the quick brown ...". */ - private class PosIncrementAnalyzer extends Analyzer { + private static class PosIncrementAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { @@ -200,7 +200,7 @@ public class TestMultiAnalyzer extends BaseTokenStreamTestCase { } } - private final class TestPosIncrementFilter extends TokenFilter { + private static final class TestPosIncrementFilter extends TokenFilter { CharTermAttribute termAtt; PositionIncrementAttribute posIncrAtt; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java index 7490e8cb608..4c28e8f8b23 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java @@ -336,7 +336,7 @@ public class TestMultiFieldQueryParser extends LuceneTestCase { } /** whitespace+lowercase analyzer with synonyms (dogs,dog) and (guinea pig,cavy) */ - private class MockSynonymAnalyzer extends Analyzer { + private static class MockSynonymAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, true); diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java index 56ef65af778..220ce021bb8 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java @@ -139,7 +139,7 @@ public class TestMultiAnalyzerQPHelper extends LuceneTestCase { * Expands "multi" to "multi" and "multi2", both at the same position, and * expands "triplemulti" to "triplemulti", "multi3", and "multi2". */ - private class MultiAnalyzer extends Analyzer { + private static class MultiAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { @@ -148,7 +148,7 @@ public class TestMultiAnalyzerQPHelper extends LuceneTestCase { } } - private final class TestFilter extends TokenFilter { + private static final class TestFilter extends TokenFilter { private String prevType; private int prevStartOffset; @@ -206,7 +206,7 @@ public class TestMultiAnalyzerQPHelper extends LuceneTestCase { * Analyzes "the quick brown" as: quick(incr=2) brown(incr=1). Does not work * correctly for input other than "the quick brown ...". */ - private class PosIncrementAnalyzer extends Analyzer { + private static class PosIncrementAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { @@ -215,7 +215,7 @@ public class TestMultiAnalyzerQPHelper extends LuceneTestCase { } } - private class TestPosIncrementFilter extends TokenFilter { + private static class TestPosIncrementFilter extends TokenFilter { private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class); private final PositionIncrementAttribute posIncrAtt = addAttribute(PositionIncrementAttribute.class); diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java index 2d5ee43d452..2aa96beaaaf 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java @@ -350,7 +350,7 @@ public class TestQPHelper extends LuceneTestCase { } //individual CJK chars as terms, like StandardAnalyzer - private class SimpleCJKTokenizer extends Tokenizer { + private static class SimpleCJKTokenizer extends Tokenizer { private CharTermAttribute termAtt = addAttribute(CharTermAttribute.class); public SimpleCJKTokenizer() { @@ -368,7 +368,7 @@ public class TestQPHelper extends LuceneTestCase { } } - private class SimpleCJKAnalyzer extends Analyzer { + private static class SimpleCJKAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { return new TokenStreamComponents(new SimpleCJKTokenizer()); @@ -1252,7 +1252,7 @@ public class TestQPHelper extends LuceneTestCase { super.tearDown(); } - private class CannedTokenizer extends Tokenizer { + private static class CannedTokenizer extends Tokenizer { private int upto = 0; private final PositionIncrementAttribute posIncr = addAttribute(PositionIncrementAttribute.class); private final CharTermAttribute term = addAttribute(CharTermAttribute.class); @@ -1291,7 +1291,7 @@ public class TestQPHelper extends LuceneTestCase { } } - private class CannedAnalyzer extends Analyzer { + private static class CannedAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String ignored) { return new TokenStreamComponents(new CannedTokenizer()); diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java index 004110634e1..1b8ee96bc40 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java @@ -264,7 +264,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase { } } - private class SimpleCJKAnalyzer extends Analyzer { + private static class SimpleCJKAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { return new TokenStreamComponents(new SimpleCJKTokenizer()); @@ -1095,7 +1095,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase { } /** whitespace+lowercase analyzer with synonyms */ - protected class Analyzer1 extends Analyzer { + protected static class Analyzer1 extends Analyzer { public Analyzer1(){ super(); } @@ -1107,7 +1107,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase { } /** whitespace+lowercase analyzer without synonyms */ - protected class Analyzer2 extends Analyzer { + protected static class Analyzer2 extends Analyzer { public Analyzer2(){ super(); } @@ -1122,7 +1122,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase { /** * Mock collation analyzer: indexes terms as "collated" + term */ - private class MockCollationFilter extends TokenFilter { + private static class MockCollationFilter extends TokenFilter { private final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class); protected MockCollationFilter(TokenStream input) { @@ -1141,7 +1141,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase { } } - private class MockCollationAnalyzer extends Analyzer { + private static class MockCollationAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, true); diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java index 8bd7b894afa..840ade3ad20 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java @@ -112,7 +112,7 @@ public class FuzzyLikeThisQuery extends Query this.maxNumTerms = maxNumTerms; } - class FieldVals + static class FieldVals { String queryString; String fieldName; diff --git a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java index ecf2ff63617..af19e3d978d 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java +++ b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java @@ -72,7 +72,7 @@ public class TestPayloadSpanUtil extends LuceneTestCase { directory.close(); } - final class PayloadAnalyzer extends Analyzer { + final static class PayloadAnalyzer extends Analyzer { @Override public TokenStreamComponents createComponents(String fieldName) { @@ -81,7 +81,7 @@ public class TestPayloadSpanUtil extends LuceneTestCase { } } - final class PayloadFilter extends TokenFilter { + static final class PayloadFilter extends TokenFilter { Set entities = new HashSet<>(); Set nopayload = new HashSet<>(); int pos; 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 f3cc5bd5972..c075ad47918 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 @@ -441,7 +441,7 @@ public class WordBreakSpellChecker { this.maxEvaluations = maxEvaluations; } - private class LengthThenMaxFreqComparator implements + private static class LengthThenMaxFreqComparator implements Comparator { @Override public int compare(SuggestWordArrayWrapper o1, SuggestWordArrayWrapper o2) { @@ -455,7 +455,7 @@ public class WordBreakSpellChecker { } } - private class LengthThenSumFreqComparator implements + private static class LengthThenSumFreqComparator implements Comparator { @Override public int compare(SuggestWordArrayWrapper o1, SuggestWordArrayWrapper o2) { @@ -469,7 +469,7 @@ public class WordBreakSpellChecker { } } - private class CombinationsThenFreqComparator implements + private static class CombinationsThenFreqComparator implements Comparator { @Override public int compare(CombineSuggestionWrapper o1, CombineSuggestionWrapper o2) { @@ -484,7 +484,7 @@ public class WordBreakSpellChecker { } } - private class SuggestWordArrayWrapper { + private static class SuggestWordArrayWrapper { final SuggestWord[] suggestWords; final int freqMax; final int freqSum; @@ -502,7 +502,7 @@ public class WordBreakSpellChecker { } } - private class CombineSuggestionWrapper { + private static class CombineSuggestionWrapper { final CombineSuggestion combineSuggestion; final int numCombinations; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java index 7a5e3e00ef5..4a29f244432 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java @@ -238,7 +238,7 @@ public class ContextQuery extends CompletionQuery { } } - private class ContextCompletionWeight extends CompletionWeight { + private static class ContextCompletionWeight extends CompletionWeight { private final Map contextMap; private final int[] contextLengths; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java index fb876d2b451..5b7e7142349 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java @@ -105,7 +105,7 @@ public class ExternalRefSorter implements BytesRefSorter, Closeable { * Iterate over byte refs in a file. */ // TODO: this class is a bit silly ... sole purpose is to "remove" Closeable from what #iterator returns: - class ByteSequenceIterator implements BytesRefIterator { + static class ByteSequenceIterator implements BytesRefIterator { private final OfflineSorter.ByteSequencesReader reader; private BytesRef scratch; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java index 1cc89a4d076..d6c1a97e4fa 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java @@ -267,7 +267,7 @@ public class WFSTCompletionLookup extends Lookup implements Accountable { return Integer.MAX_VALUE - (int)value; } - private final class WFSTInputIterator extends SortedInputIterator { + private static final class WFSTInputIterator extends SortedInputIterator { WFSTInputIterator(Directory tempDir, String tempFileNamePrefix, InputIterator source) throws IOException { super(tempDir, tempFileNamePrefix, source); diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java index 3e78f59e9fb..948ebeb0151 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java @@ -147,17 +147,17 @@ public class JaspellLookup extends Lookup implements Accountable { node.data = Long.valueOf(in.readLong()); } if ((mask & LO_KID) != 0) { - TSTNode kid = trie.new TSTNode('\0', node); + TSTNode kid = new TSTNode('\0', node); node.relatives[TSTNode.LOKID] = kid; readRecursively(in, kid); } if ((mask & EQ_KID) != 0) { - TSTNode kid = trie.new TSTNode('\0', node); + TSTNode kid = new TSTNode('\0', node); node.relatives[TSTNode.EQKID] = kid; readRecursively(in, kid); } if ((mask & HI_KID) != 0) { - TSTNode kid = trie.new TSTNode('\0', node); + TSTNode kid = new TSTNode('\0', node); node.relatives[TSTNode.HIKID] = kid; readRecursively(in, kid); } @@ -196,7 +196,7 @@ public class JaspellLookup extends Lookup implements Accountable { @Override public boolean load(DataInput input) throws IOException { count = input.readVLong(); - TSTNode root = trie.new TSTNode('\0', null); + TSTNode root = new TSTNode('\0', null); readRecursively(input, root); trie.setRoot(root); return true; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java index 15deaea6beb..2a4a43963e5 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java @@ -71,7 +71,7 @@ public class JaspellTernarySearchTrie implements Accountable { /** * An inner class of Ternary Search Trie that represents a node in the trie. */ - protected final class TSTNode implements Accountable { + protected static final class TSTNode implements Accountable { /** Index values for accessing relatives array. */ protected final static int PARENT = 0, LOKID = 1, EQKID = 2, HIKID = 3; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java index a7e9b002c5c..57173e246d6 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java @@ -411,7 +411,7 @@ public class DocumentDictionaryTest extends LuceneTestCase { return suggestionList; } - private class Suggestion { + private static class Suggestion { private long weight; private BytesRef payload; private Set contexts; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java index 478358b5c92..423e62a0ee5 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java @@ -910,7 +910,7 @@ public class AnalyzingInfixSuggesterTest extends LuceneTestCase { a.close(); } - private class IndexDocument implements Runnable { + private static class IndexDocument implements Runnable { AnalyzingInfixSuggester suggester; String key; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java index adda0fcf37d..165c9f26e43 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java @@ -1118,7 +1118,7 @@ public class FuzzySuggesterTest extends LuceneTestCase { private static final Comparator CHARSEQUENCE_COMPARATOR = new CharSequenceComparator(); - public class CompareByCostThenAlpha implements Comparator { + public static class CompareByCostThenAlpha implements Comparator { @Override public int compare(LookupResult a, LookupResult b) { if (a.value > b.value) { diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java index 01791b792d1..312b644e9f5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java @@ -274,7 +274,7 @@ public abstract class BaseLockFactoryTestCase extends LuceneTestCase { } } - private class SearcherThread extends Thread { + private static class SearcherThread extends Thread { private Directory dir; private int numIteration; public boolean hitException = false; diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java index 5b2f0b80b00..2c20abdbd81 100644 --- a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java +++ b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java @@ -786,7 +786,7 @@ public class GetMavenDependenciesTask extends Task { /** * Stores information about an external dependency */ - private class ExternalDependency implements Comparable { + private static class ExternalDependency implements Comparable { String groupId; String artifactId; boolean isTestDependency; 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 3179c78964c..d7844b00b97 100644 --- a/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java +++ b/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java @@ -150,7 +150,7 @@ public class LibVersionsCheckTask extends Task { */ private Map> ignoreConflictVersions = new HashMap<>(); - private class Dependency { + private static class Dependency { String org; String name; String directVersion; diff --git a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java index 7545eacb18c..d4418daec81 100644 --- a/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java +++ b/solr/contrib/dataimporthandler-extras/src/java/org/apache/solr/handler/dataimport/MailEntityProcessor.java @@ -728,8 +728,8 @@ public class MailEntityProcessor extends EntityProcessorBase { return true; } } - - class MailsSinceLastCheckFilter implements CustomFilter { + + static class MailsSinceLastCheckFilter implements CustomFilter { private Date since; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java index 51b5841aea6..8fced583e2c 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/VariableResolver.java @@ -167,7 +167,7 @@ public class VariableResolver { return TemplateUpdateProcessorFactory.getVariables(expr, cache); } - class CurrentLevel { + static class CurrentLevel { final Map map; final int level; CurrentLevel(int level, Map map) { diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java index b72f3797a48..2ef5a911834 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java @@ -73,7 +73,7 @@ public class AbstractDIHCacheTestCase { //A limitation of this test class is that the primary key needs to be the first one in the list. //DIHCaches, however, can handle any field being the primary key. - class ControlData implements Comparable, Iterable { + static class ControlData implements Comparable, Iterable { Object[] data; ControlData(Object[] data) { diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java index 06b89c3a4a6..277404451c1 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java @@ -568,8 +568,8 @@ public abstract class AbstractSqlEntityProcessorTestCase extends } return changeSet.toArray(new String[changeSet.size()]); } - - class IntChanges { + + static class IntChanges { public Integer[] changedKeys; public Integer[] deletedKeys; public Integer[] addedKeys; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java index 95af5f9494b..089a133d333 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java @@ -109,7 +109,7 @@ public class TestContentStreamDataSource extends AbstractDataImportHandlerTestCa fail("Commit should have occured but it did not"); } - private class SolrInstance { + private static class SolrInstance { String name; Integer port; File homeDir; diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java index 27a30d170e0..92bd01ff443 100644 --- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java +++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/XLSXResponseWriter.java @@ -98,7 +98,7 @@ class XLSXWriter extends TextResponseWriter { SolrQueryRequest req; SolrQueryResponse rsp; - class SerialWriteWorkbook { + static class SerialWriteWorkbook { SXSSFWorkbook swb; Sheet sh; diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java index 37990ea4dd0..6ecbb6f66fc 100644 --- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java +++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/LTRScoringQuery.java @@ -300,7 +300,7 @@ public class LTRScoringQuery extends Query { return field; } - public class FeatureInfo { + public static class FeatureInfo { final private String name; private float value; private boolean used; diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java index a98fc4f5e34..75d35388235 100644 --- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java +++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/TestLTRReRankingPipeline.java @@ -80,7 +80,7 @@ public class TestLTRReRankingPipeline extends LuceneTestCase { return features; } - private class MockModel extends LTRScoringModel { + private static class MockModel extends LTRScoringModel { public MockModel(String name, List features, List norms, diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java index e7cc9b7fb15..133bc63284d 100644 --- a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java +++ b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java @@ -376,7 +376,7 @@ public class VelocityResponseWriter implements QueryResponseWriter, SolrCoreAwar } // see: http://svn.apache.org/repos/asf/velocity/tools/branches/2.0.x/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java - private class SolrVelocityResourceTool extends ResourceTool { + private static class SolrVelocityResourceTool extends ResourceTool { private ClassLoader solrClassLoader; diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java index e0449b4a0f1..4d3cee7d737 100644 --- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java +++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java @@ -431,7 +431,7 @@ public class Overseer implements Closeable { } - class OverseerThread extends Thread implements Closeable { + static class OverseerThread extends Thread implements Closeable { protected volatile boolean isClosed; private Closeable thread; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java index c7604d60017..e031303ad78 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java @@ -108,7 +108,7 @@ public class OverseerTaskQueue extends DistributedQueue { /** * Watcher that blocks until a WatchedEvent occurs for a znode. */ - private final class LatchWatcher implements Watcher { + private static final class LatchWatcher implements Watcher { private final Object lock; private WatchedEvent event; diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java index d7072e75057..fa600801b90 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java @@ -239,7 +239,7 @@ public class ZkController { } // notifies registered listeners after the ZK reconnect in the background - private class OnReconnectNotifyAsync implements Callable { + private static class OnReconnectNotifyAsync implements Callable { private final OnReconnect listener; diff --git a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java index 08a8a4e20f2..e710063f606 100644 --- a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; * */ public abstract class CachingDirectoryFactory extends DirectoryFactory { - protected class CacheValue { + protected static class CacheValue { final public String path; final public Directory directory; // for debug diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java index 75a787b8804..a151a43061a 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java @@ -207,7 +207,7 @@ public class CdcrReplicator implements Runnable { /** * Exception to catch update request issues with the target cluster. */ - public class CdcrReplicatorException extends Exception { + public static class CdcrReplicatorException extends Exception { private final UpdateRequest req; private final UpdateResponse rsp; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java index 2ca0d800be5..bf80608745a 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java @@ -197,7 +197,7 @@ class CdcrReplicatorState { } - class BenchmarkTimer { + static class BenchmarkTimer { private long startTime; private long runTime = 0; @@ -266,7 +266,7 @@ class CdcrReplicatorState { } - private class ErrorQueueEntry { + private static class ErrorQueueEntry { private ErrorType type; private Date timestamp; @@ -277,7 +277,7 @@ class CdcrReplicatorState { } } - private class FixedQueue extends LinkedList { + private static class FixedQueue extends LinkedList { private int maxSize; diff --git a/solr/core/src/java/org/apache/solr/handler/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/ExportWriter.java index 7602d9eb57b..bd43d5fc31a 100644 --- a/solr/core/src/java/org/apache/solr/handler/ExportWriter.java +++ b/solr/core/src/java/org/apache/solr/handler/ExportWriter.java @@ -939,7 +939,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable { public int resetValue(); } - class IntDesc implements IntComp { + static class IntDesc implements IntComp { public int resetValue() { return Integer.MIN_VALUE; @@ -956,7 +956,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable { } } - class IntAsc implements IntComp { + static class IntAsc implements IntComp { public int resetValue() { return Integer.MAX_VALUE; @@ -1032,7 +1032,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable { public long resetValue(); } - class LongDesc implements LongComp { + static class LongDesc implements LongComp { public long resetValue() { return Long.MIN_VALUE; @@ -1049,7 +1049,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable { } } - class LongAsc implements LongComp { + static class LongAsc implements LongComp { public long resetValue() { return Long.MAX_VALUE; @@ -1125,7 +1125,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable { public float resetValue(); } - public class FloatDesc implements FloatComp { + public static class FloatDesc implements FloatComp { public float resetValue() { return -Float.MAX_VALUE; } @@ -1141,7 +1141,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable { } } - public class FloatAsc implements FloatComp { + public static class FloatAsc implements FloatComp { public float resetValue() { return Float.MAX_VALUE; } @@ -1219,7 +1219,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable { public double resetValue(); } - public class DoubleDesc implements DoubleComp { + public static class DoubleDesc implements DoubleComp { public double resetValue() { return -Double.MAX_VALUE; } @@ -1235,7 +1235,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable { } } - public class DoubleAsc implements DoubleComp { + public static class DoubleAsc implements DoubleComp { public double resetValue() { return Double.MAX_VALUE; } @@ -1712,7 +1712,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable { } } - public class IgnoreException extends IOException { + public static class IgnoreException extends IOException { public void printStackTrace(PrintWriter pw) { pw.print("Early Client Disconnect"); } 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 5efb6c5fe58..d79effd83d1 100644 --- a/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java +++ b/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java @@ -1690,7 +1690,7 @@ public class IndexFetcher { } } - private class DirectoryFile implements FileInterface { + private static class DirectoryFile implements FileInterface { private final String saveAs; private Directory copy2Dir; private IndexOutput outStream; @@ -1725,7 +1725,7 @@ public class IndexFetcher { } } - private class LocalFsFile implements FileInterface { + private static class LocalFsFile implements FileInterface { private File copy2Dir; FileChannel fileChannel; diff --git a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java index 7563fe84ced..f307baa72ea 100644 --- a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java @@ -141,7 +141,7 @@ public class SQLHandler extends RequestHandlerBase implements SolrCoreAware, Per /* * Only necessary for SolrJ JDBC driver since metadata has to be passed back */ - private class SqlHandlerStream extends JDBCStream { + private static class SqlHandlerStream extends JDBCStream { private final boolean includeMetadata; private boolean firstTuple = true; List metadataFields = new ArrayList<>(); diff --git a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java index 8078bdcea47..f6ecd8d888f 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java @@ -521,7 +521,7 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia rb.rsp.add("expanded", expanded); } - private class GroupExpandCollector implements Collector, GroupCollector { + private static class GroupExpandCollector implements Collector, GroupCollector { private SortedDocValues docValues; private MultiDocValues.OrdinalMap ordinalMap; private SortedDocValues segmentValues; @@ -614,7 +614,7 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia } } - private class NumericGroupExpandCollector implements Collector, GroupCollector { + private static class NumericGroupExpandCollector implements Collector, GroupCollector { private NumericDocValues docValues; private String field; @@ -763,7 +763,7 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia // this reader alters the content of the given reader so it should not // delegate the caching stuff - private class ReaderWrapper extends FilterLeafReader { + private static class ReaderWrapper extends FilterLeafReader { private String field; diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java index 83a2d60e72a..1c016c73326 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java +++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java @@ -283,7 +283,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org. * If all nodes prefer local-cores then a bad/heavily-loaded node will receive less requests from healthy nodes. * This will help prevent a distributed deadlock or timeouts in all the healthy nodes due to one bad node. */ - private class IsOnPreferredHostComparator implements Comparator { + private static class IsOnPreferredHostComparator implements Comparator { final private String preferredHostAddress; public IsOnPreferredHostComparator(String preferredHostAddress) { this.preferredHostAddress = preferredHostAddress; diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java index 6aae231a3e4..5c2b07f61d1 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java +++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java @@ -301,7 +301,7 @@ public class PivotFacetFieldValueCollection implements Iterable } /** Sorts {@link PivotFacetValue} instances by their count */ - public class PivotFacetCountComparator implements Comparator { + public static class PivotFacetCountComparator implements Comparator { public int compare(PivotFacetValue left, PivotFacetValue right) { int countCmp = right.getCount() - left.getCount(); return (0 != countCmp) ? countCmp : @@ -310,7 +310,7 @@ public class PivotFacetFieldValueCollection implements Iterable } /** Sorts {@link PivotFacetValue} instances by their value */ - public class PivotFacetValueComparator implements Comparator { + public static class PivotFacetValueComparator implements Comparator { public int compare(PivotFacetValue left, PivotFacetValue right) { return compareWithNullLast(left.getValue(), right.getValue()); } diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java index b76537a05a4..e00120c65e1 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java @@ -353,7 +353,7 @@ public class TermsComponent extends SearchComponent { return sreq; } - public class TermsHelper { + public static class TermsHelper { // map to store returned terms private HashMap> fieldmap; private SolrParams params; diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java index e4ada59dbf7..098e1f76f9c 100644 --- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java +++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java @@ -750,7 +750,7 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf } // Wraps FVH to allow pass-by-reference. Public access to allow use in 3rd party subclasses - public class FvhContainer { + public static class FvhContainer { FastVectorHighlighter fvh; FieldQuery fieldQuery; diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java index b22feabba2c..9bc888dd767 100644 --- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java +++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java @@ -368,13 +368,13 @@ public final class ManagedIndexSchema extends IndexSchema { } - public class FieldExistsException extends SolrException { + public static class FieldExistsException extends SolrException { public FieldExistsException(ErrorCode code, String msg) { super(code, msg); } } - public class SchemaChangedInZkException extends SolrException { + public static class SchemaChangedInZkException extends SolrException { public SchemaChangedInZkException(ErrorCode code, String msg) { super(code, msg); } diff --git a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java b/solr/core/src/java/org/apache/solr/schema/RandomSortField.java index 0ecb195be76..44bb420947f 100644 --- a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java +++ b/solr/core/src/java/org/apache/solr/schema/RandomSortField.java @@ -160,7 +160,7 @@ public class RandomSortField extends FieldType { - public class RandomValueSource extends ValueSource { + public static class RandomValueSource extends ValueSource { private final String field; public RandomValueSource(String field) { diff --git a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java index 22702dcdb85..2a00a0989c4 100644 --- a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java @@ -59,9 +59,9 @@ public class ComplexPhraseQParserPlugin extends QParserPlugin { /** * Modified from {@link org.apache.solr.search.LuceneQParser} and {@link org.apache.solr.search.SurroundQParserPlugin.SurroundQParser} */ - class ComplexPhraseQParser extends QParser { + static class ComplexPhraseQParser extends QParser { - final class SolrQueryParserDelegate extends SolrQueryParser { + static final class SolrQueryParserDelegate extends SolrQueryParser { private SolrQueryParserDelegate(QParser parser, String defaultField) { super(parser, defaultField); } diff --git a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java index 38bb74f9533..6c1714cebb7 100644 --- a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java @@ -121,7 +121,7 @@ public class ExportQParserPlugin extends QParserPlugin { } } - private class ExportCollector extends TopDocsCollector { + private static class ExportCollector extends TopDocsCollector { private FixedBitSet[] sets; diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java index c0aee881c93..a4f9312ac14 100644 --- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java +++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java @@ -956,7 +956,7 @@ public class ExtendedDismaxQParser extends QParser { /** A simple container for storing alias info */ - protected class Alias { + protected static class Alias { public float tie; public Map fields; } @@ -1597,7 +1597,7 @@ public class ExtendedDismaxQParser extends QParser { /** * Simple container for configuration information used when parsing queries */ - public class ExtendedDismaxConfiguration { + public static class ExtendedDismaxConfiguration { /** * The field names specified by 'qf' that (most) clauses will diff --git a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java index 3e0fc2275c9..dc752892d64 100644 --- a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java @@ -59,7 +59,7 @@ public class HashQParserPlugin extends QParserPlugin { return new HashQParser(query, localParams, params, request); } - private class HashQParser extends QParser { + private static class HashQParser extends QParser { public HashQParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest request) { super(query, localParams, params, request); @@ -74,7 +74,7 @@ public class HashQParserPlugin extends QParserPlugin { } } - private class HashQuery extends ExtendedQueryBase implements PostFilter { + private static class HashQuery extends ExtendedQueryBase implements PostFilter { private String keysParam; private int workers; @@ -135,7 +135,7 @@ public class HashQParserPlugin extends QParserPlugin { return searcher.rewrite(constantScoreQuery).createWeight(searcher, false, boost); } - public class BitsFilter extends Filter { + public static class BitsFilter extends Filter { private FixedBitSet[] bitSets; public BitsFilter(FixedBitSet[] bitSets) { this.bitSets = bitSets; @@ -166,7 +166,7 @@ public class HashQParserPlugin extends QParserPlugin { } - class SegmentPartitioner implements Runnable { + static class SegmentPartitioner implements Runnable { public LeafReaderContext context; private int worker; @@ -238,7 +238,7 @@ public class HashQParserPlugin extends QParserPlugin { } } - private class HashCollector extends DelegatingCollector { + private static class HashCollector extends DelegatingCollector { private int worker; private int workers; private HashKey hashKey; @@ -271,7 +271,7 @@ public class HashQParserPlugin extends QParserPlugin { public long hashCode(int doc) throws IOException; } - private class BytesHash implements HashKey { + private static class BytesHash implements HashKey { private SortedDocValues values; private String field; @@ -303,7 +303,7 @@ public class HashQParserPlugin extends QParserPlugin { } } - private class NumericHash implements HashKey { + private static class NumericHash implements HashKey { private NumericDocValues values; private String field; @@ -331,7 +331,7 @@ public class HashQParserPlugin extends QParserPlugin { } } - private class ZeroHash implements HashKey { + private static class ZeroHash implements HashKey { public long hashCode(int doc) { return 0; @@ -342,7 +342,7 @@ public class HashQParserPlugin extends QParserPlugin { } } - private class CompositeHash implements HashKey { + private static class CompositeHash implements HashKey { private HashKey key1; private HashKey key2; diff --git a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java index 1ac1eaff436..8f6bb76baa0 100644 --- a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java +++ b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java @@ -139,7 +139,7 @@ public class ReRankCollector extends TopDocsCollector { } } - public class BoostedComp implements Comparator { + public static class BoostedComp implements Comparator { IntFloatHashMap boostedMap; public BoostedComp(IntIntHashMap boostedDocs, ScoreDoc[] scoreDocs, float maxScore) { diff --git a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java index 3e8bf864be5..1190cdb2bca 100644 --- a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java @@ -71,7 +71,7 @@ public class ReRankQParserPlugin extends QParserPlugin { } } - private final class ReRankQueryRescorer extends QueryRescorer { + private static final class ReRankQueryRescorer extends QueryRescorer { final double reRankWeight; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java index 9f9991918d3..63e8743c32c 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldMerger.java @@ -169,7 +169,7 @@ public class FacetFieldMerger extends FacetRequestSortedMerger { - private class FacetNumBucketsMerger extends FacetMerger { + private static class FacetNumBucketsMerger extends FacetMerger { long sumBuckets; long shardsMissingSum; long shardsTruncatedSum; diff --git a/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java b/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java index 5e1e97c900b..4cdfe02b5a5 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java @@ -187,7 +187,7 @@ public class UniqueAgg extends StrAggValueSource { } - class NumericAcc extends SlotAcc { + static class NumericAcc extends SlotAcc { SchemaField sf; LongSet[] sets; NumericDocValues values; diff --git a/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java b/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java index 5378ea0fd40..3932f56c3a3 100644 --- a/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java +++ b/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java @@ -45,7 +45,7 @@ public class CollapseScoreFunction extends ValueSource { return new CollapseScoreFunctionValues(context); } - public class CollapseScoreFunctionValues extends FunctionValues { + public static class CollapseScoreFunctionValues extends FunctionValues { private CollapseScore cscore; diff --git a/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java b/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java index 3f762e399c8..db416519602 100644 --- a/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java +++ b/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java @@ -315,7 +315,7 @@ public class GraphQuery extends Query { } - private class GraphScorer extends Scorer { + private static class GraphScorer extends Scorer { final DocIdSetIterator iter; final float score; diff --git a/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java b/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java index c4a75031317..0203f18270b 100644 --- a/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java +++ b/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java @@ -360,7 +360,7 @@ public class PossibilityIterator implements throw new UnsupportedOperationException(); } - public class RankedSpellPossibility { + public static class RankedSpellPossibility { public List corrections; public int rank; public int index; @@ -406,7 +406,7 @@ public class PossibilityIterator implements } } - private class StartOffsetComparator implements + private static class StartOffsetComparator implements Comparator { @Override public int compare(SpellCheckCorrection o1, SpellCheckCorrection o2) { @@ -414,7 +414,7 @@ public class PossibilityIterator implements } } - private class RankComparator implements Comparator { + private static class RankComparator implements Comparator { // Rank poorer suggestions ahead of better ones for use with a PriorityQueue @Override public int compare(RankedSpellPossibility r1, RankedSpellPossibility r2) { diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java index daa50a9621f..84a20052b99 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java @@ -204,7 +204,7 @@ public static final int VERSION_IDX = 1; } }; - public class DBQ { + public static class DBQ { public String q; // the query string public long version; // positive version of the DBQ diff --git a/solr/core/src/java/org/apache/solr/util/RTimer.java b/solr/core/src/java/org/apache/solr/util/RTimer.java index 7bf075cafef..19624603ecc 100644 --- a/solr/core/src/java/org/apache/solr/util/RTimer.java +++ b/solr/core/src/java/org/apache/solr/util/RTimer.java @@ -41,7 +41,7 @@ public class RTimer { double elapsed(); } - private class NanoTimeTimerImpl implements TimerImpl { + private static class NanoTimeTimerImpl implements TimerImpl { private long start; public void start() { start = System.nanoTime(); diff --git a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java index a8ef372acb8..e64208936f5 100644 --- a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java +++ b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java @@ -1065,7 +1065,7 @@ public class SimplePostTool { /** * Inner class to filter files based on glob wildcards */ - class GlobFileFilter implements FileFilter + static class GlobFileFilter implements FileFilter { private String _pattern; private Pattern p; @@ -1258,7 +1258,7 @@ public class SimplePostTool { /** * Utility class to hold the result form a page fetch */ - public class PageFetcherResult { + public static class PageFetcherResult { int httpStatus = 200; String contentType = "text/html"; URL redirectUrl = null; diff --git a/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java index 35cc44476ea..8a88959fe25 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java @@ -816,7 +816,7 @@ public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase { return info; } - protected class CollectionInfo { + protected static class CollectionInfo { List coreInfos = new ArrayList<>(); @@ -869,7 +869,7 @@ public class BaseCdcrDistributedZkTest extends AbstractDistribZkTestBase { this.coreInfos.add(info); } - public class CoreInfo { + public static class CoreInfo { String collectionName; String shard; boolean isLeader; diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java index 628884c3cda..ffc5262a991 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java @@ -400,8 +400,8 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase SolrInputDocument doc = getDoc(fields); indexDoc(doc); } - - class ErrorLoggingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient { + + static class ErrorLoggingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient { public ErrorLoggingConcurrentUpdateSolrClient(String serverUrl, HttpClient httpClient, int queueSize, int threadCount) { super(serverUrl, httpClient, queueSize, threadCount, null, false); } diff --git a/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java b/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java index 17d4c545ebe..90d9cc1445d 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java @@ -153,7 +153,7 @@ public class ConnectionManagerTest extends SolrTestCaseJ4 { } } - private class MockZkClientConnectionStrategy extends DefaultConnectionStrategy { + private static class MockZkClientConnectionStrategy extends DefaultConnectionStrategy { int called = 0; boolean exceptionThrown = false; diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java index d1192a182c4..b6754c71bf6 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java @@ -202,7 +202,7 @@ public class DistributedQueueTest extends SolrTestCaseJ4 { return new DistributedQueue(zkClient, setupNewDistributedQueueZNode(dqZNode)); } - private class QueueChangerThread extends Thread { + private static class QueueChangerThread extends Thread { DistributedQueue dq; long waitBeforeOfferMs; diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java index 2582872259a..cab5ee3876a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java @@ -83,8 +83,8 @@ public class LeaderElectionTest extends SolrTestCaseJ4 { zkClient.makePath("/collections/collection1", true); zkClient.makePath("/collections/collection2", true); } - - class TestLeaderElectionContext extends ShardLeaderElectionContextBase { + + static class TestLeaderElectionContext extends ShardLeaderElectionContextBase { private long runLeaderDelay = 0; public TestLeaderElectionContext(LeaderElector leaderElector, diff --git a/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java b/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java index 56c0df90d3b..f4cbc77a7ca 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java @@ -214,7 +214,7 @@ public class OverriddenZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 { } } - private class SolrZkClientFactoryUsingCompletelyNewProviders { + private static class SolrZkClientFactoryUsingCompletelyNewProviders { final String digestUsername; final String digestPassword; @@ -274,7 +274,7 @@ public class OverriddenZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 { } - private class SolrZkClientUsingVMParamsProvidersButWithDifferentVMParamsNames extends SolrZkClient { + private static class SolrZkClientUsingVMParamsProvidersButWithDifferentVMParamsNames extends SolrZkClient { public SolrZkClientUsingVMParamsProvidersButWithDifferentVMParamsNames(String zkServerAddress, int zkClientTimeout) { super(zkServerAddress, zkClientTimeout); diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java index 635292a2226..48ac91f4a6c 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java @@ -78,7 +78,7 @@ public class OverseerCollectionConfigSetProcessorTest extends SolrTestCaseJ4 { private Thread thread; private Queue queue = new ArrayBlockingQueue<>(10); - private class OverseerCollectionConfigSetProcessorToBeTested extends + private static class OverseerCollectionConfigSetProcessorToBeTested extends OverseerCollectionConfigSetProcessor { diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java index faa2ba74a05..b3a3d7eeaa0 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java @@ -40,7 +40,7 @@ public class ZkSolrClientTest extends AbstractSolrTestCase { initCore("solrconfig.xml", "schema.xml"); } - class ZkConnection implements AutoCloseable { + static class ZkConnection implements AutoCloseable { private ZkTestServer server = null; private SolrZkClient zkClient = null; diff --git a/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java index 7a7fb9c8200..8714054eada 100644 --- a/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java @@ -41,7 +41,7 @@ public class CachingDirectoryFactoryTest extends SolrTestCaseJ4 { private Map dirs = new HashMap<>(); private volatile boolean stop = false; - private class Tracker { + private static class Tracker { String path; AtomicInteger refCnt = new AtomicInteger(0); Directory dir; diff --git a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java index d5f84921d84..2b527208ba2 100644 --- a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java +++ b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java @@ -49,7 +49,7 @@ public abstract class AnalysisRequestHandlerTestBase extends SolrTestCaseJ4 { //================================================= Inner Classes ================================================== - protected class TokenInfo { + protected static class TokenInfo { private String text; private String rawText; diff --git a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java index 96a01c384e0..b9ab2c12d9c 100644 --- a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java @@ -231,7 +231,7 @@ public class PingRequestHandlerTest extends SolrTestCaseJ4 { return rsp; } - class SolrPingWithDistrib extends SolrPing { + static class SolrPingWithDistrib extends SolrPing { public SolrPing setDistrib(boolean distrib) { getParams().add("distrib", distrib ? "true" : "false"); return this; diff --git a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java index 6d467224d6a..961bb25837a 100644 --- a/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java @@ -194,7 +194,7 @@ public class XmlUpdateRequestHandlerTest extends SolrTestCaseJ4 { p.assertNoCommandsPending(); } - private class MockUpdateRequestProcessor extends UpdateRequestProcessor { + private static class MockUpdateRequestProcessor extends UpdateRequestProcessor { private Queue deleteCommands = new LinkedList<>(); diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java index d026ecdeffe..890ef4ad790 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java @@ -50,7 +50,7 @@ public class CoreMergeIndexesAdminHandlerTest extends SolrTestCaseJ4 { private static String FAILING_MSG = "Creating a directory using FailingDirectoryFactoryException always fails"; public static class FailingDirectoryFactory extends MockFSDirectoryFactory { - public class FailingDirectoryFactoryException extends RuntimeException { + public static class FailingDirectoryFactoryException extends RuntimeException { public FailingDirectoryFactoryException() { super(FAILING_MSG); } diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java index 0688c5257d8..ba604f82185 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java @@ -37,7 +37,7 @@ public class CSVParserTest extends TestCase { /** * TestCSVParser. */ - class TestCSVParser extends CSVParser { + static class TestCSVParser extends CSVParser { /** * Test parser to investigate the type of the internal Token. * @param in a Reader diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java index e58c9ddc226..f45b19359db 100644 --- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java @@ -78,7 +78,7 @@ public class SolrGraphiteReporterTest extends SolrTestCaseJ4 { } } - private class MockGraphite extends Thread { + private static class MockGraphite extends Thread { private List lines = new ArrayList<>(); private ServerSocket server = null; private int port; diff --git a/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java index e974b42614e..72af04b23ae 100644 --- a/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestGraphMLResponseWriter.java @@ -84,7 +84,7 @@ public class TestGraphMLResponseWriter extends SolrTestCaseJ4 { } - private class TestStream extends TupleStream { + private static class TestStream extends TupleStream { private Iterator tuples; diff --git a/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java b/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java index cce210984f9..c06abf00b51 100644 --- a/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java +++ b/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java @@ -49,7 +49,7 @@ public class TestManagedResource extends SolrTestCaseJ4 { * Mock class that acts like an analysis component that depends on * data managed by a ManagedResource */ - private class MockAnalysisComponent implements ManagedResourceObserver { + private static class MockAnalysisComponent implements ManagedResourceObserver { private boolean wasNotified = false; @@ -121,7 +121,7 @@ public class TestManagedResource extends SolrTestCaseJ4 { /** * Implements a Java serialization based storage format. */ - private class SerializableStorage extends ManagedResourceStorage { + private static class SerializableStorage extends ManagedResourceStorage { SerializableStorage(StorageIO storageIO, SolrResourceLoader loader) { super(storageIO, loader); diff --git a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java index ab2c45b4eed..cc6c58a4c90 100644 --- a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java +++ b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java @@ -62,7 +62,7 @@ public class TestRestManager extends SolrRestletTestBase { } - private class MockAnalysisComponent implements ManagedResourceObserver { + private static class MockAnalysisComponent implements ManagedResourceObserver { @Override public void onManagedResourceInitialized(NamedList args, ManagedResource res) diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java index e724da95ed4..e6e4da19f0c 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java +++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java @@ -248,7 +248,7 @@ public class TestCloudManagedSchemaConcurrent extends AbstractFullDistribZkTestB schemaLockTest(); } - private class Info { + private static class Info { int numAddFieldPuts = 0; int numAddFieldPosts = 0; int numAddDynamicFieldPuts = 0; diff --git a/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java index 392fb82546b..158df1722d1 100644 --- a/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/AnalyticsTestQParserPlugin.java @@ -42,7 +42,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin { return new TestAnalyticsQueryParser(query, localParams, params, req); } - class TestAnalyticsQueryParser extends QParser { + static class TestAnalyticsQueryParser extends QParser { public TestAnalyticsQueryParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) { super(query, localParams, params, req); @@ -58,7 +58,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin { } } - class TestAnalyticsQuery extends AnalyticsQuery { + static class TestAnalyticsQuery extends AnalyticsQuery { private int base; @@ -72,7 +72,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin { } } - class TestAnalyticsCollector extends DelegatingCollector { + static class TestAnalyticsCollector extends DelegatingCollector { ResponseBuilder rb; int count; int base; @@ -97,7 +97,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin { } } - class TestAnalyticsMergeStrategy implements MergeStrategy { + static class TestAnalyticsMergeStrategy implements MergeStrategy { public boolean mergesIds() { return false; @@ -130,7 +130,7 @@ public class AnalyticsTestQParserPlugin extends QParserPlugin { } } - class TestIterative extends IterativeMergeStrategy { + static class TestIterative extends IterativeMergeStrategy { public void process(ResponseBuilder rb, ShardRequest sreq) throws Exception { int count = 0; diff --git a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java index 27bf40fb818..a887fedaeff 100644 --- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java +++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java @@ -1830,7 +1830,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 { return false; } - class MultilanguageQueryParser extends ExtendedDismaxQParser { + static class MultilanguageQueryParser extends ExtendedDismaxQParser { public MultilanguageQueryParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { @@ -1857,10 +1857,10 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 { } } - - - - class FuzzyDismaxQParser extends ExtendedDismaxQParser { + + + + static class FuzzyDismaxQParser extends ExtendedDismaxQParser { public FuzzyDismaxQParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.java index 9f9a51a047f..c7182832b38 100644 --- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java +++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java @@ -174,7 +174,7 @@ public class TestFiltering extends SolrTestCaseJ4 { } - class Model { + static class Model { int indexSize; FixedBitSet answer; FixedBitSet multiSelect; diff --git a/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java b/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java index b42861ace7b..a526621f8d0 100644 --- a/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java @@ -75,7 +75,7 @@ public class TestRankQueryPlugin extends QParserPlugin { return new TestRankQueryParser(query, localParams, params, req); } - class TestRankQueryParser extends QParser { + static class TestRankQueryParser extends QParser { public TestRankQueryParser(String query, SolrParams localParams, SolrParams params, SolrQueryRequest req) { super(query, localParams, params, req); @@ -89,7 +89,7 @@ public class TestRankQueryPlugin extends QParserPlugin { } } - class TestRankQuery extends RankQuery { + static class TestRankQuery extends RankQuery { private int mergeStrategy; private int collector; @@ -143,7 +143,7 @@ public class TestRankQueryPlugin extends QParserPlugin { } } - class TestMergeStrategy implements MergeStrategy { + static class TestMergeStrategy implements MergeStrategy { public int getCost() { return 1; @@ -314,7 +314,7 @@ public class TestRankQueryPlugin extends QParserPlugin { } } - class TestMergeStrategy1 implements MergeStrategy { + static class TestMergeStrategy1 implements MergeStrategy { public int getCost() { return 1; @@ -435,7 +435,7 @@ public class TestRankQueryPlugin extends QParserPlugin { } } - private class FakeScorer extends Scorer { + private static class FakeScorer extends Scorer { final int docid; final float score; @@ -674,7 +674,7 @@ public class TestRankQueryPlugin extends QParserPlugin { } - class TestCollector extends TopDocsCollector { + static class TestCollector extends TopDocsCollector { private List list = new ArrayList(); @@ -743,7 +743,7 @@ public class TestRankQueryPlugin extends QParserPlugin { } } - class TestCollector1 extends TopDocsCollector { + static class TestCollector1 extends TopDocsCollector { private List list = new ArrayList(); diff --git a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java index 2a7daa99e1b..31f20fb8f04 100644 --- a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java @@ -44,8 +44,8 @@ public class ConjunctionSolrSpellCheckerTest extends LuceneTestCase { // correct behavior } } - - class MockSolrSpellChecker extends SolrSpellChecker { + + static class MockSolrSpellChecker extends SolrSpellChecker { final StringDistance sd; diff --git a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java index 75de4db7ca6..b2210444992 100644 --- a/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java @@ -230,7 +230,7 @@ public class IndexBasedSpellCheckerTest extends SolrTestCaseJ4 { } } - private class TestSpellChecker extends IndexBasedSpellChecker{ + private static class TestSpellChecker extends IndexBasedSpellChecker{ @Override public SpellChecker getSpellChecker(){ return spellChecker; diff --git a/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java b/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java index 4272c248b8c..99f7ce6df66 100644 --- a/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java +++ b/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java @@ -37,7 +37,7 @@ import org.junit.Test; public class BlockDirectoryTest extends SolrTestCaseJ4 { - private class MapperCache implements Cache { + private static class MapperCache implements Cache { public Map map = Caffeine.newBuilder() .maximumSize(8) .build() diff --git a/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java b/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java index 7f70024b9b6..c9f8fc51c0a 100644 --- a/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java +++ b/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java @@ -225,7 +225,7 @@ public class SimplePostToolTest extends SolrTestCaseJ4 { @Override public PageFetcherResult readPageFromUrl(URL u) { - PageFetcherResult res = (new SimplePostTool()).new PageFetcherResult(); + PageFetcherResult res = new PageFetcherResult(); if (isDisallowedByRobots(u)) { res.httpStatus = 403; return res; diff --git a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java index e41484fbd32..af85ad67e13 100644 --- a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java +++ b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java @@ -400,7 +400,7 @@ public class SolrPluginUtilsTest extends SolrTestCaseJ4 { assertEquals(3, q.build().getMinimumNumberShouldMatch()); } - private class InvokeSettersTestClass { + private static class InvokeSettersTestClass { private float aFloat = random().nextFloat(); public float getAFloat() { return aFloat; diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java index 28a58ff69e4..7980560f899 100644 --- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java +++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java @@ -72,7 +72,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 { * Overrides the call to exec bin/solr to start Solr nodes to start them using the Solr test-framework * instead of the script, since the script depends on a full build. */ - private class RunExampleExecutor extends DefaultExecutor implements Closeable { + private static class RunExampleExecutor extends DefaultExecutor implements Closeable { private PrintStream stdout; private List commandsExecuted = new ArrayList<>(); diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java index 4eac2a534a2..fa9350321e2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java @@ -460,7 +460,7 @@ public class ConcurrentUpdateSolrClient extends SolrClient { /** * Class representing an UpdateRequest and an optional collection. */ - class Update { + static class Update { UpdateRequest request; String collection; /** diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java index 4676594835b..1d7e46fa4ef 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ModelCache.java @@ -110,7 +110,7 @@ public class ModelCache { } } - private class Model { + private static class Model { private Tuple tuple; private long lastChecked; @@ -128,7 +128,7 @@ public class ModelCache { } } - private class LRU extends LinkedHashMap { + private static class LRU extends LinkedHashMap { private int maxSize; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java index 805967775a0..bbd76692e44 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java @@ -624,7 +624,7 @@ public class GatherNodesStream extends TupleStream implements Expressible { return null; } - class NodeStream extends TupleStream { + static class NodeStream extends TupleStream { private List ids; private Iterator it; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java index aa546ae9e0c..5075330fde4 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/ShortestPathStream.java @@ -492,7 +492,7 @@ public class ShortestPathStream extends TupleStream implements Expressible { } } - private class Edge { + private static class Edge { private String from; private String to; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java index 4a28cc1e0fd..a2bd8c999c9 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java @@ -133,7 +133,7 @@ public class GroupOperation implements ReduceOperation { } } - class ReverseComp implements Comparator, Serializable { + static class ReverseComp implements Comparator, Serializable { private StreamComparator comp; public ReverseComp(StreamComparator comp) { diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java index a9fb1afd2c8..e3010816ab2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java @@ -213,7 +213,7 @@ public class RankStream extends TupleStream implements Expressible { return 0; } - class ReverseComp implements Comparator, Serializable { + static class ReverseComp implements Comparator, Serializable { private static final long serialVersionUID = 1L; private StreamComparator comp; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java index b4decd528ae..45cd27227de 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java @@ -339,7 +339,7 @@ public class SignificantTermsStream extends TupleStream implements Expressible{ } } - private class ScoreComp implements Comparator { + private static class ScoreComp implements Comparator { public int compare(Map a, Map b) { Float scorea = (Float)a.get("score"); Float scoreb = (Float)b.get("score"); diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java index 5a70cedeb79..a6ba9d93019 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java @@ -532,7 +532,7 @@ public class TextLogitStream extends TupleStream implements Expressible { return buf.toString(); } - protected class TermsStream extends TupleStream { + protected static class TermsStream extends TupleStream { private List terms; private Iterator it; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java index 946225dceb9..89ef351f136 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java @@ -211,7 +211,7 @@ public class SpellCheckResponse { } - public class Collation { + public static class Collation { private String collationQueryString; private List misspellingsAndCorrections = new ArrayList<>(); private long numberOfHits; @@ -244,7 +244,7 @@ public class SpellCheckResponse { } - public class Correction { + public static class Correction { private String original; private String correction; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java index 54472670b62..0bcd9cafbe6 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java @@ -146,7 +146,7 @@ public class ZkStateReader implements Closeable { private final ExecutorService notifications = ExecutorUtil.newMDCAwareCachedThreadPool("watches"); - private class CollectionWatch { + private static class CollectionWatch { int coreRefCount = 0; Set stateWatchers = ConcurrentHashMap.newKeySet(); diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java index 964ea2666ad..3c1c45fcc61 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java @@ -247,7 +247,7 @@ public class TestLBHttpSolrClient extends SolrTestCaseJ4 { } } - private class SolrInstance { + private static class SolrInstance { String name; File homeDir; File dataDir; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java index 093238d52d8..02ed7be06fa 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java @@ -104,8 +104,8 @@ public class SolrExampleStreamingTest extends SolrExampleTests { null, failures.get(0)); } } - - class FailureRecordingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient { + + static class FailureRecordingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient { private final List failures = new ArrayList<>(); public FailureRecordingConcurrentUpdateSolrClient(String serverUrl, int queueSize, int numThreads) { diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java index de728bdc894..24f08d28ee7 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java @@ -252,7 +252,7 @@ public class ConcurrentUpdateSolrClientTest extends SolrJettyTestBase { } - class SendDocsRunnable implements Runnable { + static class SendDocsRunnable implements Runnable { private String id; private int numDocs; @@ -289,8 +289,8 @@ public class ConcurrentUpdateSolrClientTest extends SolrJettyTestBase { } } } - - class OutcomeCountingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient { + + static class OutcomeCountingConcurrentUpdateSolrClient extends ConcurrentUpdateSolrClient { private final AtomicInteger successCounter; private final AtomicInteger failureCounter; private final StringBuilder errors; diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index 04fc3ffc4c8..f82ccc6e975 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -1627,7 +1627,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase { } } - protected class FldType { + protected static class FldType { public String fname; public IVals numValues; public Vals vals;