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 dfae964ce0a1b066fd808275fd81d90385cde3fe Author: Shad Storhaug <[email protected]> AuthorDate: Sat Nov 5 23:44:12 2022 +0700 SWEEP: Changed all internal constructors of abstract classes to private protected. (fixes #677) --- src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs | 2 +- src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 2 +- src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs | 2 +- src/Lucene.Net.Join/TermsCollector.cs | 2 +- src/Lucene.Net.Join/TermsWithScoreCollector.cs | 2 +- .../Flexible/Core/Config/AbstractQueryConfig.cs | 2 +- src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs | 2 +- src/Lucene.Net/Index/IndexReader.cs | 2 +- src/Lucene.Net/Index/IndexReaderContext.cs | 2 +- src/Lucene.Net/Index/MergeState.cs | 4 ++-- src/Lucene.Net/Search/FieldCacheImpl.cs | 2 +- src/Lucene.Net/Search/FieldValueHitQueue.cs | 2 +- src/Lucene.Net/Store/BufferedIndexOutput.cs | 2 +- src/Lucene.Net/Store/ByteBufferIndexInput.cs | 2 +- src/Lucene.Net/Util/Automaton/LevenshteinAutomata.cs | 4 ++-- src/Lucene.Net/Util/Fst/Builder.cs | 2 +- src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs | 2 +- src/Lucene.Net/Util/Packed/AbstractPagedMutable.cs | 2 +- src/Lucene.Net/Util/Packed/Packed64SingleBlock.cs | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs index 9e0e55e67..e080192ca 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs @@ -302,7 +302,7 @@ namespace Lucene.Net.Codecs.Memory private readonly int[] docFreq; // LUCENENET: marked readonly private readonly long[] totalTermFreq; // LUCENENET: marked readonly - internal BaseTermsEnum(TermsReader outerInstance) + private protected BaseTermsEnum(TermsReader outerInstance) // LUCENENET: Changed from internal to private protected { this.outerInstance = outerInstance; this.state = outerInstance.outerInstance.postingsReader.NewTermState(); diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs index aa59d93da..eaff0bb3c 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs @@ -259,7 +259,7 @@ namespace Lucene.Net.Codecs.Memory /// Decodes metadata into customized term state. </summary> internal abstract void DecodeMetaData(); - internal BaseTermsEnum(FSTTermsReader.TermsReader outerInstance) + private protected BaseTermsEnum(FSTTermsReader.TermsReader outerInstance) // LUCENENET: Changed from internal to private protected { this.outerInstance = outerInstance; this.state = outerInstance.outerInstance.postingsReader.NewTermState(); diff --git a/src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs b/src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs index 4e284fce4..d854e8bc7 100644 --- a/src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs +++ b/src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs @@ -66,7 +66,7 @@ namespace Lucene.Net.Search.Grouping.Terms } } - internal TermGroupFacetCollector(string groupField, string facetField, BytesRef facetPrefix, int initialSize) + private protected TermGroupFacetCollector(string groupField, string facetField, BytesRef facetPrefix, int initialSize) // LUCENENET: Changed from internal to private protected : base(groupField, facetField, facetPrefix) { groupedFacetHits = new JCG.List<GroupedFacetHit>(initialSize); diff --git a/src/Lucene.Net.Join/TermsCollector.cs b/src/Lucene.Net.Join/TermsCollector.cs index 9df0615f3..03a1ab830 100644 --- a/src/Lucene.Net.Join/TermsCollector.cs +++ b/src/Lucene.Net.Join/TermsCollector.cs @@ -31,7 +31,7 @@ namespace Lucene.Net.Search.Join private readonly string _field; private readonly BytesRefHash _collectorTerms = new BytesRefHash(); - internal TermsCollector(string field) + private protected TermsCollector(string field) // LUCENENET: Changed from internal to private protected { _field = field; } diff --git a/src/Lucene.Net.Join/TermsWithScoreCollector.cs b/src/Lucene.Net.Join/TermsWithScoreCollector.cs index c8d6f7993..28f7ab135 100644 --- a/src/Lucene.Net.Join/TermsWithScoreCollector.cs +++ b/src/Lucene.Net.Join/TermsWithScoreCollector.cs @@ -35,7 +35,7 @@ namespace Lucene.Net.Search.Join private Scorer _scorer; private float[] _scoreSums = new float[INITIAL_ARRAY_SIZE]; - internal TermsWithScoreCollector(string field, ScoreMode scoreMode) + private protected TermsWithScoreCollector(string field, ScoreMode scoreMode) // LUCENENET: Changed from internal to private protected { this._field = field; this._scoreMode = scoreMode; diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Config/AbstractQueryConfig.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Config/AbstractQueryConfig.cs index 686941447..2afc9e053 100644 --- a/src/Lucene.Net.QueryParser/Flexible/Core/Config/AbstractQueryConfig.cs +++ b/src/Lucene.Net.QueryParser/Flexible/Core/Config/AbstractQueryConfig.cs @@ -33,7 +33,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Config { private readonly IDictionary<ConfigurationKey, object> configMap = new Dictionary<ConfigurationKey, object>(); - internal AbstractQueryConfig() + private protected AbstractQueryConfig() // LUCENENET: Changed from internal to private protected { // although this class is public, it can only be constructed from package } diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs index 02e541f70..3ed2a05b6 100644 --- a/src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs +++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs @@ -320,7 +320,7 @@ namespace Lucene.Net.Codecs.Lucene40 protected bool m_skipped; protected internal readonly IBits m_liveDocs; - internal SegmentDocsEnumBase(Lucene40PostingsReader outerInstance, IndexInput startFreqIn, IBits liveDocs) + private protected SegmentDocsEnumBase(Lucene40PostingsReader outerInstance, IndexInput startFreqIn, IBits liveDocs) // LUCENENET: Changed from internal to private protected { this.outerInstance = outerInstance; this.startFreqIn = startFreqIn; diff --git a/src/Lucene.Net/Index/IndexReader.cs b/src/Lucene.Net/Index/IndexReader.cs index c6629ba21..ab19154e7 100644 --- a/src/Lucene.Net/Index/IndexReader.cs +++ b/src/Lucene.Net/Index/IndexReader.cs @@ -81,7 +81,7 @@ namespace Lucene.Net.Index private bool closedByChild = false; private readonly AtomicInt32 refCount = new AtomicInt32(1); - internal IndexReader() + private protected IndexReader() // LUCENENET: Changed from internal to private protected { if (!(this is CompositeReader || this is AtomicReader)) { diff --git a/src/Lucene.Net/Index/IndexReaderContext.cs b/src/Lucene.Net/Index/IndexReaderContext.cs index 8ea5a3486..94cfc12c4 100644 --- a/src/Lucene.Net/Index/IndexReaderContext.cs +++ b/src/Lucene.Net/Index/IndexReaderContext.cs @@ -42,7 +42,7 @@ namespace Lucene.Net.Index /// the ord for this reader in the parent, <c>0</c> if parent is <c>null</c> </summary> public int OrdInParent { get; private set; } - internal IndexReaderContext(CompositeReaderContext parent, int ordInParent, int docBaseInParent) + private protected IndexReaderContext(CompositeReaderContext parent, int ordInParent, int docBaseInParent) // LUCENENET: Changed from internal to private protected { if (!(this is CompositeReaderContext || this is AtomicReaderContext)) { diff --git a/src/Lucene.Net/Index/MergeState.cs b/src/Lucene.Net/Index/MergeState.cs index 88426d043..988a4afc6 100644 --- a/src/Lucene.Net/Index/MergeState.cs +++ b/src/Lucene.Net/Index/MergeState.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Diagnostics; +using Lucene.Net.Diagnostics; using Lucene.Net.Support; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; @@ -39,7 +39,7 @@ namespace Lucene.Net.Index /// </summary> public abstract class DocMap { - internal DocMap() + private protected DocMap() // LUCENENET: Changed from internal to private protected { } diff --git a/src/Lucene.Net/Search/FieldCacheImpl.cs b/src/Lucene.Net/Search/FieldCacheImpl.cs index b47503773..7b400fe16 100644 --- a/src/Lucene.Net/Search/FieldCacheImpl.cs +++ b/src/Lucene.Net/Search/FieldCacheImpl.cs @@ -283,7 +283,7 @@ namespace Lucene.Net.Search /// Expert: Internal cache. </summary> internal abstract class Cache<TKey, TValue> where TKey : CacheKey { - internal Cache(FieldCacheImpl wrapper) + private protected Cache(FieldCacheImpl wrapper) // LUCENENET: Changed from internal to private protected { this.wrapper = wrapper; } diff --git a/src/Lucene.Net/Search/FieldValueHitQueue.cs b/src/Lucene.Net/Search/FieldValueHitQueue.cs index 9288135da..bf18d0da3 100644 --- a/src/Lucene.Net/Search/FieldValueHitQueue.cs +++ b/src/Lucene.Net/Search/FieldValueHitQueue.cs @@ -174,7 +174,7 @@ namespace Lucene.Net.Search where T : FieldValueHitQueue.Entry { // prevent instantiation and extension. - internal FieldValueHitQueue(SortField[] fields, int size) + private protected FieldValueHitQueue(SortField[] fields, int size) // LUCENENET: Changed from private to private protected : base(size) { // When we get here, fields.length is guaranteed to be > 0, therefore no diff --git a/src/Lucene.Net/Store/BufferedIndexOutput.cs b/src/Lucene.Net/Store/BufferedIndexOutput.cs index 1f1d2b76a..9dae04058 100644 --- a/src/Lucene.Net/Store/BufferedIndexOutput.cs +++ b/src/Lucene.Net/Store/BufferedIndexOutput.cs @@ -54,7 +54,7 @@ namespace Lucene.Net.Store // LUCENENET specific - added constructor overload so FSDirectory can still subclass BufferedIndexOutput, but // utilize its own buffer, since FileStream is already buffered in .NET. - internal BufferedIndexOutput(int bufferSize, CRC32 crc) + private protected BufferedIndexOutput(int bufferSize, CRC32 crc) { if (bufferSize <= 0) { diff --git a/src/Lucene.Net/Store/ByteBufferIndexInput.cs b/src/Lucene.Net/Store/ByteBufferIndexInput.cs index be26f3209..b2b8a0ff1 100644 --- a/src/Lucene.Net/Store/ByteBufferIndexInput.cs +++ b/src/Lucene.Net/Store/ByteBufferIndexInput.cs @@ -75,7 +75,7 @@ namespace Lucene.Net.Store } } - internal ByteBufferIndexInput(string resourceDescription, ByteBuffer[] buffers, long length, int chunkSizePower, bool trackClones) + private protected ByteBufferIndexInput(string resourceDescription, ByteBuffer[] buffers, long length, int chunkSizePower, bool trackClones) // LUCENENET: Changed from internal to private protected : base(resourceDescription) { //this.buffers = buffers; // LUCENENET: this is set in SetBuffers() diff --git a/src/Lucene.Net/Util/Automaton/LevenshteinAutomata.cs b/src/Lucene.Net/Util/Automaton/LevenshteinAutomata.cs index 44902dcda..48a8b1cd5 100644 --- a/src/Lucene.Net/Util/Automaton/LevenshteinAutomata.cs +++ b/src/Lucene.Net/Util/Automaton/LevenshteinAutomata.cs @@ -1,4 +1,4 @@ -using J2N; +using J2N; using Lucene.Net.Diagnostics; using System; using System.Collections.Generic; @@ -257,7 +257,7 @@ namespace Lucene.Net.Util.Automaton protected readonly int m_n; private readonly int[] minErrors; - internal ParametricDescription(int w, int n, int[] minErrors) + private protected ParametricDescription(int w, int n, int[] minErrors) // LUCENENET: Changed from internal to private protected { this.m_w = w; this.m_n = n; diff --git a/src/Lucene.Net/Util/Fst/Builder.cs b/src/Lucene.Net/Util/Fst/Builder.cs index eb12b121a..78f61bedb 100644 --- a/src/Lucene.Net/Util/Fst/Builder.cs +++ b/src/Lucene.Net/Util/Fst/Builder.cs @@ -578,7 +578,7 @@ namespace Lucene.Net.Util.Fst /// </summary> public abstract class Builder { - internal Builder() { } // Disallow external creation + private protected Builder() { } // Disallow external creation /// <summary> /// Expert: this is invoked by Builder whenever a suffix diff --git a/src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs b/src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs index e950cfef7..61578feb4 100644 --- a/src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs +++ b/src/Lucene.Net/Util/Packed/AbstractAppendingLongBuffer.cs @@ -42,7 +42,7 @@ namespace Lucene.Net.Util.Packed internal int pendingOff; internal float acceptableOverheadRatio; - internal AbstractAppendingInt64Buffer(int initialBlockCount, int pageSize, float acceptableOverheadRatio) + private protected AbstractAppendingInt64Buffer(int initialBlockCount, int pageSize, float acceptableOverheadRatio) // LUCENENET: Changed from internal to private protected { values = new PackedInt32s.Reader[initialBlockCount]; pending = new long[pageSize]; diff --git a/src/Lucene.Net/Util/Packed/AbstractPagedMutable.cs b/src/Lucene.Net/Util/Packed/AbstractPagedMutable.cs index a90b0a913..b783815fb 100644 --- a/src/Lucene.Net/Util/Packed/AbstractPagedMutable.cs +++ b/src/Lucene.Net/Util/Packed/AbstractPagedMutable.cs @@ -38,7 +38,7 @@ namespace Lucene.Net.Util.Packed internal readonly PackedInt32s.Mutable[] subMutables; internal readonly int bitsPerValue; - internal AbstractPagedMutable(int bitsPerValue, long size, int pageSize) + private protected AbstractPagedMutable(int bitsPerValue, long size, int pageSize) // LUCENENET: Changed from internal to private protected { this.bitsPerValue = bitsPerValue; this.size = size; diff --git a/src/Lucene.Net/Util/Packed/Packed64SingleBlock.cs b/src/Lucene.Net/Util/Packed/Packed64SingleBlock.cs index 9ad4d5fea..32b474c31 100644 --- a/src/Lucene.Net/Util/Packed/Packed64SingleBlock.cs +++ b/src/Lucene.Net/Util/Packed/Packed64SingleBlock.cs @@ -51,7 +51,7 @@ namespace Lucene.Net.Util.Packed internal readonly long[] blocks; - internal Packed64SingleBlock(int valueCount, int bitsPerValue) + private protected Packed64SingleBlock(int valueCount, int bitsPerValue) // LUCENENET: Changed from internal to private protected : base(valueCount, bitsPerValue) { if (Debugging.AssertsEnabled) Debugging.Assert(IsSupported(bitsPerValue));
