You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2021/02/20 15:12:34 UTC
[lucenenet] 02/03: SWEEP: Changed accessibility of all anonymous
classes to private,
since they cannot exist outside of a single method call in a single class
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit b0c7da11c6bdae6c32db92e44a6a741da7833367
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sat Feb 20 21:09:25 2021 +0700
SWEEP: Changed accessibility of all anonymous classes to private, since they cannot exist outside of a single method call in a single class
---
.../PostingsHighlight/MultiTermHighlighting.cs | 6 +++---
src/Lucene.Net.Highlighter/PostingsHighlight/Passage.cs | 2 +-
.../PostingsHighlight/PostingsHighlighter.cs | 2 +-
.../VectorHighlight/BaseFragmentsBuilder.cs | 2 +-
src/Lucene.Net.Sandbox/Queries/SortedSetSortField.cs | 2 +-
src/Lucene.Net.Spatial/Serialized/SerializedDVStrategy.cs | 8 ++++----
src/Lucene.Net.Spatial/Util/DistanceToShapeValueSource.cs | 2 +-
src/Lucene.Net.Spatial/Util/ShapePredicateValueSource.cs | 2 +-
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 2 +-
.../Analysis/Synonym/TestSynonymMap.cs | 2 +-
.../Highlight/HighlighterPhraseTest.cs | 2 +-
src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs | 8 ++++----
.../Highlight/OffsetLimitTokenFilterTest.cs | 2 +-
.../VectorHighlight/FastVectorHighlighterTest.cs | 2 +-
.../VectorHighlight/FieldQueryTest.cs | 4 ++--
.../VectorHighlight/IndexTimeSynonymTest.cs | 2 +-
src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs | 2 +-
17 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/Lucene.Net.Highlighter/PostingsHighlight/MultiTermHighlighting.cs b/src/Lucene.Net.Highlighter/PostingsHighlight/MultiTermHighlighting.cs
index 8293e28..fc83d5c 100644
--- a/src/Lucene.Net.Highlighter/PostingsHighlight/MultiTermHighlighting.cs
+++ b/src/Lucene.Net.Highlighter/PostingsHighlight/MultiTermHighlighting.cs
@@ -136,7 +136,7 @@ namespace Lucene.Net.Search.PostingsHighlight
return list.ToArray(/*new CharacterRunAutomaton[list.size()]*/);
}
- internal class CharacterRunAutomatonToStringAnonymousClass : CharacterRunAutomaton
+ private class CharacterRunAutomatonToStringAnonymousClass : CharacterRunAutomaton
{
private readonly Func<string> toStringMethod;
@@ -152,7 +152,7 @@ namespace Lucene.Net.Search.PostingsHighlight
}
}
- internal class SimpleCharacterRunAutomatonAnonymousClass : CharacterRunAutomaton
+ private class SimpleCharacterRunAutomatonAnonymousClass : CharacterRunAutomaton
{
private readonly CharsRef lowerBound;
private readonly CharsRef upperBound;
@@ -233,7 +233,7 @@ namespace Lucene.Net.Search.PostingsHighlight
return new DocsAndPositionsEnumAnonymousClass(ts, matchers, charTermAtt, offsetAtt);
}
- internal class DocsAndPositionsEnumAnonymousClass : DocsAndPositionsEnum
+ private class DocsAndPositionsEnumAnonymousClass : DocsAndPositionsEnum
{
private readonly CharacterRunAutomaton[] matchers;
private readonly ICharTermAttribute charTermAtt;
diff --git a/src/Lucene.Net.Highlighter/PostingsHighlight/Passage.cs b/src/Lucene.Net.Highlighter/PostingsHighlight/Passage.cs
index 9239a65..33b7035 100644
--- a/src/Lucene.Net.Highlighter/PostingsHighlight/Passage.cs
+++ b/src/Lucene.Net.Highlighter/PostingsHighlight/Passage.cs
@@ -64,7 +64,7 @@ namespace Lucene.Net.Search.PostingsHighlight
numMatches++;
}
- internal class InPlaceMergeSorterAnonymousClass : InPlaceMergeSorter
+ private class InPlaceMergeSorterAnonymousClass : InPlaceMergeSorter
{
private readonly int[] starts;
private readonly int[] ends;
diff --git a/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs b/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs
index d145f21..316dd52 100644
--- a/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs
+++ b/src/Lucene.Net.Highlighter/PostingsHighlight/PostingsHighlighter.cs
@@ -333,7 +333,7 @@ namespace Lucene.Net.Search.PostingsHighlight
return snippets;
}
- internal class InPlaceMergeSorterAnonymousClass : InPlaceMergeSorter
+ private class InPlaceMergeSorterAnonymousClass : InPlaceMergeSorter
{
private readonly string[] fields;
private readonly int[] maxPassages;
diff --git a/src/Lucene.Net.Highlighter/VectorHighlight/BaseFragmentsBuilder.cs b/src/Lucene.Net.Highlighter/VectorHighlight/BaseFragmentsBuilder.cs
index 9002537..6cfe11a 100644
--- a/src/Lucene.Net.Highlighter/VectorHighlight/BaseFragmentsBuilder.cs
+++ b/src/Lucene.Net.Highlighter/VectorHighlight/BaseFragmentsBuilder.cs
@@ -156,7 +156,7 @@ namespace Lucene.Net.Search.VectorHighlight
return fields.ToArray(/*new Field[fields.size()]*/);
}
- internal class GetFieldsStoredFieldsVisitorAnonymousClass : StoredFieldVisitor
+ private class GetFieldsStoredFieldsVisitorAnonymousClass : StoredFieldVisitor
{
private readonly IList<Field> fields;
private readonly string fieldName;
diff --git a/src/Lucene.Net.Sandbox/Queries/SortedSetSortField.cs b/src/Lucene.Net.Sandbox/Queries/SortedSetSortField.cs
index 7128c74..50cd15f 100644
--- a/src/Lucene.Net.Sandbox/Queries/SortedSetSortField.cs
+++ b/src/Lucene.Net.Sandbox/Queries/SortedSetSortField.cs
@@ -145,7 +145,7 @@ namespace Lucene.Net.Sandbox.Queries
}
}
- internal class TermOrdValComparerAnonymousClass : FieldComparer.TermOrdValComparer
+ private class TermOrdValComparerAnonymousClass : FieldComparer.TermOrdValComparer
{
private readonly SortedSetSortField outerInstance;
diff --git a/src/Lucene.Net.Spatial/Serialized/SerializedDVStrategy.cs b/src/Lucene.Net.Spatial/Serialized/SerializedDVStrategy.cs
index f6dba8c..485c752 100644
--- a/src/Lucene.Net.Spatial/Serialized/SerializedDVStrategy.cs
+++ b/src/Lucene.Net.Spatial/Serialized/SerializedDVStrategy.cs
@@ -77,7 +77,7 @@ namespace Lucene.Net.Spatial.Serialized
return new Field[] { new BinaryDocValuesField(FieldName, bytesRef) };
}
- internal class OutputStreamAnonymousClass : MemoryStream
+ private class OutputStreamAnonymousClass : MemoryStream
{
private readonly BytesRef bytesRef;
@@ -147,7 +147,7 @@ namespace Lucene.Net.Spatial.Serialized
return new DocIdSetAnonymousClass(this, context, acceptDocs);
}
- internal class DocIdSetAnonymousClass : DocIdSet
+ private class DocIdSetAnonymousClass : DocIdSet
{
private readonly PredicateValueSourceFilter outerInstance;
private readonly AtomicReaderContext context;
@@ -178,7 +178,7 @@ namespace Lucene.Net.Spatial.Serialized
}
}
- internal class BitsAnonymousClass : IBits
+ private class BitsAnonymousClass : IBits
{
private readonly FunctionValues predFuncValues;
private readonly AtomicReaderContext context;
@@ -243,7 +243,7 @@ namespace Lucene.Net.Spatial.Serialized
return new FuctionValuesAnonymousClass(this, docValues);
}
- internal class FuctionValuesAnonymousClass : FunctionValues
+ private class FuctionValuesAnonymousClass : FunctionValues
{
private readonly ShapeDocValueSource outerInstance;
private readonly BinaryDocValues docValues;
diff --git a/src/Lucene.Net.Spatial/Util/DistanceToShapeValueSource.cs b/src/Lucene.Net.Spatial/Util/DistanceToShapeValueSource.cs
index d546db6..6234830 100644
--- a/src/Lucene.Net.Spatial/Util/DistanceToShapeValueSource.cs
+++ b/src/Lucene.Net.Spatial/Util/DistanceToShapeValueSource.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Spatial.Util
return new DoubleDocValuesAnonymousClass(this, shapeValues);
}
- internal class DoubleDocValuesAnonymousClass : DoubleDocValues
+ private class DoubleDocValuesAnonymousClass : DoubleDocValues
{
private readonly DistanceToShapeValueSource outerInstance;
private readonly FunctionValues shapeValues;
diff --git a/src/Lucene.Net.Spatial/Util/ShapePredicateValueSource.cs b/src/Lucene.Net.Spatial/Util/ShapePredicateValueSource.cs
index 80e904c..6d6a178 100644
--- a/src/Lucene.Net.Spatial/Util/ShapePredicateValueSource.cs
+++ b/src/Lucene.Net.Spatial/Util/ShapePredicateValueSource.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Spatial.Util
return new BoolDocValuesAnonymousClass(this, shapeValues);
}
- internal class BoolDocValuesAnonymousClass : BoolDocValues
+ private class BoolDocValuesAnonymousClass : BoolDocValues
{
private readonly ShapePredicateValueSource outerInstance;
private readonly FunctionValues shapeValues;
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index c2a9b03..c5eb737 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -3639,7 +3639,7 @@ namespace Lucene.Net.Util
}
}
- //internal class ReaderClosedListenerAnonymousClass : IndexReader.IReaderClosedListener
+ //private class ReaderClosedListenerAnonymousClass : IndexReader.IReaderClosedListener
//{
// private TaskScheduler ex;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs
index 844374f..b229e07 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs
@@ -290,7 +290,7 @@ namespace Lucene.Net.Analysis.Synonym
AssertTokIncludes(synMap, "b", "b");
}
- internal sealed class ResourceLoaderAnonymousClass : IResourceLoader
+ private sealed class ResourceLoaderAnonymousClass : IResourceLoader
{
public T NewInstance<T>(string cname)
{
diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterPhraseTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterPhraseTest.cs
index 87c2fca..8bb2ef4 100644
--- a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterPhraseTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterPhraseTest.cs
@@ -135,7 +135,7 @@ namespace Lucene.Net.Search.Highlight
}
}
- internal class ConcurrentSpanCollectorAnonymousClass : ICollector
+ private class ConcurrentSpanCollectorAnonymousClass : ICollector
{
private readonly HighlighterPhraseTest outerInstance;
private readonly FixedBitSet bitset;
diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
index daf48d1..b6b666e 100644
--- a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
@@ -131,7 +131,7 @@ namespace Lucene.Net.Search.Highlight
assertEquals("<B>This</B> piece of text refers to Kennedy at the beginning then has a longer piece of text that is <B>very</B>", fragment);
}
- internal class TestHighlightUnknowQueryAnonymousClass : Query
+ private class TestHighlightUnknowQueryAnonymousClass : Query
{
public override Query Rewrite(IndexReader reader)
{
@@ -1543,7 +1543,7 @@ namespace Lucene.Net.Search.Highlight
assertEquals("XHTML Encoding should have worked:", rawDocContent, decodedSnippet);
}
- internal class TestEncodingScorerAnonymousClass : IScorer
+ private class TestEncodingScorerAnonymousClass : IScorer
{
private readonly HighlighterTest outerInstance;
@@ -1628,7 +1628,7 @@ namespace Lucene.Net.Search.Highlight
}
- protected sealed class TS2TokenStreamAnonymousClass : TokenStream
+ private sealed class TS2TokenStreamAnonymousClass : TokenStream
{
public TS2TokenStreamAnonymousClass()
{
@@ -1690,7 +1690,7 @@ namespace Lucene.Net.Search.Highlight
return new TS2aTokenStreamAnonymousClass();
}
- protected sealed class TS2aTokenStreamAnonymousClass : TokenStream
+ private sealed class TS2aTokenStreamAnonymousClass : TokenStream
{
public TS2aTokenStreamAnonymousClass()
{
diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/OffsetLimitTokenFilterTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/OffsetLimitTokenFilterTest.cs
index aa9c029..039564c 100644
--- a/src/Lucene.Net.Tests.Highlighter/Highlight/OffsetLimitTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Highlight/OffsetLimitTokenFilterTest.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Search.Highlight
CheckOneTerm(new AnalyzerAnonymousClass(), "llenges", "llenges");
}
- internal class AnalyzerAnonymousClass : Analyzer
+ private class AnalyzerAnonymousClass : Analyzer
{
protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
index 41eebac..e2acd5a 100644
--- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FastVectorHighlighterTest.cs
@@ -642,7 +642,7 @@ namespace Lucene.Net.Search.VectorHighlight
dir.Dispose();
}
- internal class AnalyzerWrapperAnonymousClass : AnalyzerWrapper
+ private class AnalyzerWrapperAnonymousClass : AnalyzerWrapper
{
IDictionary<String, Analyzer> fieldAnalyzers = new JCG.SortedDictionary<String, Analyzer>(StringComparer.Ordinal);
diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FieldQueryTest.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FieldQueryTest.cs
index e1f3ea1..41d11fe 100644
--- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FieldQueryTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/FieldQueryTest.cs
@@ -990,7 +990,7 @@ namespace Lucene.Net.Search.VectorHighlight
phraseCandidate.Add(new TermInfo("defg", 0, 12, 0, 1));
assertNotNull(fq.SearchPhrase(F, phraseCandidate));
}
- internal class TestStopRewriteQueryAnonymousClass : Query
+ private class TestStopRewriteQueryAnonymousClass : Query
{
public override string ToString(string field)
{
@@ -1007,7 +1007,7 @@ namespace Lucene.Net.Search.VectorHighlight
new FieldQuery(q, reader, true, true);
}
- internal class TestFlattenFilteredQueryFilterAnonymousClass : Filter
+ private class TestFlattenFilteredQueryFilterAnonymousClass : Filter
{
public override DocIdSet GetDocIdSet(AtomicReaderContext context, IBits acceptDocs)
{
diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/IndexTimeSynonymTest.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/IndexTimeSynonymTest.cs
index 155c53a..5cc625b 100644
--- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/IndexTimeSynonymTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/IndexTimeSynonymTest.cs
@@ -323,7 +323,7 @@ namespace Lucene.Net.Search.VectorHighlight
return token;
}
- internal sealed class TokenizerAnonymousClass : Tokenizer
+ private sealed class TokenizerAnonymousClass : Tokenizer
{
private readonly Token[] tokens;
diff --git a/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs b/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs
index f1e8003..f0127a3 100644
--- a/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs
+++ b/src/Lucene.Net.Tests/Search/TestTimeLimitingCollector.cs
@@ -338,7 +338,7 @@ namespace Lucene.Net.Search
assertEquals("some threads failed!", N_THREADS, success.Cardinality());
}
- internal class ThreadClassAnonymousClass : ThreadJob
+ private class ThreadClassAnonymousClass : ThreadJob
{
private readonly TestTimeLimitingCollector outerInstance;
private readonly OpenBitSet success;