Skip to content

Commit 7ee96a1

Browse files
committed
Fix MatchPhraseQueryTests
1 parent 82ccb4e commit 7ee96a1

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/querydsl/query/MatchPhraseQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class MatchPhraseQuery extends Query {
2828
static {
2929
BUILDER_APPLIERS = Map.ofEntries(
3030
entry(ANALYZER_FIELD.getPreferredName(), (qb, s) -> qb.analyzer(s.toString())),
31-
entry(SLOP_FIELD.getPreferredName(), (qb, i) -> qb.slop((Integer) i)),
31+
entry(SLOP_FIELD.getPreferredName(), (qb, s) -> qb.slop(Integer.parseInt(s.toString()))),
3232
entry(ZERO_TERMS_QUERY_FIELD.getPreferredName(), (qb, s) -> qb.zeroTermsQuery((String) s))
3333
);
3434
}

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/querydsl/query/MatchPhraseQueryTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package org.elasticsearch.xpack.esql.querydsl.query;
88

9+
import org.elasticsearch.ElasticsearchException;
910
import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
1011
import org.elasticsearch.index.query.ZeroTermsQueryOption;
1112
import org.elasticsearch.test.ESTestCase;
@@ -50,12 +51,12 @@ public void testQueryBuilding() {
5051
assertThat(qb.zeroTermsQuery(), equalTo(ZeroTermsQueryOption.NONE));
5152

5253
Exception e = expectThrows(IllegalArgumentException.class, () -> getBuilder(Map.of("pizza", "yummy")));
53-
assertThat(e.getMessage(), equalTo("illegal match option [pizza]"));
54+
assertThat(e.getMessage(), equalTo("illegal match_phrase option [pizza]"));
5455

5556
e = expectThrows(NumberFormatException.class, () -> getBuilder(Map.of("slop", "mushrooms")));
5657
assertThat(e.getMessage(), equalTo("For input string: \"mushrooms\""));
5758

58-
e = expectThrows(IllegalArgumentException.class, () -> getBuilder(Map.of("zero_terms_query", "pepperoni")));
59+
e = expectThrows(ElasticsearchException.class, () -> getBuilder(Map.of("zero_terms_query", "pepperoni")));
5960
assertThat(e.getMessage(), equalTo("unknown serialized type [pepperoni]"));
6061
}
6162

0 commit comments

Comments
 (0)