Skip to content

Commit e8f8a08

Browse files
mayya-sharipovamayya-sharipova
committed
Spotless
1 parent 877140d commit e8f8a08

File tree

2 files changed

+49
-20
lines changed

2 files changed

+49
-20
lines changed

‎server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,10 @@ public IntervalsSource intervals(BytesRef term) {
621621
return Intervals.fixField(name(), Intervals.term(term));
622622
}
623623
String wildcardTerm = term.utf8ToString() + "?".repeat(Math.max(0, minChars - term.length));
624-
return Intervals.or(Intervals.fixField(name(),
625-
Intervals.wildcard(new BytesRef(wildcardTerm), IndexSearcher.getMaxClauseCount())), Intervals.term(term));
624+
return Intervals.or(
625+
Intervals.fixField(name(), Intervals.wildcard(new BytesRef(wildcardTerm), IndexSearcher.getMaxClauseCount())),
626+
Intervals.term(term)
627+
);
626628
}
627629

628630
@Override
@@ -839,7 +841,12 @@ public IntervalsSource fuzzyIntervals(
839841
throw new IllegalArgumentException("Cannot create intervals over field [" + name() + "] with no positions indexed");
840842
}
841843
FuzzyQuery fq = new FuzzyQuery(
842-
new Term(name(), term), maxDistance, prefixLength, IndexSearcher.getMaxClauseCount(), transpositions);
844+
new Term(name(), term),
845+
maxDistance,
846+
prefixLength,
847+
IndexSearcher.getMaxClauseCount(),
848+
transpositions
849+
);
843850
return Intervals.multiterm(fq.getAutomata(), IndexSearcher.getMaxClauseCount(), term);
844851
}
845852

