You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/03/30 11:39:46 UTC
[15/31] lucene-solr:feature/autoscaling: LUCENE-7754: Inner classes
should be static whenever possible.
LUCENE-7754: Inner classes should be static whenever possible.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a0711a37
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a0711a37
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a0711a37
Branch: refs/heads/feature/autoscaling
Commit: a0711a37e5090ba05cb85c23bc44d52706010bf1
Parents: e49c608
Author: Adrien Grand <jp...@gmail.com>
Authored: Tue Mar 28 15:15:45 2017 +0200
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Mar 30 17:09:05 2017 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 6 +++++-
.../analysis/charfilter/HTMLStripCharFilter.java | 2 +-
.../analysis/charfilter/HTMLStripCharFilter.jflex | 7 +++----
.../lucene/analysis/shingle/ShingleFilter.java | 2 +-
.../lucene/analysis/hunspell/TestDictionary.java | 2 +-
.../miscellaneous/TestWordDelimiterFilter.java | 2 +-
.../TestWordDelimiterGraphFilter.java | 2 +-
.../payloads/NumericPayloadTokenFilterTest.java | 2 +-
.../payloads/TypeAsPayloadTokenFilterTest.java | 2 +-
.../analysis/sinks/TestTeeSinkTokenFilter.java | 4 ++--
.../lucene/analysis/snowball/TestSnowball.java | 2 +-
.../standard/TestUAX29URLEmailTokenizer.java | 4 ++--
.../lucene/analysis/icu/ICUTransformFilter.java | 2 +-
.../CachingNaiveBayesClassifierTest.java | 2 +-
.../SimpleNaiveBayesClassifierTest.java | 2 +-
.../bloom/BloomFilteringPostingsFormat.java | 8 ++++----
.../codecs/memory/MemoryPostingsFormat.java | 2 +-
.../simpletext/SimpleTextTermVectorsReader.java | 2 +-
.../compressing/CompressingTermVectorsReader.java | 2 +-
.../apache/lucene/index/ParallelLeafReader.java | 2 +-
.../apache/lucene/search/ConstantScoreQuery.java | 2 +-
.../test/org/apache/lucene/index/TestCodecs.java | 8 ++++----
.../index/TestFlushByRamOrCountsPolicy.java | 2 +-
.../lucene/index/TestIndexWriterExceptions.java | 2 +-
.../lucene/index/TestIndexWriterMerging.java | 2 +-
.../lucene/index/TestIndexWriterWithThreads.java | 2 +-
.../apache/lucene/index/TestIndexableField.java | 2 +-
.../apache/lucene/index/TestMaxTermFrequency.java | 2 +-
.../test/org/apache/lucene/index/TestNorms.java | 2 +-
.../lucene/index/TestPerSegmentDeletes.java | 2 +-
.../apache/lucene/index/TestStressIndexing2.java | 2 +-
.../lucene/index/TestTermVectorsReader.java | 2 +-
.../lucene/index/TestTransactionRollback.java | 6 +++---
.../apache/lucene/index/TestUniqueTermCount.java | 2 +-
.../lucene/search/TestCustomSearcherSort.java | 4 ++--
.../TestEarlyTerminatingSortingCollector.java | 4 ++--
.../apache/lucene/search/TestPrefixRandom.java | 4 ++--
.../apache/lucene/search/TestRegexpRandom2.java | 2 +-
.../lucene/search/TestSimilarityProvider.java | 6 +++---
.../org/apache/lucene/search/TestTermScorer.java | 2 +-
.../lucene/search/TestTimeLimitingCollector.java | 2 +-
.../org/apache/lucene/store/TestLockFactory.java | 4 ++--
.../lucene/util/TestCloseableThreadLocal.java | 2 +-
.../org/apache/lucene/util/TestQueryBuilder.java | 2 +-
.../test/org/apache/lucene/util/fst/TestFSTs.java | 2 +-
.../facet/taxonomy/writercache/CollisionMap.java | 2 +-
.../search/grouping/GroupFacetCollectorTest.java | 4 ++--
.../TestUnifiedHighlighterExtensibility.java | 2 +-
.../apache/lucene/queries/CustomScoreQuery.java | 2 +-
.../lucene/queries/TestCustomScoreQuery.java | 2 +-
.../lucene/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 +-
.../search/suggest/fst/WFSTCompletionLookup.java | 2 +-
.../search/suggest/jaspell/JaspellLookup.java | 8 ++++----
.../suggest/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 +-
.../lucene/validation/LibVersionsCheckTask.java | 2 +-
.../handler/dataimport/MailEntityProcessor.java | 4 ++--
.../solr/handler/dataimport/VariableResolver.java | 2 +-
.../dataimport/AbstractDIHCacheTestCase.java | 2 +-
.../AbstractSqlEntityProcessorTestCase.java | 4 ++--
.../dataimport/TestContentStreamDataSource.java | 2 +-
.../handler/extraction/XLSXResponseWriter.java | 2 +-
.../java/org/apache/solr/ltr/LTRScoringQuery.java | 2 +-
.../apache/solr/ltr/TestLTRReRankingPipeline.java | 2 +-
.../solr/response/VelocityResponseWriter.java | 2 +-
.../src/java/org/apache/solr/cloud/Overseer.java | 2 +-
.../org/apache/solr/cloud/OverseerTaskQueue.java | 2 +-
.../java/org/apache/solr/cloud/ZkController.java | 2 +-
.../apache/solr/core/CachingDirectoryFactory.java | 2 +-
.../org/apache/solr/handler/CdcrReplicator.java | 2 +-
.../apache/solr/handler/CdcrReplicatorState.java | 6 +++---
.../org/apache/solr/handler/ExportWriter.java | 18 +++++++++---------
.../org/apache/solr/handler/IndexFetcher.java | 4 ++--
.../java/org/apache/solr/handler/SQLHandler.java | 2 +-
.../solr/handler/component/ExpandComponent.java | 6 +++---
.../component/HttpShardHandlerFactory.java | 2 +-
.../component/PivotFacetFieldValueCollection.java | 4 ++--
.../solr/handler/component/TermsComponent.java | 2 +-
.../solr/highlight/DefaultSolrHighlighter.java | 2 +-
.../apache/solr/schema/ManagedIndexSchema.java | 4 ++--
.../org/apache/solr/schema/RandomSortField.java | 2 +-
.../solr/search/ComplexPhraseQParserPlugin.java | 4 ++--
.../apache/solr/search/ExportQParserPlugin.java | 2 +-
.../apache/solr/search/ExtendedDismaxQParser.java | 4 ++--
.../org/apache/solr/search/HashQParserPlugin.java | 18 +++++++++---------
.../org/apache/solr/search/ReRankCollector.java | 2 +-
.../apache/solr/search/ReRankQParserPlugin.java | 2 +-
.../solr/search/facet/FacetFieldMerger.java | 2 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 2 +-
.../search/function/CollapseScoreFunction.java | 2 +-
.../org/apache/solr/search/join/GraphQuery.java | 2 +-
.../apache/solr/spelling/PossibilityIterator.java | 6 +++---
.../java/org/apache/solr/update/UpdateLog.java | 2 +-
.../src/java/org/apache/solr/util/RTimer.java | 2 +-
.../java/org/apache/solr/util/SimplePostTool.java | 4 ++--
.../solr/cloud/BaseCdcrDistributedZkTest.java | 4 ++--
.../solr/cloud/ChaosMonkeyNothingIsSafeTest.java | 4 ++--
.../apache/solr/cloud/ConnectionManagerTest.java | 2 +-
.../apache/solr/cloud/DistributedQueueTest.java | 2 +-
.../org/apache/solr/cloud/LeaderElectionTest.java | 4 ++--
...verriddenZkACLAndCredentialsProvidersTest.java | 4 ++--
.../OverseerCollectionConfigSetProcessorTest.java | 2 +-
.../org/apache/solr/cloud/ZkSolrClientTest.java | 2 +-
.../solr/core/CachingDirectoryFactoryTest.java | 2 +-
.../handler/AnalysisRequestHandlerTestBase.java | 2 +-
.../solr/handler/PingRequestHandlerTest.java | 2 +-
.../solr/handler/XmlUpdateRequestHandlerTest.java | 2 +-
.../admin/CoreMergeIndexesAdminHandlerTest.java | 2 +-
.../apache/solr/internal/csv/CSVParserTest.java | 2 +-
.../reporters/SolrGraphiteReporterTest.java | 2 +-
.../solr/response/TestGraphMLResponseWriter.java | 2 +-
.../org/apache/solr/rest/TestManagedResource.java | 4 ++--
.../org/apache/solr/rest/TestRestManager.java | 2 +-
.../schema/TestCloudManagedSchemaConcurrent.java | 2 +-
.../solr/search/AnalyticsTestQParserPlugin.java | 10 +++++-----
.../solr/search/TestExtendedDismaxParser.java | 10 +++++-----
.../org/apache/solr/search/TestFiltering.java | 2 +-
.../apache/solr/search/TestRankQueryPlugin.java | 14 +++++++-------
.../spelling/ConjunctionSolrSpellCheckerTest.java | 4 ++--
.../solr/spelling/IndexBasedSpellCheckerTest.java | 2 +-
.../solr/store/blockcache/BlockDirectoryTest.java | 2 +-
.../org/apache/solr/util/SimplePostToolTest.java | 2 +-
.../org/apache/solr/util/SolrPluginUtilsTest.java | 2 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 2 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 2 +-
.../apache/solr/client/solrj/io/ModelCache.java | 4 ++--
.../client/solrj/io/graph/GatherNodesStream.java | 2 +-
.../client/solrj/io/graph/ShortestPathStream.java | 2 +-
.../solr/client/solrj/io/ops/GroupOperation.java | 2 +-
.../solr/client/solrj/io/stream/RankStream.java | 2 +-
.../solrj/io/stream/SignificantTermsStream.java | 2 +-
.../client/solrj/io/stream/TextLogitStream.java | 2 +-
.../client/solrj/response/SpellCheckResponse.java | 4 ++--
.../apache/solr/common/cloud/ZkStateReader.java | 2 +-
.../solr/client/solrj/TestLBHttpSolrClient.java | 2 +-
.../solrj/embedded/SolrExampleStreamingTest.java | 4 ++--
.../impl/ConcurrentUpdateSolrClientTest.java | 6 +++---
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 2 +-
152 files changed, 253 insertions(+), 250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 15f4ff3..e6da586 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 =======================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
----------------------------------------------------------------------
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 ba44dd8..a236497 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
----------------------------------------------------------------------
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 98c3946..d810d79 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
----------------------------------------------------------------------
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 e3fa803..0775cf7 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java
----------------------------------------------------------------------
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 5e32afe..b7312cb 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) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
----------------------------------------------------------------------
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 7f0481f..2804bfd 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterGraphFilter.java
----------------------------------------------------------------------
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 f4e8b79..7516a23 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java
----------------------------------------------------------------------
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 3e54cc0..81da458 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java
----------------------------------------------------------------------
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 f901016..5333cf0 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
----------------------------------------------------------------------
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 c0127a3..5c2c2bb 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
----------------------------------------------------------------------
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 881bc2f..783b707 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
----------------------------------------------------------------------
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 8d3c706..eaa5a44 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 "<URL>" 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 "<EMAIL>" 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java
----------------------------------------------------------------------
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 e48c4ba..bfe7c12 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java
----------------------------------------------------------------------
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 acbfe82..ccdb207 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<Byte
}
}
- private class NGramAnalyzer extends Analyzer {
+ private static class NGramAnalyzer extends Analyzer {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
final Tokenizer tokenizer = new KeywordTokenizer();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
index 830ce2c..2b4873d 100644
--- a/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
+++ b/lucene/classification/src/test/org/apache/lucene/classification/SimpleNaiveBayesClassifierTest.java
@@ -83,7 +83,7 @@ public class SimpleNaiveBayesClassifierTest extends ClassificationTestBase<Bytes
}
}
- private class NGramAnalyzer extends Analyzer {
+ private static class NGramAnalyzer extends Analyzer {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
final Tokenizer tokenizer = new KeywordTokenizer();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
----------------------------------------------------------------------
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
index ffe9fa1..b864bf0 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
@@ -217,8 +217,8 @@ public final class BloomFilteringPostingsFormat extends PostingsFormat {
public int size() {
return delegateFieldsProducer.size();
}
-
- class BloomFilteredTerms extends Terms {
+
+ static class BloomFilteredTerms extends Terms {
private Terms delegateTerms;
private FuzzySet filter;
@@ -288,8 +288,8 @@ public final class BloomFilteringPostingsFormat extends PostingsFormat {
return delegateTerms.getMax();
}
}
-
- final class BloomFilteredTermsEnum extends TermsEnum {
+
+ static final class BloomFilteredTermsEnum extends TermsEnum {
private Terms delegateTerms;
private TermsEnum delegateTermsEnum;
private final FuzzySet filter;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
----------------------------------------------------------------------
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
index 2f71765..dff445e 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
@@ -267,7 +267,7 @@ public final class MemoryPostingsFormat extends PostingsFormat {
private static final int VERSION_START = 1;
private static final int VERSION_CURRENT = VERSION_START;
- private class MemoryFieldsConsumer extends FieldsConsumer {
+ private static class MemoryFieldsConsumer extends FieldsConsumer {
private final SegmentWriteState state;
private final IndexOutput out;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
----------------------------------------------------------------------
diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
index c1808bf..873aaef 100644
--- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
+++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
@@ -239,7 +239,7 @@ public class SimpleTextTermVectorsReader extends TermVectorsReader {
return scratchUTF16.toString();
}
- private class SimpleTVFields extends Fields {
+ private static class SimpleTVFields extends Fields {
private final SortedMap<String,SimpleTVTerms> fields;
SimpleTVFields(SortedMap<String,SimpleTVTerms> fields) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java
----------------------------------------------------------------------
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 aa19f20..2e8ed63 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java
----------------------------------------------------------------------
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 c67d07b..eee0c16 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<String,Terms> fields = new TreeMap<>();
ParallelFields() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
----------------------------------------------------------------------
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 dbd05e8..8827a9f 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
----------------------------------------------------------------------
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 79783b5..c842606 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<FieldData> {
+ static class FieldData implements Comparable<FieldData> {
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<TermData> {
+ static class TermData implements Comparable<TermData> {
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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
----------------------------------------------------------------------
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 993a521..aa2901c 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
----------------------------------------------------------------------
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 987852f..c0907a5 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
----------------------------------------------------------------------
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 e4d4018..6931efa 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 {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
----------------------------------------------------------------------
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 6b599d2..6c950b8 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
----------------------------------------------------------------------
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 e60a3e1..510a899 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() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
----------------------------------------------------------------------
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 900ec2b..4f74c30 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) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
----------------------------------------------------------------------
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 363f57e..16ce61d 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) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
----------------------------------------------------------------------
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 34d8afb..58ef890 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
----------------------------------------------------------------------
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 3cd9a6a..d386f39 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
----------------------------------------------------------------------
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 4b2a060..76947dd 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<TestToken> {
+ private static class TestToken implements Comparable<TestToken> {
String text;
int pos;
int startOffset;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
----------------------------------------------------------------------
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 e7de028..eb08475 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<? extends IndexCommit> 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<? extends IndexCommit> commits) throws IOException {}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
----------------------------------------------------------------------
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 ee47fff..a0fca4c 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) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
----------------------------------------------------------------------
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 a9bac60..f09dfde 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java
----------------------------------------------------------------------
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 d12caf1..6d699e8 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
----------------------------------------------------------------------
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 72fdc7a..f332a36 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) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
----------------------------------------------------------------------
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 a704d54..78a4352 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) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
----------------------------------------------------------------------
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 de96755..fbc0b35 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) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
----------------------------------------------------------------------
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 d00e520..f0ad9b9 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
----------------------------------------------------------------------
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 d26006c..6a02e58 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java
----------------------------------------------------------------------
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 fa7a3fb..c257861 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<String,Lock> locksCreated = Collections.synchronizedMap(new HashMap<String,Lock>());
@@ -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() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java
----------------------------------------------------------------------
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 9f56d7b..ca0f811 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<Object> {
+ public static class InitValueThreadLocal extends CloseableThreadLocal<Object> {
@Override
protected Object initialValue() {
return TEST_VALUE;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java
----------------------------------------------------------------------
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 fc04c5e..a9d803b 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());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
----------------------------------------------------------------------
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 7a8e5f5..6f704c9 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java
----------------------------------------------------------------------
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 205a540..b80f2bd 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<Entry> {
+ private static class EntryIterator implements Iterator<Entry> {
Entry next; // next entry to return
int index; // current slot
Entry[] ents;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
----------------------------------------------------------------------
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 46141bc..c590502 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/highlighter/src/test/org/apache/lucene/search/uhighlight/visibility/TestUnifiedHighlighterExtensibility.java
----------------------------------------------------------------------
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 08055a2..e5d7e82 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);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
----------------------------------------------------------------------
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 2ae6c01..632bcc7 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
----------------------------------------------------------------------
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 540ecf8..d001cc8 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 {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java
----------------------------------------------------------------------
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 3c5b80f..c39421b 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<String> entities = new HashSet<>();
Set<String> 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) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java
----------------------------------------------------------------------
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 bdb6256..85a5f39 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
----------------------------------------------------------------------
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 7490e8c..4c28e8f 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java
----------------------------------------------------------------------
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 56ef65a..220ce02 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
----------------------------------------------------------------------
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 2d5ee43..2aa96be 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());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
----------------------------------------------------------------------
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 0041106..1b8ee96 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
----------------------------------------------------------------------
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 8bd7b89..840ade3 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java
----------------------------------------------------------------------
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 ecf2ff6..af19e3d 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<String> entities = new HashSet<>();
Set<String> nopayload = new HashSet<>();
int pos;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java
----------------------------------------------------------------------
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 f3cc5bd..c075ad4 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<SuggestWordArrayWrapper> {
@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<SuggestWordArrayWrapper> {
@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<CombineSuggestionWrapper> {
@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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java
----------------------------------------------------------------------
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 7a5e3e0..4a29f24 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<IntsRef, Float> contextMap;
private final int[] contextLengths;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java
----------------------------------------------------------------------
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 fb876d2..5b7e714 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
----------------------------------------------------------------------
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 1cc89a4..d6c1a97 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);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java
----------------------------------------------------------------------
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 3e78f59..948ebeb 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
----------------------------------------------------------------------
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 15deaea..2a4a439 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java
----------------------------------------------------------------------
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 a7e9b00..57173e2 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<BytesRef> contexts;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
----------------------------------------------------------------------
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 478358b..423e62a 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
----------------------------------------------------------------------
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 adda0fc..165c9f2 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> CHARSEQUENCE_COMPARATOR = new CharSequenceComparator();
- public class CompareByCostThenAlpha implements Comparator<LookupResult> {
+ public static class CompareByCostThenAlpha implements Comparator<LookupResult> {
@Override
public int compare(LookupResult a, LookupResult b) {
if (a.value > b.value) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java
----------------------------------------------------------------------
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 01791b7..312b644 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;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a0711a37/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java
----------------------------------------------------------------------
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 5b2f0b8..2c20abd 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<ExternalDependency> {
+ private static class ExternalDependency implements Comparable<ExternalDependency> {
String groupId;
String artifactId;
boolean isTestDependency;