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 2022/11/05 18:54:47 UTC
[lucenenet] branch master updated (fdf6f34f0 -> dfae964ce)
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
from fdf6f34f0 Deleted src/Lucene.Net.Spatial.Overview.html (legacy doc)
new 58ca43bf8 BREAKING: Lucene.Net.Search.FieldCacheRangeFilter<T>: Changed accessibility from protected internal to private protected. This class was not intended to be subclassed by users. (see #677)
new 568e4e45c SWEEP: Changed all public constructors of abstract classes to protected, except where it would be a problem for Reflection calls. (fixes #677)
new e46686920 SWEEP: Changed all protected internal constructors of abstract classes to protected. (fixes #677)
new dfae964ce SWEEP: Changed all internal constructors of abstract classes to private protected. (fixes #677)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../Analysis/CharFilter/BaseCharFilter.cs | 4 ++--
src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs | 2 +-
src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs | 6 +++---
src/Lucene.Net.Analysis.Phonetic/Language/ColognePhonetic.cs | 4 ++--
src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs | 2 +-
src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs | 2 +-
src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 2 +-
src/Lucene.Net.Expressions/Bindings.cs | 5 ++++-
src/Lucene.Net.Expressions/Expression.cs | 4 +++-
src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs | 2 +-
src/Lucene.Net.Grouping/Term/TermGroupFacetCollector.cs | 2 +-
src/Lucene.Net.Join/TermsCollector.cs | 2 +-
src/Lucene.Net.Join/TermsWithScoreCollector.cs | 2 +-
src/Lucene.Net.Queries/TermsFilter.cs | 4 ++--
.../Flexible/Core/Config/AbstractQueryConfig.cs | 2 +-
src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs | 4 ++--
src/Lucene.Net/Analysis/AnalyzerWrapper.cs | 6 +++---
src/Lucene.Net/Analysis/TokenFilter.cs | 4 ++--
src/Lucene.Net/Analysis/Tokenizer.cs | 4 ++--
src/Lucene.Net/Codecs/Compressing/CompressionMode.cs | 4 ++--
src/Lucene.Net/Codecs/Compressing/Compressor.cs | 4 ++--
src/Lucene.Net/Codecs/Compressing/Decompressor.cs | 2 +-
src/Lucene.Net/Codecs/DocValuesConsumer.cs | 4 ++--
src/Lucene.Net/Codecs/DocValuesProducer.cs | 4 ++--
src/Lucene.Net/Codecs/FieldInfosFormat.cs | 4 ++--
src/Lucene.Net/Codecs/FieldInfosReader.cs | 4 ++--
src/Lucene.Net/Codecs/FieldInfosWriter.cs | 4 ++--
src/Lucene.Net/Codecs/FieldsConsumer.cs | 4 ++--
src/Lucene.Net/Codecs/FieldsProducer.cs | 4 ++--
src/Lucene.Net/Codecs/FilterCodec.cs | 4 ++--
src/Lucene.Net/Codecs/LiveDocsFormat.cs | 4 ++--
src/Lucene.Net/Codecs/Lucene40/Lucene40PostingsReader.cs | 2 +-
src/Lucene.Net/Codecs/NormsFormat.cs | 4 ++--
src/Lucene.Net/Codecs/PostingsBaseFormat.cs | 4 ++--
src/Lucene.Net/Codecs/PostingsConsumer.cs | 4 ++--
src/Lucene.Net/Codecs/PostingsReaderBase.cs | 4 ++--
src/Lucene.Net/Codecs/PostingsWriterBase.cs | 4 ++--
src/Lucene.Net/Codecs/SegmentInfoFormat.cs | 4 ++--
src/Lucene.Net/Codecs/SegmentInfoReader.cs | 4 ++--
src/Lucene.Net/Codecs/SegmentInfoWriter.cs | 4 ++--
src/Lucene.Net/Codecs/StoredFieldsFormat.cs | 4 ++--
src/Lucene.Net/Codecs/StoredFieldsReader.cs | 2 +-
src/Lucene.Net/Codecs/StoredFieldsWriter.cs | 4 ++--
src/Lucene.Net/Codecs/TermVectorsFormat.cs | 4 ++--
src/Lucene.Net/Codecs/TermVectorsReader.cs | 2 +-
src/Lucene.Net/Codecs/TermVectorsWriter.cs | 2 +-
src/Lucene.Net/Codecs/TermsConsumer.cs | 2 +-
src/Lucene.Net/Index/CompositeReader.cs | 4 ++--
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/FieldCacheRangeFilter.cs | 2 +-
src/Lucene.Net/Search/FieldValueHitQueue.cs | 2 +-
src/Lucene.Net/Store/BaseDirectory.cs | 2 +-
src/Lucene.Net/Store/BufferedIndexOutput.cs | 2 +-
src/Lucene.Net/Store/ByteBufferIndexInput.cs | 2 +-
src/Lucene.Net/Store/FSDirectory.cs | 2 +-
src/Lucene.Net/Support/Util/NumberFormat.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 +-
64 files changed, 104 insertions(+), 99 deletions(-)
[lucenenet] 04/04: SWEEP: Changed all internal constructors of abstract classes to private protected. (fixes #677)
Posted by ni...@apache.org.
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 <sh...@shadstorhaug.com>
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));
[lucenenet] 02/04: SWEEP: Changed all public constructors of abstract classes to protected, except where it would be a problem for Reflection calls. (fixes #677)
Posted by ni...@apache.org.
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 568e4e45c1cf967b21fb36bdd39a10644aa70725
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sat Nov 5 23:38:40 2022 +0700
SWEEP: Changed all public constructors of abstract classes to protected, except where it would be a problem for Reflection calls. (fixes #677)
---
.../Analysis/CharFilter/BaseCharFilter.cs | 4 ++--
src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs | 2 +-
src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs | 6 +++---
src/Lucene.Net.Analysis.Phonetic/Language/ColognePhonetic.cs | 4 ++--
src/Lucene.Net.Expressions/Bindings.cs | 5 ++++-
src/Lucene.Net.Expressions/Expression.cs | 4 +++-
src/Lucene.Net.Queries/TermsFilter.cs | 4 ++--
src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs | 4 ++--
src/Lucene.Net/Support/Util/NumberFormat.cs | 2 +-
9 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/BaseCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/BaseCharFilter.cs
index 5fd9bc9d0..111003aed 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/BaseCharFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/BaseCharFilter.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
using J2N.Numerics;
using Lucene.Net.Diagnostics;
using Lucene.Net.Support;
@@ -38,7 +38,7 @@ namespace Lucene.Net.Analysis.CharFilters
private int[] diffs;
private int size = 0;
- public BaseCharFilter(TextReader @in)
+ protected BaseCharFilter(TextReader @in) // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
: base(@in)
{
}
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
index ec46b712b..15c2642d4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
@@ -338,7 +338,7 @@ namespace Lucene.Net.Analysis.Synonym
{
private readonly Analyzer analyzer;
- public Parser(bool dedup, Analyzer analyzer)
+ protected Parser(bool dedup, Analyzer analyzer) // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
: base(dedup)
{
this.analyzer = analyzer;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
index c1797fa29..74674f63f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
using J2N;
using Lucene.Net.Analysis.TokenAttributes;
using Lucene.Net.Diagnostics;
@@ -71,7 +71,7 @@ namespace Lucene.Net.Analysis.Util
/// Lucene version to match </param>
/// <param name="input">
/// the input to split up into tokens </param>
- public CharTokenizer(LuceneVersion matchVersion, TextReader input)
+ protected CharTokenizer(LuceneVersion matchVersion, TextReader input) // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
: base(input)
{
Init(matchVersion);
@@ -86,7 +86,7 @@ namespace Lucene.Net.Analysis.Util
/// the attribute factory to use for this <see cref="Tokenizer"/> </param>
/// <param name="input">
/// the input to split up into tokens </param>
- public CharTokenizer(LuceneVersion matchVersion, AttributeFactory factory, TextReader input)
+ protected CharTokenizer(LuceneVersion matchVersion, AttributeFactory factory, TextReader input) // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
: base(factory, input)
{
Init(matchVersion);
diff --git a/src/Lucene.Net.Analysis.Phonetic/Language/ColognePhonetic.cs b/src/Lucene.Net.Analysis.Phonetic/Language/ColognePhonetic.cs
index 29540edcc..a84104e97 100644
--- a/src/Lucene.Net.Analysis.Phonetic/Language/ColognePhonetic.cs
+++ b/src/Lucene.Net.Analysis.Phonetic/Language/ColognePhonetic.cs
@@ -193,13 +193,13 @@ namespace Lucene.Net.Analysis.Phonetic.Language
protected int m_length = 0;
- public CologneBuffer(char[] data)
+ protected CologneBuffer(char[] data) // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
{
this.m_data = data;
this.m_length = data.Length;
}
- public CologneBuffer(int buffSize)
+ protected CologneBuffer(int buffSize) // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
{
this.m_data = new char[buffSize];
this.m_length = 0;
diff --git a/src/Lucene.Net.Expressions/Bindings.cs b/src/Lucene.Net.Expressions/Bindings.cs
index 303a2c370..923455741 100644
--- a/src/Lucene.Net.Expressions/Bindings.cs
+++ b/src/Lucene.Net.Expressions/Bindings.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Queries.Function;
+using Lucene.Net.Queries.Function;
+using System.Diagnostics.CodeAnalysis;
namespace Lucene.Net.Expressions
{
@@ -35,6 +36,8 @@ namespace Lucene.Net.Expressions
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </remarks>
+ [SuppressMessage("CodeQuality", "IDE0079:Remove unnecessary suppression", Justification = "This is a SonarCloud issue")]
+ [SuppressMessage("CodeQuality", "S3442:\"abstract\" classes should not have \"public\" constructors", Justification = "Public is required for Relection")]
public Bindings() // LUCENENET NOTE: This must be public for the Reflection code to work right.
{
}
diff --git a/src/Lucene.Net.Expressions/Expression.cs b/src/Lucene.Net.Expressions/Expression.cs
index dfa292b6b..94cf0fda6 100644
--- a/src/Lucene.Net.Expressions/Expression.cs
+++ b/src/Lucene.Net.Expressions/Expression.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Queries.Function;
+using Lucene.Net.Queries.Function;
using Lucene.Net.Search;
using Lucene.Net.Support;
using System.Diagnostics.CodeAnalysis;
@@ -63,6 +63,8 @@ namespace Lucene.Net.Expressions
/// <param name="variables">
/// Names of external variables referred to by the expression
/// </param>
+ [SuppressMessage("CodeQuality", "IDE0079:Remove unnecessary suppression", Justification = "This is a SonarCloud issue")]
+ [SuppressMessage("CodeQuality", "S3442:\"abstract\" classes should not have \"public\" constructors", Justification = "Public is required for Relection")]
public Expression(string sourceText, string[] variables) // LUCENENET NOTE: This must be public for the Reflection code to work right.
{
// javadocs
diff --git a/src/Lucene.Net.Queries/TermsFilter.cs b/src/Lucene.Net.Queries/TermsFilter.cs
index 555ef7000..23e138c60 100644
--- a/src/Lucene.Net.Queries/TermsFilter.cs
+++ b/src/Lucene.Net.Queries/TermsFilter.cs
@@ -398,11 +398,11 @@ namespace Lucene.Net.Queries
public abstract bool MoveNext();
- public FieldAndTermEnum()
+ protected FieldAndTermEnum() // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
{
}
- public FieldAndTermEnum(string field)
+ protected FieldAndTermEnum(string field) // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
{
this.Field = field;
}
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
index e633c7849..21ffc858f 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
@@ -26,10 +26,10 @@ namespace Lucene.Net.QueryParsers.Surround.Query
protected readonly string m_fieldName;
protected readonly BasicQueryFactory m_qf;
- public RewriteQuery(
+ protected RewriteQuery(
SQ srndQuery,
string fieldName,
- BasicQueryFactory qf)
+ BasicQueryFactory qf) // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
{
this.m_srndQuery = srndQuery;
this.m_fieldName = fieldName;
diff --git a/src/Lucene.Net/Support/Util/NumberFormat.cs b/src/Lucene.Net/Support/Util/NumberFormat.cs
index 780ccc2c7..a460530b7 100644
--- a/src/Lucene.Net/Support/Util/NumberFormat.cs
+++ b/src/Lucene.Net/Support/Util/NumberFormat.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Util
//private int maximumFractionDigits;
//private int minimumFractionDigits;
- public NumberFormat(IFormatProvider formatProvider)
+ protected NumberFormat(IFormatProvider formatProvider) // LUCENENET: CA1012: Abstract types should not have constructors (marked protected)
{
this.formatProvider = formatProvider;
}
[lucenenet] 03/04: SWEEP: Changed all protected internal constructors of abstract classes to protected. (fixes #677)
Posted by ni...@apache.org.
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 e46686920363d3bdde375e4b9684a84d83d88e0d
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sat Nov 5 23:42:36 2022 +0700
SWEEP: Changed all protected internal constructors of abstract classes to protected. (fixes #677)
---
src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs | 2 +-
src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs | 2 +-
src/Lucene.Net/Analysis/AnalyzerWrapper.cs | 6 +++---
src/Lucene.Net/Analysis/TokenFilter.cs | 4 ++--
src/Lucene.Net/Analysis/Tokenizer.cs | 4 ++--
src/Lucene.Net/Codecs/Compressing/CompressionMode.cs | 4 ++--
src/Lucene.Net/Codecs/Compressing/Compressor.cs | 4 ++--
src/Lucene.Net/Codecs/Compressing/Decompressor.cs | 2 +-
src/Lucene.Net/Codecs/DocValuesConsumer.cs | 4 ++--
src/Lucene.Net/Codecs/DocValuesProducer.cs | 4 ++--
src/Lucene.Net/Codecs/FieldInfosFormat.cs | 4 ++--
src/Lucene.Net/Codecs/FieldInfosReader.cs | 4 ++--
src/Lucene.Net/Codecs/FieldInfosWriter.cs | 4 ++--
src/Lucene.Net/Codecs/FieldsConsumer.cs | 4 ++--
src/Lucene.Net/Codecs/FieldsProducer.cs | 4 ++--
src/Lucene.Net/Codecs/FilterCodec.cs | 4 ++--
src/Lucene.Net/Codecs/LiveDocsFormat.cs | 4 ++--
src/Lucene.Net/Codecs/NormsFormat.cs | 4 ++--
src/Lucene.Net/Codecs/PostingsBaseFormat.cs | 4 ++--
src/Lucene.Net/Codecs/PostingsConsumer.cs | 4 ++--
src/Lucene.Net/Codecs/PostingsReaderBase.cs | 4 ++--
src/Lucene.Net/Codecs/PostingsWriterBase.cs | 4 ++--
src/Lucene.Net/Codecs/SegmentInfoFormat.cs | 4 ++--
src/Lucene.Net/Codecs/SegmentInfoReader.cs | 4 ++--
src/Lucene.Net/Codecs/SegmentInfoWriter.cs | 4 ++--
src/Lucene.Net/Codecs/StoredFieldsFormat.cs | 4 ++--
src/Lucene.Net/Codecs/StoredFieldsReader.cs | 2 +-
src/Lucene.Net/Codecs/StoredFieldsWriter.cs | 4 ++--
src/Lucene.Net/Codecs/TermVectorsFormat.cs | 4 ++--
src/Lucene.Net/Codecs/TermVectorsReader.cs | 2 +-
src/Lucene.Net/Codecs/TermVectorsWriter.cs | 2 +-
src/Lucene.Net/Codecs/TermsConsumer.cs | 2 +-
src/Lucene.Net/Index/CompositeReader.cs | 4 ++--
src/Lucene.Net/Store/BaseDirectory.cs | 2 +-
src/Lucene.Net/Store/FSDirectory.cs | 2 +-
35 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs
index 858626023..495169751 100644
--- a/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs
+++ b/src/Lucene.Net.Codecs/IntBlock/VariableIntBlockIndexInput.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Codecs.IntBlock
private readonly IndexInput input;
protected readonly int m_maxBlockSize;
- protected internal VariableInt32BlockIndexInput(IndexInput input)
+ protected VariableInt32BlockIndexInput(IndexInput input)
{
this.input = input;
m_maxBlockSize = input.ReadInt32();
diff --git a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs
index 6eb62ecef..12ec5aaa0 100644
--- a/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs
+++ b/src/Lucene.Net.Facet/Taxonomy/TaxonomyFacets.cs
@@ -76,7 +76,7 @@ namespace Lucene.Net.Facet.Taxonomy
/// <summary>
/// Sole constructor.
/// </summary>
- protected internal TaxonomyFacets(string indexFieldName, TaxonomyReader taxoReader, FacetsConfig config)
+ protected TaxonomyFacets(string indexFieldName, TaxonomyReader taxoReader, FacetsConfig config)
{
this.m_indexFieldName = indexFieldName;
this.m_taxoReader = taxoReader;
diff --git a/src/Lucene.Net/Analysis/AnalyzerWrapper.cs b/src/Lucene.Net/Analysis/AnalyzerWrapper.cs
index 5b41ed297..881785ed5 100644
--- a/src/Lucene.Net/Analysis/AnalyzerWrapper.cs
+++ b/src/Lucene.Net/Analysis/AnalyzerWrapper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.IO;
namespace Lucene.Net.Analysis
@@ -38,7 +38,7 @@ namespace Lucene.Net.Analysis
/// the wrapped <see cref="Analyzer"/>s are unknown, <see cref="Analyzer.PER_FIELD_REUSE_STRATEGY"/> is assumed.
/// </summary>
[Obsolete("Use AnalyzerWrapper(Analyzer.ReuseStrategy) and specify a valid Analyzer.ReuseStrategy, probably retrieved from the wrapped analyzer using Analyzer.Strategy.")]
- protected internal AnalyzerWrapper()
+ protected AnalyzerWrapper()
: this(PER_FIELD_REUSE_STRATEGY)
{
}
@@ -52,7 +52,7 @@ namespace Lucene.Net.Analysis
/// <see cref="Analyzer.PER_FIELD_REUSE_STRATEGY"/>.
/// </summary>
/// <seealso cref="Analyzer.Strategy"/>
- protected internal AnalyzerWrapper(ReuseStrategy reuseStrategy)
+ protected AnalyzerWrapper(ReuseStrategy reuseStrategy)
: base(reuseStrategy)
{
}
diff --git a/src/Lucene.Net/Analysis/TokenFilter.cs b/src/Lucene.Net/Analysis/TokenFilter.cs
index 2b2d6c6f9..400a6ddf8 100644
--- a/src/Lucene.Net/Analysis/TokenFilter.cs
+++ b/src/Lucene.Net/Analysis/TokenFilter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.IO;
namespace Lucene.Net.Analysis
@@ -34,7 +34,7 @@ namespace Lucene.Net.Analysis
/// <summary>
/// Construct a token stream filtering the given input. </summary>
- protected internal TokenFilter(TokenStream input)
+ protected TokenFilter(TokenStream input)
: base(input)
{
this.m_input = input;
diff --git a/src/Lucene.Net/Analysis/Tokenizer.cs b/src/Lucene.Net/Analysis/Tokenizer.cs
index cd735b769..fc49d4871 100644
--- a/src/Lucene.Net/Analysis/Tokenizer.cs
+++ b/src/Lucene.Net/Analysis/Tokenizer.cs
@@ -42,7 +42,7 @@ namespace Lucene.Net.Analysis
/// <summary>
/// Construct a token stream processing the given input. </summary>
- protected internal Tokenizer(TextReader input)
+ protected Tokenizer(TextReader input)
{
this.inputPending = input ?? throw new ArgumentNullException(nameof(input), "input must not be null"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentNullException (.NET convention)
}
@@ -50,7 +50,7 @@ namespace Lucene.Net.Analysis
/// <summary>
/// Construct a token stream processing the given input using the given <see cref="Util.AttributeSource.AttributeFactory"/>.
/// </summary>
- protected internal Tokenizer(AttributeFactory factory, TextReader input)
+ protected Tokenizer(AttributeFactory factory, TextReader input)
: base(factory)
{
this.inputPending = input ?? throw new ArgumentNullException(nameof(input), "input must not be null"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentNullException (.NET convention)
diff --git a/src/Lucene.Net/Codecs/Compressing/CompressionMode.cs b/src/Lucene.Net/Codecs/Compressing/CompressionMode.cs
index a92d7dc7a..eef4fb2c7 100644
--- a/src/Lucene.Net/Codecs/Compressing/CompressionMode.cs
+++ b/src/Lucene.Net/Codecs/Compressing/CompressionMode.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Diagnostics;
+using Lucene.Net.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Runtime.CompilerServices;
@@ -125,7 +125,7 @@ namespace Lucene.Net.Codecs.Compressing
/// <summary>
/// Sole constructor. </summary>
- protected internal CompressionMode()
+ protected CompressionMode()
{
}
diff --git a/src/Lucene.Net/Codecs/Compressing/Compressor.cs b/src/Lucene.Net/Codecs/Compressing/Compressor.cs
index 0f0e5230e..dc08a0af0 100644
--- a/src/Lucene.Net/Codecs/Compressing/Compressor.cs
+++ b/src/Lucene.Net/Codecs/Compressing/Compressor.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Codecs.Compressing
+namespace Lucene.Net.Codecs.Compressing
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,7 +26,7 @@ namespace Lucene.Net.Codecs.Compressing
{
/// <summary>
/// Sole constructor, typically called from sub-classes. </summary>
- protected internal Compressor()
+ protected Compressor()
{
}
diff --git a/src/Lucene.Net/Codecs/Compressing/Decompressor.cs b/src/Lucene.Net/Codecs/Compressing/Decompressor.cs
index a0e0d2e11..dd2bd3683 100644
--- a/src/Lucene.Net/Codecs/Compressing/Decompressor.cs
+++ b/src/Lucene.Net/Codecs/Compressing/Decompressor.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Codecs.Compressing
{
/// <summary>
/// Sole constructor, typically called from sub-classes. </summary>
- protected internal Decompressor()
+ protected Decompressor()
{
}
diff --git a/src/Lucene.Net/Codecs/DocValuesConsumer.cs b/src/Lucene.Net/Codecs/DocValuesConsumer.cs
index 8f055b0e9..e3f8ba742 100644
--- a/src/Lucene.Net/Codecs/DocValuesConsumer.cs
+++ b/src/Lucene.Net/Codecs/DocValuesConsumer.cs
@@ -1,4 +1,4 @@
-using J2N.Collections.Generic.Extensions;
+using J2N.Collections.Generic.Extensions;
using Lucene.Net.Diagnostics;
using System;
using System.Collections.Generic;
@@ -66,7 +66,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal DocValuesConsumer()
+ protected DocValuesConsumer()
{
}
diff --git a/src/Lucene.Net/Codecs/DocValuesProducer.cs b/src/Lucene.Net/Codecs/DocValuesProducer.cs
index f4da0f855..273bd0d66 100644
--- a/src/Lucene.Net/Codecs/DocValuesProducer.cs
+++ b/src/Lucene.Net/Codecs/DocValuesProducer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
namespace Lucene.Net.Codecs
{
@@ -38,7 +38,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal DocValuesProducer()
+ protected DocValuesProducer()
{
}
diff --git a/src/Lucene.Net/Codecs/FieldInfosFormat.cs b/src/Lucene.Net/Codecs/FieldInfosFormat.cs
index 30215f282..eebff52a2 100644
--- a/src/Lucene.Net/Codecs/FieldInfosFormat.cs
+++ b/src/Lucene.Net/Codecs/FieldInfosFormat.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Codecs
+namespace Lucene.Net.Codecs
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,7 +30,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal FieldInfosFormat()
+ protected FieldInfosFormat()
{
}
diff --git a/src/Lucene.Net/Codecs/FieldInfosReader.cs b/src/Lucene.Net/Codecs/FieldInfosReader.cs
index 8014e3399..2c7af4fb8 100644
--- a/src/Lucene.Net/Codecs/FieldInfosReader.cs
+++ b/src/Lucene.Net/Codecs/FieldInfosReader.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Codecs
+namespace Lucene.Net.Codecs
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,7 +32,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal FieldInfosReader()
+ protected FieldInfosReader()
{
}
diff --git a/src/Lucene.Net/Codecs/FieldInfosWriter.cs b/src/Lucene.Net/Codecs/FieldInfosWriter.cs
index 92bfe0760..c1210a12e 100644
--- a/src/Lucene.Net/Codecs/FieldInfosWriter.cs
+++ b/src/Lucene.Net/Codecs/FieldInfosWriter.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Codecs
+namespace Lucene.Net.Codecs
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,7 +32,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal FieldInfosWriter()
+ protected FieldInfosWriter()
{
}
diff --git a/src/Lucene.Net/Codecs/FieldsConsumer.cs b/src/Lucene.Net/Codecs/FieldsConsumer.cs
index 9afa1d759..9ca4f1870 100644
--- a/src/Lucene.Net/Codecs/FieldsConsumer.cs
+++ b/src/Lucene.Net/Codecs/FieldsConsumer.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Diagnostics;
+using Lucene.Net.Diagnostics;
using System;
using System.Diagnostics;
using System.Runtime.CompilerServices;
@@ -52,7 +52,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal FieldsConsumer()
+ protected FieldsConsumer()
{
}
diff --git a/src/Lucene.Net/Codecs/FieldsProducer.cs b/src/Lucene.Net/Codecs/FieldsProducer.cs
index 5b9067b68..cd3c9910e 100644
--- a/src/Lucene.Net/Codecs/FieldsProducer.cs
+++ b/src/Lucene.Net/Codecs/FieldsProducer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
namespace Lucene.Net.Codecs
{
@@ -33,7 +33,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal FieldsProducer()
+ protected FieldsProducer()
{
}
diff --git a/src/Lucene.Net/Codecs/FilterCodec.cs b/src/Lucene.Net/Codecs/FilterCodec.cs
index 95c8d8b61..5c4a91f14 100644
--- a/src/Lucene.Net/Codecs/FilterCodec.cs
+++ b/src/Lucene.Net/Codecs/FilterCodec.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Codecs
+namespace Lucene.Net.Codecs
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,7 +58,7 @@ namespace Lucene.Net.Codecs
/// create a no-arg ctor and pass the delegate codec
/// and a unique name to this ctor.
/// </summary>
- protected internal FilterCodec(Codec @delegate)
+ protected FilterCodec(Codec @delegate)
: base()
{
this.m_delegate = @delegate;
diff --git a/src/Lucene.Net/Codecs/LiveDocsFormat.cs b/src/Lucene.Net/Codecs/LiveDocsFormat.cs
index 1a78fdd80..877ef2557 100644
--- a/src/Lucene.Net/Codecs/LiveDocsFormat.cs
+++ b/src/Lucene.Net/Codecs/LiveDocsFormat.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Runtime.CompilerServices;
namespace Lucene.Net.Codecs
@@ -37,7 +37,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal LiveDocsFormat()
+ protected LiveDocsFormat()
{
}
diff --git a/src/Lucene.Net/Codecs/NormsFormat.cs b/src/Lucene.Net/Codecs/NormsFormat.cs
index 8ab85d95d..ec5507588 100644
--- a/src/Lucene.Net/Codecs/NormsFormat.cs
+++ b/src/Lucene.Net/Codecs/NormsFormat.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
namespace Lucene.Net.Codecs
{
@@ -31,7 +31,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal NormsFormat()
+ protected NormsFormat()
{
}
diff --git a/src/Lucene.Net/Codecs/PostingsBaseFormat.cs b/src/Lucene.Net/Codecs/PostingsBaseFormat.cs
index a783fa5f9..8eb86979a 100644
--- a/src/Lucene.Net/Codecs/PostingsBaseFormat.cs
+++ b/src/Lucene.Net/Codecs/PostingsBaseFormat.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Codecs
+namespace Lucene.Net.Codecs
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,7 +43,7 @@ namespace Lucene.Net.Codecs
/// <summary>
/// Sole constructor. </summary>
- protected internal PostingsBaseFormat(string name)
+ protected PostingsBaseFormat(string name)
{
this.Name = name;
}
diff --git a/src/Lucene.Net/Codecs/PostingsConsumer.cs b/src/Lucene.Net/Codecs/PostingsConsumer.cs
index 9e11d1ecc..d4d6d5ef7 100644
--- a/src/Lucene.Net/Codecs/PostingsConsumer.cs
+++ b/src/Lucene.Net/Codecs/PostingsConsumer.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Diagnostics;
+using Lucene.Net.Diagnostics;
using Lucene.Net.Index;
using System.Diagnostics;
using System.Runtime.CompilerServices;
@@ -55,7 +55,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal PostingsConsumer()
+ protected PostingsConsumer()
{
}
diff --git a/src/Lucene.Net/Codecs/PostingsReaderBase.cs b/src/Lucene.Net/Codecs/PostingsReaderBase.cs
index 38cdb488b..c21bc2b41 100644
--- a/src/Lucene.Net/Codecs/PostingsReaderBase.cs
+++ b/src/Lucene.Net/Codecs/PostingsReaderBase.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Index;
+using Lucene.Net.Index;
using System;
namespace Lucene.Net.Codecs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal PostingsReaderBase()
+ protected PostingsReaderBase()
{
}
diff --git a/src/Lucene.Net/Codecs/PostingsWriterBase.cs b/src/Lucene.Net/Codecs/PostingsWriterBase.cs
index 55b1e3324..5e5607b76 100644
--- a/src/Lucene.Net/Codecs/PostingsWriterBase.cs
+++ b/src/Lucene.Net/Codecs/PostingsWriterBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
namespace Lucene.Net.Codecs
{
@@ -44,7 +44,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal PostingsWriterBase()
+ protected PostingsWriterBase()
{
}
diff --git a/src/Lucene.Net/Codecs/SegmentInfoFormat.cs b/src/Lucene.Net/Codecs/SegmentInfoFormat.cs
index 7e1b7854a..2795f8cf7 100644
--- a/src/Lucene.Net/Codecs/SegmentInfoFormat.cs
+++ b/src/Lucene.Net/Codecs/SegmentInfoFormat.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Codecs
+namespace Lucene.Net.Codecs
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,7 +32,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal SegmentInfoFormat()
+ protected SegmentInfoFormat()
{
}
diff --git a/src/Lucene.Net/Codecs/SegmentInfoReader.cs b/src/Lucene.Net/Codecs/SegmentInfoReader.cs
index 17b45d106..335e42bed 100644
--- a/src/Lucene.Net/Codecs/SegmentInfoReader.cs
+++ b/src/Lucene.Net/Codecs/SegmentInfoReader.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
namespace Lucene.Net.Codecs
{
@@ -34,7 +34,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal SegmentInfoReader()
+ protected SegmentInfoReader()
{
}
diff --git a/src/Lucene.Net/Codecs/SegmentInfoWriter.cs b/src/Lucene.Net/Codecs/SegmentInfoWriter.cs
index f1d86d26b..56fa93736 100644
--- a/src/Lucene.Net/Codecs/SegmentInfoWriter.cs
+++ b/src/Lucene.Net/Codecs/SegmentInfoWriter.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
namespace Lucene.Net.Codecs
{
@@ -35,7 +35,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal SegmentInfoWriter()
+ protected SegmentInfoWriter()
{
}
diff --git a/src/Lucene.Net/Codecs/StoredFieldsFormat.cs b/src/Lucene.Net/Codecs/StoredFieldsFormat.cs
index 1e65f63f4..da770b9cd 100644
--- a/src/Lucene.Net/Codecs/StoredFieldsFormat.cs
+++ b/src/Lucene.Net/Codecs/StoredFieldsFormat.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Codecs
+namespace Lucene.Net.Codecs
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal StoredFieldsFormat()
+ protected StoredFieldsFormat()
{
}
diff --git a/src/Lucene.Net/Codecs/StoredFieldsReader.cs b/src/Lucene.Net/Codecs/StoredFieldsReader.cs
index 4e3dce332..d32df6721 100644
--- a/src/Lucene.Net/Codecs/StoredFieldsReader.cs
+++ b/src/Lucene.Net/Codecs/StoredFieldsReader.cs
@@ -37,7 +37,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal StoredFieldsReader()
+ protected StoredFieldsReader()
{
}
diff --git a/src/Lucene.Net/Codecs/StoredFieldsWriter.cs b/src/Lucene.Net/Codecs/StoredFieldsWriter.cs
index bc5b84750..9a214fc86 100644
--- a/src/Lucene.Net/Codecs/StoredFieldsWriter.cs
+++ b/src/Lucene.Net/Codecs/StoredFieldsWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
@@ -50,7 +50,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal StoredFieldsWriter()
+ protected StoredFieldsWriter()
{
}
diff --git a/src/Lucene.Net/Codecs/TermVectorsFormat.cs b/src/Lucene.Net/Codecs/TermVectorsFormat.cs
index 025c2ba06..fb515af02 100644
--- a/src/Lucene.Net/Codecs/TermVectorsFormat.cs
+++ b/src/Lucene.Net/Codecs/TermVectorsFormat.cs
@@ -1,4 +1,4 @@
-namespace Lucene.Net.Codecs
+namespace Lucene.Net.Codecs
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,7 +31,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal TermVectorsFormat()
+ protected TermVectorsFormat()
{
}
diff --git a/src/Lucene.Net/Codecs/TermVectorsReader.cs b/src/Lucene.Net/Codecs/TermVectorsReader.cs
index b4cf924d9..3a16f052f 100644
--- a/src/Lucene.Net/Codecs/TermVectorsReader.cs
+++ b/src/Lucene.Net/Codecs/TermVectorsReader.cs
@@ -34,7 +34,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal TermVectorsReader()
+ protected TermVectorsReader()
{
}
diff --git a/src/Lucene.Net/Codecs/TermVectorsWriter.cs b/src/Lucene.Net/Codecs/TermVectorsWriter.cs
index bad39b4dc..bca990c15 100644
--- a/src/Lucene.Net/Codecs/TermVectorsWriter.cs
+++ b/src/Lucene.Net/Codecs/TermVectorsWriter.cs
@@ -66,7 +66,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal TermVectorsWriter()
+ protected TermVectorsWriter()
{
}
diff --git a/src/Lucene.Net/Codecs/TermsConsumer.cs b/src/Lucene.Net/Codecs/TermsConsumer.cs
index 7a404e753..8d3791d1d 100644
--- a/src/Lucene.Net/Codecs/TermsConsumer.cs
+++ b/src/Lucene.Net/Codecs/TermsConsumer.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Codecs
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal TermsConsumer()
+ protected TermsConsumer()
{
}
diff --git a/src/Lucene.Net/Index/CompositeReader.cs b/src/Lucene.Net/Index/CompositeReader.cs
index b8282935c..a43107686 100644
--- a/src/Lucene.Net/Index/CompositeReader.cs
+++ b/src/Lucene.Net/Index/CompositeReader.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Diagnostics;
+using Lucene.Net.Diagnostics;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -64,7 +64,7 @@ namespace Lucene.Net.Index
/// Sole constructor. (For invocation by subclass
/// constructors, typically implicit.)
/// </summary>
- protected internal CompositeReader()
+ protected CompositeReader()
: base()
{
}
diff --git a/src/Lucene.Net/Store/BaseDirectory.cs b/src/Lucene.Net/Store/BaseDirectory.cs
index d1fc1d497..94974784d 100644
--- a/src/Lucene.Net/Store/BaseDirectory.cs
+++ b/src/Lucene.Net/Store/BaseDirectory.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Store
/// <summary>
/// Sole constructor. </summary>
- protected internal BaseDirectory()
+ protected BaseDirectory()
: base()
{
}
diff --git a/src/Lucene.Net/Store/FSDirectory.cs b/src/Lucene.Net/Store/FSDirectory.cs
index c7ba41ccc..6471023c9 100644
--- a/src/Lucene.Net/Store/FSDirectory.cs
+++ b/src/Lucene.Net/Store/FSDirectory.cs
@@ -113,7 +113,7 @@ namespace Lucene.Net.Store
/// <param name="lockFactory"> the lock factory to use, or null for the default
/// (<seealso cref="NativeFSLockFactory"/>); </param>
/// <exception cref="IOException"> if there is a low-level I/O error </exception>
- protected internal FSDirectory(DirectoryInfo path, LockFactory lockFactory)
+ protected FSDirectory(DirectoryInfo path, LockFactory lockFactory)
{
// new ctors use always NativeFSLockFactory as default:
if (lockFactory is null)
[lucenenet] 01/04: BREAKING: Lucene.Net.Search.FieldCacheRangeFilter: Changed accessibility from protected internal to private protected. This class was not intended to be subclassed by users. (see #677)
Posted by ni...@apache.org.
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 58ca43bf83afb33680946de4ea0783eccab59680
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sat Nov 5 23:14:27 2022 +0700
BREAKING: Lucene.Net.Search.FieldCacheRangeFilter<T>: Changed accessibility from protected internal to private protected. This class was not intended to be subclassed by users. (see #677)
---
src/Lucene.Net/Search/FieldCacheRangeFilter.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Lucene.Net/Search/FieldCacheRangeFilter.cs b/src/Lucene.Net/Search/FieldCacheRangeFilter.cs
index 40887fdd4..f1f451782 100644
--- a/src/Lucene.Net/Search/FieldCacheRangeFilter.cs
+++ b/src/Lucene.Net/Search/FieldCacheRangeFilter.cs
@@ -714,7 +714,7 @@ namespace Lucene.Net.Search
internal readonly bool includeLower;
internal readonly bool includeUpper;
- protected internal FieldCacheRangeFilter(string field, FieldCache.IParser parser, T lowerVal, T upperVal, bool includeLower, bool includeUpper)
+ private protected FieldCacheRangeFilter(string field, FieldCache.IParser parser, T lowerVal, T upperVal, bool includeLower, bool includeUpper)
{
this.field = field;
this.parser = parser;