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 d606b6c52fe7238dc9adb08ea78e37c72bfeb67f Author: Shad Storhaug <[email protected]> AuthorDate: Wed Jun 3 02:48:57 2020 +0700 Lucene.Net.Queries: Changed to expression style property syntax. Fixed some bugs in the Equals comparison when the value passed is null and simplified the type conversion expression. --- src/Lucene.Net.Queries/BooleanFilter.cs | 5 +-- src/Lucene.Net.Queries/BoostingQuery.cs | 2 +- src/Lucene.Net.Queries/ChainedFilter.cs | 6 +-- src/Lucene.Net.Queries/CommonTermsQuery.cs | 8 ++-- src/Lucene.Net.Queries/CustomScoreQuery.cs | 44 ++++++--------------- src/Lucene.Net.Queries/FilterClause.cs | 19 ++------- src/Lucene.Net.Queries/Function/BoostedQuery.cs | 36 +++-------------- src/Lucene.Net.Queries/Function/FunctionQuery.cs | 26 ++---------- src/Lucene.Net.Queries/Function/ValueSource.cs | 2 +- .../Function/ValueSources/ConstValueSource.cs | 43 +++----------------- .../Function/ValueSources/DefFunction.cs | 5 +-- .../Function/ValueSources/DivFloatFunction.cs | 5 +-- .../Function/ValueSources/DocFreqValueSource.cs | 5 +-- .../ValueSources/DoubleConstValueSource.cs | 43 +++----------------- .../Function/ValueSources/DoubleFieldSource.cs | 4 +- .../Function/ValueSources/DualFloatFunction.cs | 3 +- .../Function/ValueSources/FieldCacheSource.cs | 16 +------- .../Function/ValueSources/FloatFieldSource.cs | 3 +- .../Function/ValueSources/IDFValueSource.cs | 5 +-- .../Function/ValueSources/IfFunction.cs | 3 +- .../Function/ValueSources/IntFieldSource.cs | 3 +- .../ValueSources/JoinDocFreqValueSource.cs | 5 +-- .../Function/ValueSources/LinearFloatFunction.cs | 3 +- .../Function/ValueSources/LiteralValueSource.cs | 11 +----- .../Function/ValueSources/LongFieldSource.cs | 3 +- .../Function/ValueSources/MaxDocValueSource.cs | 5 +-- .../Function/ValueSources/MaxFloatFunction.cs | 5 +-- .../Function/ValueSources/MinFloatFunction.cs | 5 +-- .../Function/ValueSources/MultiBoolFunction.cs | 3 +- .../Function/ValueSources/MultiFloatFunction.cs | 3 +- .../Function/ValueSources/MultiValueSource.cs | 46 +++++++++++----------- .../Function/ValueSources/NormValueSource.cs | 5 +-- .../Function/ValueSources/NumDocsValueSource.cs | 5 +-- .../Function/ValueSources/PowFloatFunction.cs | 5 +-- .../Function/ValueSources/ProductFloatFunction.cs | 5 +-- .../Function/ValueSources/QueryValueSource.cs | 25 +++--------- .../Function/ValueSources/RangeMapFloatFunction.cs | 7 +--- .../ValueSources/ReciprocalFloatFunction.cs | 7 +--- .../Function/ValueSources/ReverseOrdFieldSource.cs | 12 +----- .../Function/ValueSources/ScaleFloatFunction.cs | 3 +- .../Function/ValueSources/ShortFieldSource.cs | 3 +- .../Function/ValueSources/SimpleBoolFunction.cs | 3 +- .../Function/ValueSources/SingleFunction.cs | 3 +- .../Function/ValueSources/SumFloatFunction.cs | 5 +-- .../ValueSources/SumTotalTermFreqValueSource.cs | 8 +--- .../Function/ValueSources/TFValueSource.cs | 20 ++-------- .../Function/ValueSources/TermFreqValueSource.cs | 15 ++----- .../ValueSources/TotalTermFreqValueSource.cs | 10 +---- .../Function/ValueSources/VectorValueSource.cs | 9 +---- src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 10 +---- src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs | 38 +++++++++--------- src/Lucene.Net.Queries/TermFilter.cs | 8 +--- src/Lucene.Net.Queries/TermsFilter.cs | 11 ++---- 53 files changed, 146 insertions(+), 446 deletions(-) diff --git a/src/Lucene.Net.Queries/BooleanFilter.cs b/src/Lucene.Net.Queries/BooleanFilter.cs index 4b48a36..716b2a0 100644 --- a/src/Lucene.Net.Queries/BooleanFilter.cs +++ b/src/Lucene.Net.Queries/BooleanFilter.cs @@ -137,10 +137,7 @@ namespace Lucene.Net.Queries /// <summary> /// Gets the list of clauses /// </summary> - public virtual IList<FilterClause> Clauses - { - get { return clauses; } - } + public virtual IList<FilterClause> Clauses => clauses; /// <summary> /// Returns an iterator on the clauses in this query. It implements the <see cref="IEnumerable{T}"/> interface to diff --git a/src/Lucene.Net.Queries/BoostingQuery.cs b/src/Lucene.Net.Queries/BoostingQuery.cs index 517d192..1291a2f 100644 --- a/src/Lucene.Net.Queries/BoostingQuery.cs +++ b/src/Lucene.Net.Queries/BoostingQuery.cs @@ -46,7 +46,7 @@ namespace Lucene.Net.Queries public BoostingQuery(Query match, Query context, float boost) { this.match = match; - this.context = (Query) context.Clone(); // clone before boost + this.context = (Query)context.Clone(); // clone before boost this.boost = boost; this.context.Boost = 0.0f; // ignore context-only matches } diff --git a/src/Lucene.Net.Queries/ChainedFilter.cs b/src/Lucene.Net.Queries/ChainedFilter.cs index 50896d0..2a7689a 100644 --- a/src/Lucene.Net.Queries/ChainedFilter.cs +++ b/src/Lucene.Net.Queries/ChainedFilter.cs @@ -51,11 +51,11 @@ namespace Lucene.Net.Queries /// <summary> /// The filter chain /// </summary> - private Filter[] chain = null; + private readonly Filter[] chain = null; - private int[] logicArray; + private readonly int[] logicArray; - private int logic = -1; + private readonly int logic = -1; /// <summary> /// Ctor. diff --git a/src/Lucene.Net.Queries/CommonTermsQuery.cs b/src/Lucene.Net.Queries/CommonTermsQuery.cs index 60e8ac7..eab39fb 100644 --- a/src/Lucene.Net.Queries/CommonTermsQuery.cs +++ b/src/Lucene.Net.Queries/CommonTermsQuery.cs @@ -323,8 +323,8 @@ namespace Lucene.Net.Queries /// </summary> public virtual float LowFreqMinimumNumberShouldMatch { - get { return m_lowFreqMinNrShouldMatch; } - set { m_lowFreqMinNrShouldMatch = value; } + get => m_lowFreqMinNrShouldMatch; + set => m_lowFreqMinNrShouldMatch = value; } @@ -343,8 +343,8 @@ namespace Lucene.Net.Queries /// </summary> public virtual float HighFreqMinimumNumberShouldMatch { - get { return m_highFreqMinNrShouldMatch; } - set { m_highFreqMinNrShouldMatch = value; } + get => m_highFreqMinNrShouldMatch; + set => m_highFreqMinNrShouldMatch = value; } diff --git a/src/Lucene.Net.Queries/CustomScoreQuery.cs b/src/Lucene.Net.Queries/CustomScoreQuery.cs index b5a2c6c..fe01c4a 100644 --- a/src/Lucene.Net.Queries/CustomScoreQuery.cs +++ b/src/Lucene.Net.Queries/CustomScoreQuery.cs @@ -217,12 +217,9 @@ namespace Lucene.Net.Queries } /// <summary> - /// <seealso cref="Weight.Query"/> + /// <see cref="Weight.Query"/> /// </summary> - public override Query Query - { - get { return outerInstance; } - } + public override Query Query => outerInstance; public override float GetValueForNormalization() { @@ -243,7 +240,7 @@ namespace Lucene.Net.Queries } /// <summary> - /// <seealso cref="Weight.Normalize(float, float)"/> + /// <see cref="Weight.Normalize(float, float)"/> /// </summary> public override void Normalize(float norm, float topLevelBoost) { @@ -312,11 +309,7 @@ namespace Lucene.Net.Queries return res; } - public override bool ScoresDocsOutOfOrder - { - get { return false; } - } - + public override bool ScoresDocsOutOfOrder => false; } //=========================== S C O R E R ============================ @@ -360,10 +353,7 @@ namespace Lucene.Net.Queries return doc; } - public override int DocID - { - get { return subQueryScorer.DocID; } - } + public override int DocID => subQueryScorer.DocID; /// <summary> /// <seealso cref="Scorer.GetScore"/> @@ -377,10 +367,7 @@ namespace Lucene.Net.Queries return qWeight * provider.CustomScore(subQueryScorer.DocID, subQueryScorer.GetScore(), vScores); } - public override int Freq - { - get { return subQueryScorer.Freq; } - } + public override int Freq => subQueryScorer.Freq; public override ICollection<ChildScorer> GetChildren() { @@ -422,33 +409,24 @@ namespace Lucene.Net.Queries /// </summary> public virtual bool IsStrict { - get { return strict; } - set { strict = value; } + get => strict; + set => strict = value; } /// <summary> /// The sub-query that <see cref="CustomScoreQuery"/> wraps, affecting both the score and which documents match. </summary> - public virtual Query SubQuery - { - get { return subQuery; } - } + public virtual Query SubQuery => subQuery; /// <summary> /// The scoring queries that only affect the score of <see cref="CustomScoreQuery"/>. </summary> [WritableArray] [SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")] - public virtual Query[] ScoringQueries - { - get { return scoringQueries; } - } + public virtual Query[] ScoringQueries => scoringQueries; /// <summary> /// A short name of this query, used in <see cref="ToString(string)"/>. /// </summary> - public virtual string Name - { - get { return "custom"; } - } + public virtual string Name => "custom"; } } \ No newline at end of file diff --git a/src/Lucene.Net.Queries/FilterClause.cs b/src/Lucene.Net.Queries/FilterClause.cs index 2b4785b..a288ca3 100644 --- a/src/Lucene.Net.Queries/FilterClause.cs +++ b/src/Lucene.Net.Queries/FilterClause.cs @@ -43,24 +43,12 @@ namespace Lucene.Net.Queries /// <summary> /// Returns this <see cref="FilterClause"/>'s filter </summary> /// <returns> A <see cref="Search.Filter"/> object </returns> - public Filter Filter - { - get - { - return filter; - } - } + public Filter Filter => filter; /// <summary> /// Returns this <see cref="FilterClause"/>'s occur parameter </summary> /// <returns> An <see cref="Search.Occur"/> object </returns> - public Occur Occur - { - get - { - return occur; - } - } + public Occur Occur => occur; public override bool Equals(object o) { @@ -69,8 +57,7 @@ namespace Lucene.Net.Queries return true; } - var other = o as FilterClause; - if (other == null) + if (!(o is FilterClause other)) { return false; } diff --git a/src/Lucene.Net.Queries/Function/BoostedQuery.cs b/src/Lucene.Net.Queries/Function/BoostedQuery.cs index 1e39cfd..884d09b 100644 --- a/src/Lucene.Net.Queries/Function/BoostedQuery.cs +++ b/src/Lucene.Net.Queries/Function/BoostedQuery.cs @@ -1,6 +1,5 @@ using Lucene.Net.Index; using Lucene.Net.Search; -using Lucene.Net.Support; using Lucene.Net.Util; using System.Collections; using System.Collections.Generic; @@ -41,20 +40,9 @@ namespace Lucene.Net.Queries.Function this.boostVal = boostVal; } - public virtual Query Query - { - get - { - return q; - } - } - public virtual ValueSource ValueSource - { - get - { - return boostVal; - } - } + public virtual Query Query => q; + + public virtual ValueSource ValueSource => boostVal; public override Query Rewrite(IndexReader reader) { @@ -95,13 +83,7 @@ namespace Lucene.Net.Queries.Function outerInstance.boostVal.CreateWeight(fcontext, searcher); } - public override Query Query - { - get - { - return outerInstance; - } - } + public override Query Query => outerInstance; public override float GetValueForNormalization() { @@ -163,10 +145,7 @@ namespace Lucene.Net.Queries.Function this.vals = vs.GetValues(weight.fcontext, readerContext); } - public override int DocID - { - get { return scorer.DocID; } - } + public override int DocID => scorer.DocID; public override int Advance(int target) { @@ -188,10 +167,7 @@ namespace Lucene.Net.Queries.Function return score > float.NegativeInfinity ? score : -float.MaxValue; } - public override int Freq - { - get { return scorer.Freq; } - } + public override int Freq => scorer.Freq; public override ICollection<ChildScorer> GetChildren() { diff --git a/src/Lucene.Net.Queries/Function/FunctionQuery.cs b/src/Lucene.Net.Queries/Function/FunctionQuery.cs index 92fc645..b43588d 100644 --- a/src/Lucene.Net.Queries/Function/FunctionQuery.cs +++ b/src/Lucene.Net.Queries/Function/FunctionQuery.cs @@ -40,13 +40,7 @@ namespace Lucene.Net.Queries.Function } /// <returns> The associated <see cref="Function.ValueSource"/> </returns> - public virtual ValueSource ValueSource - { - get - { - return func; - } - } + public virtual ValueSource ValueSource => func; public override Query Rewrite(IndexReader reader) { @@ -74,13 +68,7 @@ namespace Lucene.Net.Queries.Function outerInstance.func.CreateWeight(m_context, searcher); } - public override Query Query - { - get - { - return outerInstance; - } - } + public override Query Query => outerInstance; public override float GetValueForNormalization() { @@ -130,10 +118,7 @@ namespace Lucene.Net.Queries.Function vals = outerInstance.func.GetValues(weight.m_context, context); } - public override int DocID - { - get { return doc; } - } + public override int DocID => doc; // instead of matching all docs, we could also embed a query. // the score could either ignore the subscore, or boost it. @@ -178,10 +163,7 @@ namespace Lucene.Net.Queries.Function return maxDoc; } - public override int Freq - { - get { return 1; } - } + public override int Freq => 1; public virtual Explanation Explain(int d) { diff --git a/src/Lucene.Net.Queries/Function/ValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSource.cs index 14ac19f..2c6259b 100644 --- a/src/Lucene.Net.Queries/Function/ValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSource.cs @@ -181,7 +181,7 @@ namespace Lucene.Net.Queries.Function // LUCENENET NOTE: This was value(int) in Lucene. public override IComparable this[int slot] { - get { return values[slot]; } + get => values[slot]; } public override int CompareTop(int doc) diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs index de3c8ae..d448348 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/ConstValueSource.cs @@ -103,8 +103,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as ConstValueSource; - if (other == null) + if (!(o is ConstValueSource other)) { return false; } @@ -114,52 +113,22 @@ namespace Lucene.Net.Queries.Function.ValueSources /// <summary> /// NOTE: This was getInt() in Lucene /// </summary> - public override int Int32 - { - get - { - return (int)constant; - } - } + public override int Int32 => (int)constant; /// <summary> /// NOTE: This was getLong() in Lucene /// </summary> - public override long Int64 - { - get - { - return (long)constant; - } - } + public override long Int64 => (long)constant; /// <summary> /// NOTE: This was getFloat() in Lucene /// </summary> - public override float Single - { - get - { - return constant; - } - } + public override float Single => constant; - public override double Double - { - get - { - return dv; - } - } + public override double Double => dv; // LUCENENET NOTE: getNumber() not supported - public override bool Bool - { - get - { - return constant != 0.0f; - } - } + public override bool Bool => constant != 0.0f; } } \ No newline at end of file diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs index e0d1115..6f88a93 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/DefFunction.cs @@ -36,10 +36,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { } - protected override string Name - { - get { return "def"; } - } + protected override string Name => "def"; public override FunctionValues GetValues(IDictionary fcontext, AtomicReaderContext readerContext) { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DivFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/DivFloatFunction.cs index d902ec2..20b91c6 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/DivFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/DivFloatFunction.cs @@ -31,10 +31,7 @@ { } - protected override string Name - { - get { return "div"; } - } + protected override string Name => "div"; protected override float Func(int doc, FunctionValues aVals, FunctionValues bVals) { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs index 3c5bb0a..b622d7a 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/DocFreqValueSource.cs @@ -161,10 +161,7 @@ namespace Lucene.Net.Queries.Function.ValueSources this.m_indexedBytes = indexedBytes; } - public virtual string Name - { - get { return "docfreq"; } - } + public virtual string Name => "docfreq"; public override string GetDescription() { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs index da65c8a..1cabe68 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleConstValueSource.cs @@ -111,8 +111,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as DoubleConstValueSource; - if (other == null) + if (!(o is DoubleConstValueSource other)) { return false; } @@ -122,52 +121,22 @@ namespace Lucene.Net.Queries.Function.ValueSources /// <summary> /// NOTE: This was getInt() in Lucene /// </summary> - public override int Int32 - { - get - { - return (int)lv; - } - } + public override int Int32 => (int)lv; /// <summary> /// NOTE: This was getLong() in Lucene /// </summary> - public override long Int64 - { - get - { - return lv; - } - } + public override long Int64 => lv; /// <summary> /// NOTE: This was getFloat() in Lucene /// </summary> - public override float Single - { - get - { - return fv; - } - } + public override float Single => fv; - public override double Double - { - get - { - return constant; - } - } + public override double Double => constant; // LUCENENET NOTE: getNumber() not supported - public override bool Bool - { - get - { - return constant != 0; - } - } + public override bool Bool => constant != 0; } } \ No newline at end of file diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs index d2aab2a..d721773 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/DoubleFieldSource.cs @@ -89,9 +89,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as - DoubleFieldSource; - if (other == null) + if (!(o is DoubleFieldSource other)) { return false; } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs index f7621aa..7023c42 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/DualFloatFunction.cs @@ -103,8 +103,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as DualSingleFunction; - if (other == null) + if (!(o is DualSingleFunction other)) { return false; } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs index 28c5944..c0dde80 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/FieldCacheSource.cs @@ -34,21 +34,9 @@ namespace Lucene.Net.Queries.Function.ValueSources this.m_field = field; } - public virtual IFieldCache FieldCache - { - get - { - return m_cache; - } - } + public virtual IFieldCache FieldCache => m_cache; - public virtual string Field - { - get - { - return m_field; - } - } + public virtual string Field => m_field; public override string GetDescription() { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs index 9b38337..ffb4f8c 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/FloatFieldSource.cs @@ -99,8 +99,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as SingleFieldSource; - if (other == null) + if (!(o is SingleFieldSource other)) return false; return base.Equals(other) && (this.m_parser == null ? other.m_parser == null : this.m_parser.GetType() == other.m_parser.GetType()); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs index 699f191..df4ba4a 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/IDFValueSource.cs @@ -40,10 +40,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { } - public override string Name - { - get { return "idf"; } - } + public override string Name => "idf"; public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext) { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs index 39207eb..af095f3 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/IfFunction.cs @@ -156,8 +156,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as IfFunction; - if (other == null) + if (!(o is IfFunction other)) return false; return ifSource.Equals(other.ifSource) && trueSource.Equals(other.trueSource) && falseSource.Equals(other.falseSource); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs index 3771852..f88c629 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/IntFieldSource.cs @@ -138,8 +138,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as Int32FieldSource; - if (other == null) + if (!(o is Int32FieldSource other)) return false; return base.Equals(other) && (this.parser == null ? other.parser == null : this.parser.GetType() == other.parser.GetType()); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs index 4363675..6b72d97 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/JoinDocFreqValueSource.cs @@ -101,11 +101,8 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - if (o.GetType() != typeof(JoinDocFreqValueSource)) - { + if (!(o is JoinDocFreqValueSource other)) return false; - } - var other = (JoinDocFreqValueSource)o; if (!m_qfield.Equals(other.m_qfield, StringComparison.Ordinal)) { return false; diff --git a/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs index f7b5dc6..da63ee9 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/LinearFloatFunction.cs @@ -95,8 +95,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as LinearSingleFunction; - if (other == null) + if (!(o is LinearSingleFunction other)) return false; return this.m_slope == other.m_slope && this.m_intercept == other.m_intercept && this.m_source.Equals(other.m_source); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs index a3b0e17..9de611d 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/LiteralValueSource.cs @@ -39,13 +39,7 @@ namespace Lucene.Net.Queries.Function.ValueSources /// <summary> /// returns the literal value </summary> - public virtual string Value - { - get - { - return m_str; - } - } + public virtual string Value => m_str; public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext) { @@ -91,8 +85,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { return true; } - var that = o as LiteralValueSource; - if (that == null) + if (!(o is LiteralValueSource that)) return false; return m_str.Equals(that.m_str, StringComparison.Ordinal); diff --git a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs index bb93595..0a48be7 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/LongFieldSource.cs @@ -152,8 +152,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { return false; } - var other = o as Int64FieldSource; - if (other == null) + if (!(o is Int64FieldSource other)) return false; return base.Equals(other) && (this.m_parser == null ? other.m_parser == null : this.m_parser.GetType() == other.m_parser.GetType()); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs index 229c0cf..cf7d616 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/MaxDocValueSource.cs @@ -28,10 +28,7 @@ namespace Lucene.Net.Queries.Function.ValueSources /// </summary> public class MaxDocValueSource : ValueSource { - public virtual string Name - { - get { return "maxdoc"; } - } + public virtual string Name => "maxdoc"; public override string GetDescription() { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs index 726f6cb..4690a7e 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/MaxFloatFunction.cs @@ -31,10 +31,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { } - protected override string Name - { - get { return "max"; } - } + protected override string Name => "max"; protected override float Func(int doc, FunctionValues[] valsArr) { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs index 0a41dd5..d5841eb 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/MinFloatFunction.cs @@ -31,10 +31,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { } - protected override string Name - { - get { return "min"; } - } + protected override string Name => "min"; protected override float Func(int doc, FunctionValues[] valsArr) { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs index b02c6d2..ce5bdc3 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiBoolFunction.cs @@ -125,8 +125,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { return false; } - var other = o as MultiBoolFunction; - if (other == null) + if (!(o is MultiBoolFunction other)) return false; // LUCENENET specific: use structural equality comparison diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs index da7b356..5257311 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiFloatFunction.cs @@ -137,8 +137,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { return false; } - var other = o as MultiSingleFunction; - if (other == null) + if (!(o is MultiSingleFunction other)) return false; return Name.Equals(other.Name, StringComparison.Ordinal) && Arrays.Equals(this.m_sources, other.m_sources); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/MultiValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/MultiValueSource.cs index 48c440b..08c8d51 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/MultiValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/MultiValueSource.cs @@ -1,28 +1,28 @@ namespace Lucene.Net.Queries.Function.ValueSources { - /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + /* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ - /// <summary> - /// A <see cref="ValueSource"/> that abstractly represents <see cref="ValueSource"/>s for - /// poly fields, and other things. - /// </summary> - public abstract class MultiValueSource : ValueSource - { + /// <summary> + /// A <see cref="ValueSource"/> that abstractly represents <see cref="ValueSource"/>s for + /// poly fields, and other things. + /// </summary> + public abstract class MultiValueSource : ValueSource + { public abstract int Dimension { get; } - } + } } \ No newline at end of file diff --git a/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs index 19ffc4c..ef81b5b 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/NormValueSource.cs @@ -41,10 +41,7 @@ namespace Lucene.Net.Queries.Function.ValueSources this.m_field = field; } - public virtual string Name - { - get { return "norm"; } - } + public virtual string Name => "norm"; public override string GetDescription() { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs index f34e14b..de5467f 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/NumDocsValueSource.cs @@ -27,10 +27,7 @@ namespace Lucene.Net.Queries.Function.ValueSources /// </summary> public class NumDocsValueSource : ValueSource { - public virtual string Name - { - get { return "numdocs"; } - } + public virtual string Name => "numdocs"; public override string GetDescription() { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs index 7f849f0..2328bfe 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/PowFloatFunction.cs @@ -33,10 +33,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { } - protected override string Name - { - get { return "pow"; } - } + protected override string Name => "pow"; protected override float Func(int doc, FunctionValues aVals, FunctionValues bVals) { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs index 24c5235..12e7679 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/ProductFloatFunction.cs @@ -31,10 +31,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { } - protected override string Name - { - get { return "product"; } - } + protected override string Name => "product"; protected override float Func(int doc, FunctionValues[] valsArr) { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs index 0eb0364..598536f 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/QueryValueSource.cs @@ -40,20 +40,10 @@ namespace Lucene.Net.Queries.Function.ValueSources this.defVal = defVal; } - public virtual Query Query - { - get - { - return q; - } - } - public virtual float DefaultValue - { - get - { - return defVal; - } - } + public virtual Query Query => q; + + public virtual float DefaultValue => defVal; + public override string GetDescription() { @@ -72,12 +62,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - if (typeof(QueryValueSource) != o.GetType()) - { - return false; - } - var other = o as QueryValueSource; - if (other == null) + if (!(o is QueryValueSource other)) return false; return this.q.Equals(other.q) && this.defVal == other.defVal; } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs index 891f7d3..ccc7fd1 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/RangeMapFloatFunction.cs @@ -118,12 +118,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - if (typeof(RangeMapSingleFunction) != o.GetType()) - { - return false; - } - var other = o as RangeMapSingleFunction; - if (other == null) + if (!(o is RangeMapSingleFunction other)) return false; return this.m_min == other.m_min && this.m_max == other.m_max diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs index 59f021d..fb3fc15 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/ReciprocalFloatFunction.cs @@ -107,12 +107,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - if (typeof(ReciprocalSingleFunction) != o.GetType()) - { - return false; - } - var other = o as ReciprocalSingleFunction; - if (other == null) + if (!(o is ReciprocalSingleFunction other)) return false; return this.m_m == other.m_m && this.m_a == other.m_a && this.m_b == other.m_b && this.m_source.Equals(other.m_source); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs index ff315bc..8e320ef 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/ReverseOrdFieldSource.cs @@ -47,10 +47,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { // LUCENENET NOTE: Made private and added public property for reading private readonly string field; - public string Field - { - get { return field; } - } + public string Field => field; public ReverseOrdFieldSource(string field) { @@ -103,12 +100,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - if (o == null || (o.GetType() != typeof(ReverseOrdFieldSource))) - { - return false; - } - var other = o as ReverseOrdFieldSource; - if (other == null) + if (!(o is ReverseOrdFieldSource other)) return false; return this.field.Equals(other.field, StringComparison.Ordinal); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs index 89e14b5..9f16cf0 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/ScaleFloatFunction.cs @@ -168,8 +168,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as ScaleSingleFunction; - if (other == null) + if (!(o is ScaleSingleFunction other)) return false; return this.m_min == other.m_min && this.m_max == other.m_max diff --git a/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs index c3636e1..72ac0d8 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/ShortFieldSource.cs @@ -122,8 +122,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as Int16FieldSource; - if (other == null) + if (!(o is Int16FieldSource other)) return false; return base.Equals(other) && (parser == null ? other.parser == null : diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs index abfec40..c71258d 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/SimpleBoolFunction.cs @@ -83,8 +83,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as SimpleBoolFunction; - if (other == null) + if (!(o is SimpleBoolFunction other)) return false; return this.m_source.Equals(other.m_source); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SingleFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/SingleFunction.cs index a241af3..3cde387 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/SingleFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/SingleFunction.cs @@ -49,8 +49,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as SingularFunction; - if (other == null) + if (!(o is SingularFunction other)) return false; return Name.Equals(other.Name, StringComparison.Ordinal) && m_source.Equals(other.m_source); diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs b/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs index 3ec8ffc..41ee9d5 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/SumFloatFunction.cs @@ -31,10 +31,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { } - protected override string Name - { - get { return "sum"; } - } + protected override string Name => "sum"; protected override float Func(int doc, FunctionValues[] valsArr) { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs index ec03a69..fa2b2ea 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/SumTotalTermFreqValueSource.cs @@ -39,10 +39,7 @@ namespace Lucene.Net.Queries.Function.ValueSources this.m_indexedField = indexedField; } - public virtual string Name - { - get { return "sumtotaltermfreq"; } - } + public virtual string Name => "sumtotaltermfreq"; public override string GetDescription() { @@ -113,8 +110,7 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - var other = o as SumTotalTermFreqValueSource; - if (other == null) + if (!(o is SumTotalTermFreqValueSource other)) return false; return this.m_indexedField.Equals(other.m_indexedField, StringComparison.Ordinal); } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs index ecce892..73fd2f1 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/TFValueSource.cs @@ -41,15 +41,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { } - public override string Name - { - get - { - { - return "tf"; - } - } - } + public override string Name => "tf"; public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext) { @@ -123,15 +115,9 @@ namespace Lucene.Net.Queries.Function.ValueSources this.outerInstance = outerInstance; } - public override int Freq - { - get { return 0; } - } + public override int Freq => 0; - public override int DocID - { - get { return DocIdSetIterator.NO_MORE_DOCS; } - } + public override int DocID => DocIdSetIterator.NO_MORE_DOCS; public override int NextDoc() { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs index eefea68..8807cdc 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/TermFreqValueSource.cs @@ -39,10 +39,7 @@ namespace Lucene.Net.Queries.Function.ValueSources { } - public override string Name - { - get { return "termfreq"; } - } + public override string Name => "termfreq"; public override FunctionValues GetValues(IDictionary context, AtomicReaderContext readerContext) { @@ -108,15 +105,9 @@ namespace Lucene.Net.Queries.Function.ValueSources this.outerInstance = outerInstance; } - public override int Freq - { - get { return 0; } - } + public override int Freq => 0; - public override int DocID - { - get { return DocIdSetIterator.NO_MORE_DOCS; } - } + public override int DocID => DocIdSetIterator.NO_MORE_DOCS; public override int NextDoc() { diff --git a/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs index 69eb234..4f31457 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/TotalTermFreqValueSource.cs @@ -46,10 +46,7 @@ namespace Lucene.Net.Queries.Function.ValueSources this.m_indexedBytes = indexedBytes; } - public virtual string Name - { - get { return "totaltermfreq"; } - } + public virtual string Name => "totaltermfreq"; public override string GetDescription() { @@ -110,11 +107,8 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { - if (this.GetType() != o.GetType()) - { + if (!(o is TotalTermFreqValueSource other)) return false; - } - var other = (TotalTermFreqValueSource)o; return this.m_indexedField.Equals(other.m_indexedField, StringComparison.Ordinal) && this.m_indexedBytes.Equals(other.m_indexedBytes); } } diff --git a/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs b/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs index 11835fb..96c55d1 100644 --- a/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs +++ b/src/Lucene.Net.Queries/Function/ValueSources/VectorValueSource.cs @@ -282,15 +282,10 @@ namespace Lucene.Net.Queries.Function.ValueSources public override bool Equals(object o) { if (this == o) - { return true; - } - if (!(o is VectorValueSource)) - { - return false; - } - var that = (VectorValueSource)o; + if (!(o is VectorValueSource that)) + return false; // LUCENENET specific: use structural equality comparison return JCG.ListEqualityComparer<ValueSource>.Default.Equals(m_sources, that.m_sources); diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs index 636837a..65a4885 100644 --- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs +++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs @@ -208,14 +208,8 @@ namespace Lucene.Net.Queries.Mlt /// </summary> public float BoostFactor { - get - { - return boostFactor; - } - set - { - this.boostFactor = value; - } + get => boostFactor; + set => this.boostFactor = value; } diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs index 672a8be..337c77e 100644 --- a/src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs +++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThisQuery.cs @@ -50,9 +50,9 @@ namespace Lucene.Net.Queries.Mlt /// <param name="moreLikeFields"> fields used for similarity measure </param> public MoreLikeThisQuery(string likeText, string[] moreLikeFields, Analyzer analyzer, string fieldName) { - this.LikeText = likeText; - this.MoreLikeFields = moreLikeFields; - this.Analyzer = analyzer; + this.likeText = likeText; + this.moreLikeFields = moreLikeFields; + this.analyzer = analyzer; this.fieldName = fieldName; } @@ -88,52 +88,52 @@ namespace Lucene.Net.Queries.Mlt public virtual float PercentTermsToMatch { - get { return percentTermsToMatch; } - set { percentTermsToMatch = value; } + get => percentTermsToMatch; + set => percentTermsToMatch = value; } public virtual Analyzer Analyzer { - get { return analyzer; } - set { analyzer = value; } + get => analyzer; + set => analyzer = value; } public virtual string LikeText { - get { return likeText; } - set { likeText = value; } + get => likeText; + set => likeText = value; } public virtual int MaxQueryTerms { - get { return maxQueryTerms; } - set { maxQueryTerms = value; } + get => maxQueryTerms; + set => maxQueryTerms = value; } public virtual int MinTermFrequency { - get { return minTermFrequency; } - set { minTermFrequency = value; } + get => minTermFrequency; + set => minTermFrequency = value; } [WritableArray] [SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")] public virtual string[] MoreLikeFields { - get { return moreLikeFields; } - set { moreLikeFields = value; } + get => moreLikeFields; + set => moreLikeFields = value; } public virtual ISet<string> StopWords { - get { return stopWords; } - set { stopWords = value; } + get => stopWords; + set => stopWords = value; } public virtual int MinDocFreq { - get { return minDocFreq; } - set { minDocFreq = value; } + get => minDocFreq; + set => minDocFreq = value; } public override int GetHashCode() diff --git a/src/Lucene.Net.Queries/TermFilter.cs b/src/Lucene.Net.Queries/TermFilter.cs index ac85ec0..41c5ae9 100644 --- a/src/Lucene.Net.Queries/TermFilter.cs +++ b/src/Lucene.Net.Queries/TermFilter.cs @@ -43,13 +43,7 @@ namespace Lucene.Net.Queries } /// <summary> Gets the term this filter includes documents with. </summary> - public Term Term - { - get - { - return term; - } - } + public Term Term => term; public override DocIdSet GetDocIdSet(AtomicReaderContext context, IBits acceptDocs) { diff --git a/src/Lucene.Net.Queries/TermsFilter.cs b/src/Lucene.Net.Queries/TermsFilter.cs index 87301de..7d27145 100644 --- a/src/Lucene.Net.Queries/TermsFilter.cs +++ b/src/Lucene.Net.Queries/TermsFilter.cs @@ -83,7 +83,7 @@ namespace Lucene.Net.Queries if (iter.MoveNext()) { var next = iter.Current; - m_field = next.Field; + Field = next.Field; return next.Bytes; } return null; @@ -384,7 +384,7 @@ namespace Lucene.Net.Queries private abstract class FieldAndTermEnum { - protected string m_field; + // LUCENENET specific - removed field and changed Field property to protected set public abstract BytesRef Next(); @@ -394,13 +394,10 @@ namespace Lucene.Net.Queries public FieldAndTermEnum(string field) { - this.m_field = field; + this.Field = field; } - public virtual string Field - { - get { return m_field; } - } + public virtual string Field { get; protected set; } } } } \ No newline at end of file
