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 528446946fc2648216a45ab876a19085d4d2f01a Author: Shad Storhaug <[email protected]> AuthorDate: Thu Aug 27 16:27:50 2020 +0700 Marked all overloads of TermsEnum.Next(), BytesRefFSTEnum.Next(), and BytesRefArray.GetIterator() methods and IBytesRefIterator, BytesRefIterator types obsolete and hid them from intellisense (see #279, #212) --- src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs | 3 +-- src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs | 3 ++- src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs | 4 ++-- src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs | 4 ++-- src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 4 ++-- src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs | 1 + src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs | 2 +- src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs | 2 +- src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs | 2 +- src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs | 2 +- src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs | 2 +- src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs | 2 +- src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs | 2 +- src/Lucene.Net/Codecs/BlockTreeTermsReader.cs | 4 ++-- src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs | 2 +- src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs | 2 +- src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs | 2 +- src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs | 2 +- src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs | 2 +- src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs | 2 +- src/Lucene.Net/Index/DocTermOrds.cs | 2 +- src/Lucene.Net/Index/FilterAtomicReader.cs | 3 ++- src/Lucene.Net/Index/FilteredTermsEnum.cs | 2 +- src/Lucene.Net/Index/MultiTermsEnum.cs | 2 +- src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs | 2 +- src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs | 2 +- src/Lucene.Net/Index/TermsEnum.cs | 2 ++ src/Lucene.Net/Search/FuzzyTermsEnum.cs | 2 +- src/Lucene.Net/Util/BytesRefArray.cs | 3 +++ src/Lucene.Net/Util/BytesRefIterator.cs | 3 +++ src/Lucene.Net/Util/Fst/BytesRefFSTEnum.cs | 3 ++- 31 files changed, 43 insertions(+), 32 deletions(-) diff --git a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs index e2758e6..abffd20 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsReader.cs @@ -5,7 +5,6 @@ using Lucene.Net.Support; using Lucene.Net.Util; using System; using System.Collections.Generic; -using System.Diagnostics; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Codecs.BlockTerms @@ -654,7 +653,6 @@ namespace Lucene.Net.Codecs.BlockTerms } } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { //System.out.println("BTR.next() seekPending=" + seekPending + " pendingSeekCount=" + state.termBlockOrd); @@ -712,6 +710,7 @@ namespace Lucene.Net.Codecs.BlockTerms return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs index 2124ce8..6b04cf9 100644 --- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs @@ -291,11 +291,12 @@ namespace Lucene.Net.Codecs.Bloom // (clone IndexInput) delegateTermsEnum ?? (delegateTermsEnum = _delegateTerms.GetIterator(_reuseDelegate)); - public override bool MoveNext() // LUCENENET specific - shortcut for better enumerator optimization + public override bool MoveNext() { return Delegate.MoveNext(); } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override sealed BytesRef Next() { return Delegate.Next(); diff --git a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs index fa41e68..a0051d2 100644 --- a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs @@ -864,7 +864,6 @@ namespace Lucene.Net.Codecs.Memory public override IComparer<BytesRef> Comparer => BytesRef.UTF8SortedAsUnicodeComparer; - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { termOrd++; @@ -879,6 +878,7 @@ namespace Lucene.Net.Codecs.Memory } } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) @@ -1386,7 +1386,6 @@ namespace Lucene.Net.Codecs.Memory } } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { // if (DEBUG) { @@ -1681,6 +1680,7 @@ namespace Lucene.Net.Codecs.Memory //nextTermBreak: ; // LUCENENET NOTE: Not used } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs index 770ba1f..15d0229 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs @@ -491,7 +491,6 @@ namespace Lucene.Net.Codecs.Memory seekPending = false; } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (seekPending) // previously positioned, but termOutputs not fetched @@ -518,6 +517,7 @@ namespace Lucene.Net.Codecs.Memory return moved; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) @@ -660,7 +660,6 @@ namespace Lucene.Net.Codecs.Memory throw new NotSupportedException(); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { //if (TEST) System.out.println("Enum next()"); @@ -705,6 +704,7 @@ namespace Lucene.Net.Codecs.Memory return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs index 30ea1bc..f312524 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs @@ -363,7 +363,6 @@ namespace Lucene.Net.Codecs.Memory seekPending = false; } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (seekPending) // previously positioned, but termOutputs not fetched @@ -391,6 +390,7 @@ namespace Lucene.Net.Codecs.Memory return moved; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) @@ -576,7 +576,6 @@ namespace Lucene.Net.Codecs.Memory } } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { //if (TEST) System.out.println("Enum next()"); @@ -621,6 +620,7 @@ namespace Lucene.Net.Codecs.Memory return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs index 8d1834d..905193a 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs @@ -769,6 +769,7 @@ namespace Lucene.Net.Codecs.Memory return input.MoveNext(); } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { return !MoveNext() ? null : input.Current.Input; diff --git a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs index a7ff34a..c567ba2 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs @@ -850,7 +850,6 @@ namespace Lucene.Net.Codecs.Memory public override BytesRef Term => current.Input; - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { //System.out.println("te.next"); @@ -866,6 +865,7 @@ namespace Lucene.Net.Codecs.Memory return false; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs index 346bdea..c197749 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs @@ -157,7 +157,6 @@ namespace Lucene.Net.Codecs.SimpleText } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { //if (Debugging.AssertsEnabled) Debugging.Assert(!ended); // LUCENENET: Ended field is never set, so this can never fail @@ -171,6 +170,7 @@ namespace Lucene.Net.Codecs.SimpleText return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs index 05d5c0a..e4684cc 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs @@ -387,7 +387,6 @@ namespace Lucene.Net.Codecs.SimpleText throw new NotSupportedException(); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (_iterator.MoveNext()) @@ -401,6 +400,7 @@ namespace Lucene.Net.Codecs.SimpleText } } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs index 2102858..942fd5a 100644 --- a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs +++ b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs @@ -289,7 +289,6 @@ namespace Lucene.Net.Index.Memory termUpto = (int)ord; } - // LUCENEENT specific - duplicate logic for better enumerator optimization public override bool MoveNext() { termUpto++; @@ -304,6 +303,7 @@ namespace Lucene.Net.Index.Memory } } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs index 7b78fec..9d86548 100644 --- a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs +++ b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs @@ -359,7 +359,6 @@ namespace Lucene.Net.Codecs.RAMOnly public override IComparer<BytesRef> Comparer => BytesRef.UTF8SortedAsUnicodeComparer; - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { EnsureEnumeratorInitialized(); @@ -374,6 +373,7 @@ namespace Lucene.Net.Codecs.RAMOnly } } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs b/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs index 7b75bcd..51612e5 100644 --- a/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs +++ b/src/Lucene.Net.TestFramework/Index/AssertingAtomicReader.cs @@ -435,7 +435,6 @@ namespace Lucene.Net.Index return docs == null ? null : new AssertingDocsAndPositionsEnum(docs); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (Debugging.AssertsEnabled) Debugging.Assert(state == State.INITIAL || state == State.POSITIONED, "MoveNext() called on unpositioned TermsEnum"); @@ -454,6 +453,7 @@ namespace Lucene.Net.Index // TODO: we should separately track if we are 'at the end' ? // someone should not call next() after it returns null!!!! + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (Debugging.AssertsEnabled) Debugging.Assert(state == State.INITIAL || state == State.POSITIONED, "Next() called on unpositioned TermsEnum"); diff --git a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs index e3f37a2..baa1ef0 100644 --- a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs +++ b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs @@ -76,7 +76,6 @@ namespace Lucene.Net.Index /// <summary> /// Scan for terms containing the letter 'e'. </summary> - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { while (m_input.MoveNext()) @@ -89,6 +88,7 @@ namespace Lucene.Net.Index /// <summary> /// Scan for terms containing the letter 'e'. </summary> + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs b/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs index f47fa68..511d958 100644 --- a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs +++ b/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs @@ -1270,7 +1270,6 @@ namespace Lucene.Net.Codecs if (Debugging.AssertsEnabled) Debugging.Assert(false); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { // if (DEBUG) { @@ -1443,6 +1442,7 @@ namespace Lucene.Net.Codecs //nextTermBreak:; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) @@ -2429,7 +2429,6 @@ namespace Lucene.Net.Codecs /* Decodes only the term bytes of the next term. If caller then asks for metadata, ie docFreq, totalTermFreq or pulls a D/&PEnum, we then (lazily) decode all metadata up to the current term. */ - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (@in == null) @@ -2538,6 +2537,7 @@ namespace Lucene.Net.Codecs /* Decodes only the term bytes of the next term. If caller then asks for metadata, ie docFreq, totalTermFreq or pulls a D/&PEnum, we then (lazily) decode all metadata up to the current term. */ + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs index 55e638f..b1637b0 100644 --- a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs +++ b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs @@ -835,7 +835,6 @@ namespace Lucene.Net.Codecs.Compressing ord = -1; } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (ord == numTerms - 1) @@ -860,6 +859,7 @@ namespace Lucene.Net.Codecs.Compressing return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs index 313bf61..62b3fa1 100644 --- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs +++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs @@ -959,7 +959,6 @@ namespace Lucene.Net.Codecs.Lucene3x } } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (DEBUG_SURROGATES) @@ -1041,6 +1040,7 @@ namespace Lucene.Net.Codecs.Lucene3x } } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs index b946629..13af044 100644 --- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs +++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xTermVectorsReader.cs @@ -546,7 +546,6 @@ namespace Lucene.Net.Codecs.Lucene3x throw new NotSupportedException(); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (++currentTerm >= numTerms) @@ -556,6 +555,7 @@ namespace Lucene.Net.Codecs.Lucene3x return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs b/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs index 69afcb5..f787f84 100644 --- a/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs +++ b/src/Lucene.Net/Codecs/Lucene40/Lucene40TermVectorsReader.cs @@ -486,7 +486,6 @@ namespace Lucene.Net.Codecs.Lucene40 throw new NotSupportedException(); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (nextTerm >= numTerms) @@ -555,6 +554,7 @@ namespace Lucene.Net.Codecs.Lucene40 return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs b/src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs index fdb0f6b..401458d 100644 --- a/src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs +++ b/src/Lucene.Net/Codecs/Lucene42/Lucene42DocValuesProducer.cs @@ -722,9 +722,9 @@ namespace Lucene.Net.Codecs.Lucene42 bytesReader = fst.GetBytesReader(); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() => @in.MoveNext(); + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs index 787efa8..65ac00d 100644 --- a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs +++ b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs @@ -1092,7 +1092,6 @@ namespace Lucene.Net.Codecs.Lucene45 private readonly BytesRef term; - // LUCENENET specific - duplicate logic for better enumerator optimization // LUCENENET specific - factored out DoNext() and made into MoveNext() public override bool MoveNext() { @@ -1111,6 +1110,7 @@ namespace Lucene.Net.Codecs.Lucene45 } } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Index/DocTermOrds.cs b/src/Lucene.Net/Index/DocTermOrds.cs index 54c7352..c399199 100644 --- a/src/Lucene.Net/Index/DocTermOrds.cs +++ b/src/Lucene.Net/Index/DocTermOrds.cs @@ -770,7 +770,6 @@ namespace Lucene.Net.Index public override BytesRef Term => term; - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (++ord < 0) @@ -786,6 +785,7 @@ namespace Lucene.Net.Index return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Index/FilterAtomicReader.cs b/src/Lucene.Net/Index/FilterAtomicReader.cs index 0d183a5..9dafb1a 100644 --- a/src/Lucene.Net/Index/FilterAtomicReader.cs +++ b/src/Lucene.Net/Index/FilterAtomicReader.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Text; @@ -161,12 +162,12 @@ namespace Lucene.Net.Index m_input.SeekExact(ord); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { return m_input.MoveNext(); } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Index/FilteredTermsEnum.cs b/src/Lucene.Net/Index/FilteredTermsEnum.cs index 4e8a584..b968b90 100644 --- a/src/Lucene.Net/Index/FilteredTermsEnum.cs +++ b/src/Lucene.Net/Index/FilteredTermsEnum.cs @@ -211,7 +211,6 @@ namespace Lucene.Net.Index return tenum.GetTermState(); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { //System.out.println("FTE.next doSeek=" + doSeek); @@ -272,6 +271,7 @@ namespace Lucene.Net.Index } } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Index/MultiTermsEnum.cs b/src/Lucene.Net/Index/MultiTermsEnum.cs index 4f7db8f..5dbb895 100644 --- a/src/Lucene.Net/Index/MultiTermsEnum.cs +++ b/src/Lucene.Net/Index/MultiTermsEnum.cs @@ -356,7 +356,6 @@ namespace Lucene.Net.Index numTop = 0; } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (lastSeekExact) @@ -389,6 +388,7 @@ namespace Lucene.Net.Index } } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs b/src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs index e784a20..157673a 100644 --- a/src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs +++ b/src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs @@ -99,7 +99,6 @@ namespace Lucene.Net.Index values.LookupOrd(currentOrd, term); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { currentOrd++; @@ -111,6 +110,7 @@ namespace Lucene.Net.Index return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs b/src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs index 17580c0..3aec703 100644 --- a/src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs +++ b/src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs @@ -99,7 +99,6 @@ namespace Lucene.Net.Index values.LookupOrd(currentOrd, term); } - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { currentOrd++; @@ -111,6 +110,7 @@ namespace Lucene.Net.Index return true; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Index/TermsEnum.cs b/src/Lucene.Net/Index/TermsEnum.cs index 1b7f76d..5d6776a 100644 --- a/src/Lucene.Net/Index/TermsEnum.cs +++ b/src/Lucene.Net/Index/TermsEnum.cs @@ -49,6 +49,7 @@ namespace Lucene.Net.Index public abstract IComparer<BytesRef> Comparer { get; } // LUCENENET specific - must supply implementation for the interface /// <inheritdoc/> + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public abstract BytesRef Next(); // LUCENENET specific - must supply implementation for the interface /// <inheritdoc/> @@ -326,6 +327,7 @@ namespace Lucene.Net.Index return false; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { return null; diff --git a/src/Lucene.Net/Search/FuzzyTermsEnum.cs b/src/Lucene.Net/Search/FuzzyTermsEnum.cs index 96fd368..2125243 100644 --- a/src/Lucene.Net/Search/FuzzyTermsEnum.cs +++ b/src/Lucene.Net/Search/FuzzyTermsEnum.cs @@ -273,7 +273,6 @@ namespace Lucene.Net.Search private BytesRef queuedBottom = null; - // LUCENENET specific - duplicate logic for better enumerator optimization public override bool MoveNext() { if (queuedBottom != null) @@ -299,6 +298,7 @@ namespace Lucene.Net.Search return moved; } + [Obsolete("Use MoveNext() and Term instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public override BytesRef Next() { if (MoveNext()) diff --git a/src/Lucene.Net/Util/BytesRefArray.cs b/src/Lucene.Net/Util/BytesRefArray.cs index ae37b3a..3c96604 100644 --- a/src/Lucene.Net/Util/BytesRefArray.cs +++ b/src/Lucene.Net/Util/BytesRefArray.cs @@ -167,6 +167,7 @@ namespace Lucene.Net.Util /// <summary> /// Sugar for <see cref="GetIterator(IComparer{BytesRef})"/> with a <c>null</c> comparer /// </summary> + [Obsolete("Use GetEnumerator() instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public IBytesRefIterator GetIterator() { return GetIterator(null); @@ -186,6 +187,7 @@ namespace Lucene.Net.Util /// This is a non-destructive operation. /// </para> /// </summary> + [Obsolete("Use GetEnumerator(IComparer<BytesRef>) instead. This method will be removed in 4.8.0 release candidate"), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public IBytesRefIterator GetIterator(IComparer<BytesRef> comp) { BytesRef spare = new BytesRef(); @@ -194,6 +196,7 @@ namespace Lucene.Net.Util return new BytesRefIteratorAnonymousInnerClassHelper(this, comp, spare, size, indices); } + [Obsolete("This class will be removed in 4.8.0 release candidate"), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] private class BytesRefIteratorAnonymousInnerClassHelper : IBytesRefIterator { private readonly BytesRefArray outerInstance; diff --git a/src/Lucene.Net/Util/BytesRefIterator.cs b/src/Lucene.Net/Util/BytesRefIterator.cs index 06f4553..0b838f3 100644 --- a/src/Lucene.Net/Util/BytesRefIterator.cs +++ b/src/Lucene.Net/Util/BytesRefIterator.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.IO; @@ -75,6 +76,7 @@ namespace Lucene.Net.Util /// <summary> /// A simple iterator interface for <see cref="BytesRef"/> iteration. /// </summary> + [Obsolete("Use IBytesRefEnumerator instead. This interface will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public interface IBytesRefIterator { /// <summary> @@ -105,6 +107,7 @@ namespace Lucene.Net.Util /// var iter = BytesRefIterator.EMPTY; /// </code> /// </summary> + [Obsolete("Use BytesRefEnumerator instead. This class will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public static class BytesRefIterator { /// <summary> diff --git a/src/Lucene.Net/Util/Fst/BytesRefFSTEnum.cs b/src/Lucene.Net/Util/Fst/BytesRefFSTEnum.cs index 09d0b92..5fdcb13 100644 --- a/src/Lucene.Net/Util/Fst/BytesRefFSTEnum.cs +++ b/src/Lucene.Net/Util/Fst/BytesRefFSTEnum.cs @@ -1,4 +1,5 @@ using Lucene.Net.Diagnostics; +using System; namespace Lucene.Net.Util.Fst { @@ -47,7 +48,6 @@ namespace Lucene.Net.Util.Fst public BytesRefFSTEnum.InputOutput<T> Current => result; - // LUCENENET specific - duplicate logic for better enumerator optimization public bool MoveNext() { //System.out.println(" enum.next"); @@ -65,6 +65,7 @@ namespace Lucene.Net.Util.Fst } } + [Obsolete("Use MoveNext() and Current instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] public BytesRefFSTEnum.InputOutput<T> Next() { //System.out.println(" enum.next");
