Skip to content

Commit 0c89360

Browse files
mayya-sharipovamayya-sharipova
committed
Spotless
1 parent 29303d4 commit 0c89360

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
@@ -676,8 +676,13 @@ public void testPrefixes() throws IOException {
676676
builder = (IntervalQueryBuilder) parseQuery(short_prefix_json);
677677
expected = new IntervalQuery(
678678
PREFIXED_FIELD,
679-
Intervals.or(Intervals.fixField(PREFIXED_FIELD + "._index_prefix",
680-
Intervals.wildcard(new BytesRef("t?"), IndexSearcher.getMaxClauseCount())), Intervals.term("t"))
679+
Intervals.or(
680+
Intervals.fixField(
681+
PREFIXED_FIELD + "._index_prefix",
682+
Intervals.wildcard(new BytesRef("t?"), IndexSearcher.getMaxClauseCount())
683+
),
684+
Intervals.term("t")
685+
)
681686
);
682687
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
683688

@@ -781,8 +786,10 @@ public void testRegexp() throws IOException {
781786
}""", TEXT_FIELD_NAME);
782787

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

788795
String fixed_field_json_no_positions = Strings.format("""
@@ -805,7 +812,7 @@ public void testRegexp() throws IOException {
805812
public void testMaxExpansionExceptionFailure() throws Exception {
806813
IntervalsSourceProvider provider1 = new IntervalsSourceProvider.Prefix("bar", "keyword", null);
807814
IntervalsSourceProvider provider2 = new IntervalsSourceProvider.Wildcard("bar*", "keyword", null);
808-
IntervalsSourceProvider provider3 = new IntervalsSourceProvider.Fuzzy("bar", 0, true, Fuzziness.fromEdits(1), "keyword",null);
815+
IntervalsSourceProvider provider3 = new IntervalsSourceProvider.Fuzzy("bar", 0, true, Fuzziness.fromEdits(1), "keyword", null);
809816
IntervalsSourceProvider provider4 = new IntervalsSourceProvider.Regexp("bar.*", "keyword", null);
810817
IntervalsSourceProvider provider5 = new IntervalsSourceProvider.Range("bar", "bar2", true, true, "keyword", null);
811818
IntervalsSourceProvider provider = randomFrom(provider1, provider2, provider3, provider4, provider5);
@@ -823,8 +830,10 @@ public void testMaxExpansionExceptionFailure() throws Exception {
823830
IntervalQueryBuilder queryBuilder = new IntervalQueryBuilder(TEXT_FIELD_NAME, provider);
824831
IndexSearcher searcher = newSearcher(reader);
825832
Query query = queryBuilder.toQuery(createSearchExecutionContext(searcher));
826-
RuntimeException exc = expectThrows(RuntimeException.class,
827-
() -> query.createWeight(searcher, ScoreMode.COMPLETE, 1.0f).scorer(searcher.getLeafContexts().get(0)));
833+
RuntimeException exc = expectThrows(
834+
RuntimeException.class,
835+
() -> query.createWeight(searcher, ScoreMode.COMPLETE, 1.0f).scorer(searcher.getLeafContexts().get(0))
836+
);
828837
assertThat(exc.getMessage(), containsString("expanded to too many terms (limit 1)"));
829838
} finally {
830839
IndexSearcher.setMaxClauseCount(origBoolMaxClauseCount);
@@ -895,8 +904,10 @@ public void testWildcard() throws IOException {
895904
}""", TEXT_FIELD_NAME);
896905

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

902913
String fixed_field_json_no_positions = Strings.format("""
@@ -929,14 +940,21 @@ public void testWildcard() throws IOException {
929940
}""", TEXT_FIELD_NAME);
930941

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

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

@@ -1057,8 +1075,10 @@ public void testRange() throws IOException {
10571075
}
10581076
}""", TEXT_FIELD_NAME);
10591077
IntervalQueryBuilder builder = (IntervalQueryBuilder) parseQuery(json);
1060-
Query expected = new IntervalQuery(TEXT_FIELD_NAME,
1061-
Intervals.range(new BytesRef("aaa"), new BytesRef("aab"), true, true, IndexSearcher.getMaxClauseCount()));
1078+
Query expected = new IntervalQuery(
1079+
TEXT_FIELD_NAME,
1080+
Intervals.range(new BytesRef("aaa"), new BytesRef("aab"), true, true, IndexSearcher.getMaxClauseCount())
1081+
);
10621082
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
10631083

10641084
json = Strings.format("""
@@ -1073,8 +1093,10 @@ public void testRange() throws IOException {
10731093
}
10741094
}""", TEXT_FIELD_NAME);
10751095
builder = (IntervalQueryBuilder) parseQuery(json);
1076-
expected = new IntervalQuery(TEXT_FIELD_NAME,
1077-
Intervals.range(new BytesRef("aaa"), new BytesRef("aab"), false, false, IndexSearcher.getMaxClauseCount()));
1096+
expected = new IntervalQuery(
1097+
TEXT_FIELD_NAME,
1098+
Intervals.range(new BytesRef("aaa"), new BytesRef("aab"), false, false, IndexSearcher.getMaxClauseCount())
1099+
);
10781100
assertEquals(expected, builder.toQuery(createSearchExecutionContext()));
10791101

10801102
String incomplete_range = Strings.format("""

0 commit comments

Comments
 (0)