‎server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java‎

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,13 @@ public void testPrefixes() throws IOException {
677677
builder = (IntervalQueryBuilder) parseQuery(short_prefix_json);
678678
expected = new IntervalQuery(
679679
PREFIXED_FIELD,
680-
Intervals.or(Intervals.fixField(PREFIXED_FIELD + "._index_prefix",
681-
Intervals.wildcard(new BytesRef("t?"), IndexSearcher.getMaxClauseCount())), Intervals.term("t"))
680+
Intervals.or(
681+
Intervals.fixField(
682+
PREFIXED_FIELD + "._index_prefix",
683+
Intervals.wildcard(new BytesRef("t?"), IndexSearcher.getMaxClauseCount())
684+
),
685+
Intervals.term("t")
686+
)
682687
);
683688
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
684689

@@ -782,8 +787,10 @@ public void testRegexp() throws IOException {
782787
}""", TEXT_FIELD_NAME);
783788

784789
builder = (IntervalQueryBuilder) parseQuery(fixed_field_json);
785-
expected = new IntervalQuery(TEXT_FIELD_NAME, Intervals.fixField(MASKED_FIELD,
786-
Intervals.regexp(new BytesRef("te.*m"), IndexSearcher.getMaxClauseCount())));
790+
expected = new IntervalQuery(
791+
TEXT_FIELD_NAME,
792+
Intervals.fixField(MASKED_FIELD, Intervals.regexp(new BytesRef("te.*m"), IndexSearcher.getMaxClauseCount()))
793+
);
787794
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
788795

789796
String fixed_field_json_no_positions = Strings.format("""
@@ -806,7 +813,7 @@ public void testRegexp() throws IOException {
806813
public void testMaxExpansionExceptionFailure() throws Exception {
807814
IntervalsSourceProvider provider1 = new IntervalsSourceProvider.Prefix("bar", "keyword", null);
808815
IntervalsSourceProvider provider2 = new IntervalsSourceProvider.Wildcard("bar*", "keyword", null);
809-
IntervalsSourceProvider provider3 = new IntervalsSourceProvider.Fuzzy("bar", 0, true, Fuzziness.fromEdits(1), "keyword",null);
816+
IntervalsSourceProvider provider3 = new IntervalsSourceProvider.Fuzzy("bar", 0, true, Fuzziness.fromEdits(1), "keyword", null);
810817
IntervalsSourceProvider provider4 = new IntervalsSourceProvider.Regexp("bar.*", "keyword", null);
811818
IntervalsSourceProvider provider5 = new IntervalsSourceProvider.Range("bar", "bar2", true, true, "keyword", null);
812819
IntervalsSourceProvider provider = randomFrom(provider1, provider2, provider3, provider4, provider5);
@@ -824,8 +831,10 @@ public void testMaxExpansionExceptionFailure() throws Exception {
824831
IntervalQueryBuilder queryBuilder = new IntervalQueryBuilder(TEXT_FIELD_NAME, provider);
825832
IndexSearcher searcher = newSearcher(reader);
826833
Query query = queryBuilder.toQuery(createSearchExecutionContext(searcher));
827-
RuntimeException exc = expectThrows(RuntimeException.class,
828-
() -> query.createWeight(searcher, ScoreMode.COMPLETE, 1.0f).scorer(searcher.getLeafContexts().get(0)));
834+
RuntimeException exc = expectThrows(
835+
RuntimeException.class,
836+
() -> query.createWeight(searcher, ScoreMode.COMPLETE, 1.0f).scorer(searcher.getLeafContexts().get(0))
837+
);
829838
assertThat(exc.getMessage(), containsString("expanded to too many terms (limit 1)"));
830839
} finally {
831840
IndexSearcher.setMaxClauseCount(origBoolMaxClauseCount);
@@ -896,8 +905,10 @@ public void testWildcard() throws IOException {
896905
}""", TEXT_FIELD_NAME);
897906

898907
builder = (IntervalQueryBuilder) parseQuery(fixed_field_json);
899-
expected = new IntervalQuery(TEXT_FIELD_NAME, Intervals.fixField(MASKED_FIELD,
900-
Intervals.wildcard(new BytesRef("te?m"), IndexSearcher.getMaxClauseCount())));
908+
expected = new IntervalQuery(
909+
TEXT_FIELD_NAME,
910+
Intervals.fixField(MASKED_FIELD, Intervals.wildcard(new BytesRef("te?m"), IndexSearcher.getMaxClauseCount()))
911+
);
901912
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
902913

903914
String fixed_field_json_no_positions = Strings.format("""
@@ -930,14 +941,21 @@ public void testWildcard() throws IOException {
930941
}""", TEXT_FIELD_NAME);
931942

932943
builder = (IntervalQueryBuilder) parseQuery(fixed_field_analyzer_json);
933-
expected = new IntervalQuery(TEXT_FIELD_NAME, Intervals.fixField(MASKED_FIELD,
934-
Intervals.wildcard(new BytesRef("Te?m"), IndexSearcher.getMaxClauseCount())));
944+
expected = new IntervalQuery(
945+
TEXT_FIELD_NAME,
946+
Intervals.fixField(MASKED_FIELD, Intervals.wildcard(new BytesRef("Te?m"), IndexSearcher.getMaxClauseCount()))
947+
);
935948
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
936949
}
937950

938951
private static IntervalsSource buildFuzzySource(String term, String label, int prefixLength, boolean transpositions, int editDistance) {
939-
FuzzyQuery fq =
940-
new FuzzyQuery(new Term("field", term), editDistance, prefixLength, IndexSearcher.getMaxClauseCount(), transpositions);
952+
FuzzyQuery fq = new FuzzyQuery(
953+
new Term("field", term),
954+
editDistance,
955+
prefixLength,
956+
IndexSearcher.getMaxClauseCount(),
957+
transpositions
958+
);
941959
return Intervals.multiterm(fq.getAutomata(), IndexSearcher.getMaxClauseCount(), label);
942960
}
943961

@@ -1058,8 +1076,10 @@ public void testRange() throws IOException {
10581076
}
10591077
}""", TEXT_FIELD_NAME);
10601078
IntervalQueryBuilder builder = (IntervalQueryBuilder) parseQuery(json);
1061-
Query expected = new IntervalQuery(TEXT_FIELD_NAME,
1062-
Intervals.range(new BytesRef("aaa"), new BytesRef("aab"), true, true, IndexSearcher.getMaxClauseCount()));
1079+
Query expected = new IntervalQuery(
1080+
TEXT_FIELD_NAME,
1081+
Intervals.range(new BytesRef("aaa"), new BytesRef("aab"), true, true, IndexSearcher.getMaxClauseCount())
1082+
);
10631083
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
10641084

10651085
json = Strings.format("""
@@ -1074,8 +1094,10 @@ public void testRange() throws IOException {
10741094
}
10751095
}""", TEXT_FIELD_NAME);
10761096
builder = (IntervalQueryBuilder) parseQuery(json);
1077-
expected = new IntervalQuery(TEXT_FIELD_NAME,
1078-
Intervals.range(new BytesRef("aaa"), new BytesRef("aab"), false, false, IndexSearcher.getMaxClauseCount()));
1097+
expected = new IntervalQuery(
1098+
TEXT_FIELD_NAME,
1099+
Intervals.range(new BytesRef("aaa"), new BytesRef("aab"), false, false, IndexSearcher.getMaxClauseCount())
1100+
);
10791101
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
10801102

10811103
String incomplete_range = Strings.format("""

0 commit comments

Comments
 (0)