Skip to content

Commit

Permalink
BREAKING: Lucene.Net.Index.Term: Changed Text() method into Text prop…
Browse files Browse the repository at this point in the history 
…erty. Added an obsolete Text() extension method to Lucene.Net.Index for backward compatibility.
  • Loading branch information
@NightOwl888
NightOwl888 committed May 2, 2021
1 parent 221fa4a commit 36dcd7e
Show file tree
Hide file tree
Showing 41 changed files with 144 additions and 112 deletions.
2 changes: 1 addition & 1 deletion src/Lucene.Net.Highlighter/Highlight/QueryTermExtractor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private static void GetTerms(Query query, ISet<WeightedTerm> terms, bool prohibi
{
if ((fieldName == null) || (term.Field.Equals(fieldName, StringComparison.Ordinal)))
{
terms.Add(new WeightedTerm(query.Boost, term.Text()));
terms.Add(new WeightedTerm(query.Boost, term.Text));
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,12 @@ protected virtual void ExtractWeightedSpanTerms(IDictionary<string, WeightedSpan
{
if (FieldNameComparer(queryTerm.Field))
{
if (!terms.TryGetValue(queryTerm.Text(), out WeightedSpanTerm weightedSpanTerm) || weightedSpanTerm == null)
if (!terms.TryGetValue(queryTerm.Text, out WeightedSpanTerm weightedSpanTerm) || weightedSpanTerm == null)
{
weightedSpanTerm = new WeightedSpanTerm(spanQuery.Boost, queryTerm.Text());
weightedSpanTerm = new WeightedSpanTerm(spanQuery.Boost, queryTerm.Text);
weightedSpanTerm.AddPositionSpans(spanPositions);
weightedSpanTerm.IsPositionSensitive = true;
terms[queryTerm.Text()] = weightedSpanTerm;
terms[queryTerm.Text] = weightedSpanTerm;
}
else
{
Expand Down Expand Up @@ -352,8 +352,8 @@ protected virtual void ExtractWeightedTerms(IDictionary<string, WeightedSpanTerm

if (FieldNameComparer(queryTerm.Field))
{
WeightedSpanTerm weightedSpanTerm = new WeightedSpanTerm(query.Boost, queryTerm.Text());
terms[queryTerm.Text()] = weightedSpanTerm;
WeightedSpanTerm weightedSpanTerm = new WeightedSpanTerm(query.Boost, queryTerm.Text);
terms[queryTerm.Text] = weightedSpanTerm;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Lucene.Net.Highlighter/PostingsHighlight/MultiTermHighlighting.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ internal static CharacterRunAutomaton[] ExtractAutomata(Query query, string fiel
if (prefix.Field.Equals(field, StringComparison.Ordinal))
{
list.Add(new CharacterRunAutomatonToStringAnonymousClass(
BasicOperations.Concatenate(BasicAutomata.MakeString(prefix.Text()), BasicAutomata.MakeAnyString()),
BasicOperations.Concatenate(BasicAutomata.MakeString(prefix.Text), BasicAutomata.MakeAnyString()),
() => pq.ToString()));
}
}
else if (query is FuzzyQuery fq)
{
if (fq.Field.Equals(field, StringComparison.Ordinal))
{
string utf16 = fq.Term.Text();
string utf16 = fq.Term.Text;
int[] termText = new int[utf16.CodePointCount(0, utf16.Length)];
for (int cp, i = 0, j = 0; i < utf16.Length; i += Character.CharCount(cp))
{
Expand Down
14 changes: 7 additions & 7 deletions src/Lucene.Net.Highlighter/VectorHighlight/FieldQuery.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ private static void CheckOverlap(ICollection<Query> expandQueries, Term[] src, T
bool overlap = true;
for (int j = i; j < src.Length; j++)
{
if ((j - i) < dest.Length && !src[j].Text().Equals(dest[j - i].Text(), StringComparison.Ordinal))
if ((j - i) < dest.Length && !src[j].Text.Equals(dest[j - i].Text, StringComparison.Ordinal))
{
overlap = false;
break;
Expand All @@ -283,7 +283,7 @@ private static void CheckOverlap(ICollection<Query> expandQueries, Term[] src, T
pq.Add(srcTerm);
for (int k = src.Length - i; k < dest.Length; k++)
{
pq.Add(new Term(src[0].Field, dest[k].Text()));
pq.Add(new Term(src[0].Field, dest[k].Text));
}
pq.Slop = slop;
pq.Boost = boost;
Expand Down Expand Up @@ -354,18 +354,18 @@ internal void SaveTerms(ICollection<Query> flatQueries, IndexReader reader)
{
ISet<string> termSet = GetTermSet(query);
if (query is TermQuery termQuery)
termSet.Add(termQuery.Term.Text());
termSet.Add(termQuery.Term.Text);
else if (query is PhraseQuery phraseQuery)
{
foreach (Term term in phraseQuery.GetTerms())
termSet.Add(term.Text());
termSet.Add(term.Text);
}
else if (query is MultiTermQuery && reader != null)
{
BooleanQuery mtqTerms = (BooleanQuery)query.Rewrite(reader);
foreach (BooleanClause clause in mtqTerms.GetClauses())
{
termSet.Add(((TermQuery)clause.Query).Term.Text());
termSet.Add(((TermQuery)clause.Query).Term.Text);
}
}
else
Expand Down Expand Up @@ -438,7 +438,7 @@ public QueryPhraseMap(FieldQuery fieldQuery)

internal void AddTerm(Term term, float boost)
{
QueryPhraseMap map = GetOrNewMap(subMap, term.Text());
QueryPhraseMap map = GetOrNewMap(subMap, term.Text);
map.MarkTerminal(boost);
}

Expand All @@ -465,7 +465,7 @@ internal void Add(Query query /*, IndexReader reader // LUCENENET: Never read */
QueryPhraseMap qpm = null;
foreach (Term term in terms)
{
qpm = GetOrNewMap(map, term.Text());
qpm = GetOrNewMap(map, term.Text);
map = qpm.subMap;
}
qpm.MarkTerminal(pq.Slop, pq.Boost);
Expand Down
2 changes: 1 addition & 1 deletion src/Lucene.Net.Misc/Misc/GetTermInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public static void Main(string[] args)
public static void TermInfo(Store.Directory dir, Term term)
{
IndexReader reader = DirectoryReader.Open(dir);
Console.WriteLine("{0}:{1} \t totalTF = {2:#,##0} \t doc freq = {3:#,##0} \n", term.Field, term.Text(), reader.TotalTermFreq(term), reader.DocFreq(term));
Console.WriteLine("{0}:{1} \t totalTF = {2:#,##0} \t doc freq = {3:#,##0} \n", term.Field, term.Text, reader.TotalTermFreq(term), reader.DocFreq(term));
}

// LUCENENET specific - our wrapper console shows the correct usage
Expand Down
2 changes: 1 addition & 1 deletion src/Lucene.Net.Queries/TermFilter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public override int GetHashCode()

public override string ToString()
{
return term.Field + ":" + term.Text();
return term.Field + ":" + term.Text;
}
}
}
2 changes: 1 addition & 1 deletion src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ protected internal virtual Query NewRegexpQuery(Term regexp)
protected internal virtual Query NewFuzzyQuery(Term term, float minimumSimilarity, int prefixLength)
{
// FuzzyQuery doesn't yet allow constant score rewrite
string text = term.Text();
string text = term.Text;
#pragma warning disable 612, 618
int numEdits = FuzzyQuery.SingleToEdits(minimumSimilarity,
text.CodePointCount(0, text.Length));
Expand Down
4 changes: 2 additions & 2 deletions src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public SlowFuzzyQuery(Term term, float minimumSimilarity, int prefixLength,

MultiTermRewriteMethod = new MultiTermQuery.TopTermsScoringBooleanQueryRewrite(maxExpansions);

string text = term.Text();
string text = term.Text;
int len = text.CodePointCount(0, text.Length);
if (len > 0 && (minimumSimilarity >= 1f || len > 1.0f / (1.0f - minimumSimilarity)))
{
Expand Down Expand Up @@ -163,7 +163,7 @@ public override string ToString(string field)
buffer.Append(m_term.Field);
buffer.Append(":");
}
buffer.Append(m_term.Text());
buffer.Append(m_term.Text);
buffer.Append('~');
buffer.Append(Number.ToString(minimumSimilarity));
buffer.Append(ToStringUtils.Boost(Boost));
Expand Down
6 changes: 3 additions & 3 deletions src/Lucene.Net.Suggest/Spell/DirectSpellChecker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ public virtual SuggestWord[] SuggestSimilar(Term term, int numSug, IndexReader i
SuggestMode suggestMode, float accuracy)
{
CharsRef spare = new CharsRef();
string text = term.Text();
string text = term.Text;
if (minQueryLength > 0 && text.CodePointCount(0, text.Length) < minQueryLength)
{
return Arrays.Empty<SuggestWord>();
Expand Down Expand Up @@ -433,7 +433,7 @@ protected internal virtual ICollection<ScoreTerm> SuggestSimilar(Term term, int

var stQueue = new JCG.PriorityQueue<ScoreTerm>();

BytesRef queryTerm = new BytesRef(term.Text());
BytesRef queryTerm = new BytesRef(term.Text);
BytesRef candidateTerm;
ScoreTerm st = new ScoreTerm();
IBoostAttribute boostAtt = e.Attributes.AddAttribute<IBoostAttribute>();
Expand Down Expand Up @@ -474,7 +474,7 @@ protected internal virtual ICollection<ScoreTerm> SuggestSimilar(Term term, int
{
UnicodeUtil.UTF8toUTF16(candidateTerm, spare);
termAsString = spare.ToString();
score = distance.GetDistance(term.Text(), termAsString);
score = distance.GetDistance(term.Text, termAsString);
}

if (score < accuracy)
Expand Down
8 changes: 4 additions & 4 deletions src/Lucene.Net.Suggest/Spell/WordBreakSpellChecker.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public virtual CombineSuggestion[] SuggestWordCombinations(Term[] terms, int max
{
continue;
}
string leftTermText = terms[i].Text();
string leftTermText = terms[i].Text;
int leftTermLength = leftTermText.CodePointCount(0, leftTermText.Length);
if (leftTermLength > maxCombineWordLength)
{
Expand All @@ -203,7 +203,7 @@ public virtual CombineSuggestion[] SuggestWordCombinations(Term[] terms, int max
{
break;
}
string rightTermText = terms[j].Text();
string rightTermText = terms[j].Text;
int rightTermLength = rightTermText.CodePointCount(0, rightTermText.Length);
combinedTermText += rightTermText;
combinedLength += rightTermLength;
Expand Down Expand Up @@ -236,7 +236,7 @@ public virtual CombineSuggestion[] SuggestWordCombinations(Term[] terms, int max
SuggestWord word = new SuggestWord();
word.Freq = combinedTermFreq;
word.Score = origIndexes.Length - 1;
word.String = combinedTerm.Text();
word.String = combinedTerm.Text;
CombineSuggestionWrapper suggestion = new CombineSuggestionWrapper(new CombineSuggestion(word, origIndexes), (origIndexes.Length - 1));
suggestions.Enqueue(suggestion);
if (suggestions.Count > maxSuggestions)
Expand Down Expand Up @@ -266,7 +266,7 @@ private int GenerateBreakUpSuggestions(Term term, IndexReader ir,
SuggestWord[] prefix, JCG.PriorityQueue<SuggestWordArrayWrapper> suggestions,
int totalEvaluations, BreakSuggestionSortMethod sortMethod)
{
string termText = term.Text();
string termText = term.Text;
int termLength = termText.CodePointCount(0, termText.Length);
int useMinBreakWordLength = minBreakWordLength;
if (useMinBreakWordLength < 1)
Expand Down
2 changes: 1 addition & 1 deletion src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private static IList<FacetField> RandomCategories(Random random)

private static void AddField(Document doc)
{
doc.Add(new StringField(A.Field, A.Text(), Store.NO));
doc.Add(new StringField(A.Field, A.Text, Store.NO));
}

private static void AddFacets(Document doc, FacetsConfig config, bool updateTermExpectedCounts)
Expand Down
4 changes: 2 additions & 2 deletions src/Lucene.Net.Tests.Misc/Index/TestMultiPassIndexSplitter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ public void TestSplitSeq()
// make sure the deleted doc is not here
TermsEnum te = MultiFields.GetTerms(ir, "id").GetEnumerator();
Term t = new Term("id", (NUM_DOCS - 1) + "");
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.SeekCeil(new BytesRef(t.Text())));
assertNotSame(t.Text(), te.Term.Utf8ToString());
assertEquals(TermsEnum.SeekStatus.NOT_FOUND, te.SeekCeil(new BytesRef(t.Text)));
assertNotSame(t.Text, te.Term.Utf8ToString());
}
}
finally
Expand Down
2 changes: 1 addition & 1 deletion src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ public ExtendedCommonTermsQuery(Occur highFreqOccur, Occur lowFreqOccur, float m
protected override Query NewTermQuery(Term term, TermContext context)
{
Query query = base.NewTermQuery(term, context);
if (term.Text().Equals(@"universe", StringComparison.Ordinal))
if (term.Text.Equals(@"universe", StringComparison.Ordinal))
{
query.Boost = 100f;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Lucene.Net.Tests.Queries/Mlt/TestMoreLikeThis.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ public void TestBoostFactor()
foreach (BooleanClause clause in clauses)
{
TermQuery tq = (TermQuery)clause.Query;
float? termBoost = originalValues[tq.Term.Text()];
assertNotNull("Expected term " + tq.Term.Text(), termBoost);
float? termBoost = originalValues[tq.Term.Text];
assertNotNull("Expected term " + tq.Term.Text, termBoost);

float totalBoost = (float) (termBoost * boostFactor);
assertEquals("Expected boost of " + totalBoost + " for term '"
+ tq.Term.Text() + "' got " + tq.Boost, totalBoost, tq.Boost, 0.0001);
+ tq.Term.Text + "' got " + tq.Boost, totalBoost, tq.Boost, 0.0001);
}
}

Expand All @@ -123,7 +123,7 @@ public void TestBoostFactor()
foreach (BooleanClause clause in clauses)
{
TermQuery tq = (TermQuery)clause.Query;
originalValues[tq.Term.Text()] = tq.Boost;
originalValues[tq.Term.Text] = tq.Boost;
}
return originalValues;
}
Expand Down
14 changes: 7 additions & 7 deletions src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,37 +233,37 @@ public override void TestStarParsing()
TermQuery tq;

tq = (TermQuery)qp.Parse("foo:zoo*");
assertEquals("zoo", tq.Term.Text());
assertEquals("zoo", tq.Term.Text);
assertEquals(2, qp.type[0]);

tq = (TermQuery)qp.Parse("foo:zoo*^2");
assertEquals("zoo", tq.Term.Text());
assertEquals("zoo", tq.Term.Text);
assertEquals(2, qp.type[0]);
assertEquals(tq.Boost, 2, 0);

tq = (TermQuery)qp.Parse("foo:*");
assertEquals("*", tq.Term.Text());
assertEquals("*", tq.Term.Text);
assertEquals(1, qp.type[0]); // could be a valid prefix query in the future too

tq = (TermQuery)qp.Parse("foo:*^2");
assertEquals("*", tq.Term.Text());
assertEquals("*", tq.Term.Text);
assertEquals(1, qp.type[0]);
assertEquals(tq.Boost, 2, 0);

tq = (TermQuery)qp.Parse("*:foo");
assertEquals("*", tq.Term.Field);
assertEquals("foo", tq.Term.Text());
assertEquals("foo", tq.Term.Text);
assertEquals(3, qp.type[0]);

tq = (TermQuery)qp.Parse("*:*");
assertEquals("*", tq.Term.Field);
assertEquals("*", tq.Term.Text());
assertEquals("*", tq.Term.Text);
assertEquals(1, qp.type[0]); // could be handled as a prefix query in the
// future

tq = (TermQuery)qp.Parse("(*:*)");
assertEquals("*", tq.Term.Field);
assertEquals("*", tq.Term.Text());
assertEquals("*", tq.Term.Text);
assertEquals(1, qp.type[0]);
}

Expand Down
8 changes: 4 additions & 4 deletions src/Lucene.Net.Tests.QueryParser/Ext/TestExtendableQueryParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ public virtual void TestExtFieldUnqoted()
TermQuery tquery = (TermQuery)query;
assertEquals("aField", tquery.Term
.Field);
assertEquals("foo", tquery.Term.Text());
assertEquals("foo", tquery.Term.Text);

booleanClause = clauses[1];
query = booleanClause.Query;
assertTrue("expected instance of TermQuery but was " + query.GetType(),
query is TermQuery);
tquery = (TermQuery)query;
assertEquals(DefaultField, tquery.Term.Field);
assertEquals("bar", tquery.Term.Text());
assertEquals("bar", tquery.Term.Text);
}
}

Expand All @@ -114,7 +114,7 @@ public virtual void TestExtDefaultField()
parse is TermQuery);
TermQuery tquery = (TermQuery)parse;
assertEquals(DefaultField, tquery.Term.Field);
assertEquals("foo & bar", tquery.Term.Text());
assertEquals("foo & bar", tquery.Term.Text);
}
}

Expand All @@ -138,7 +138,7 @@ public virtual void TestExtField()
parse is TermQuery);
TermQuery tquery = (TermQuery)parse;
assertEquals("afield", tquery.Term.Field);
assertEquals("foo & bar", tquery.Term.Text());
assertEquals("foo & bar", tquery.Term.Text);
}
}

Expand Down
Loading

0 comments on commit 36dcd7e

Please sign in to comment.