Skip to content

Commit 165ee4a

Browse files
committed
PrefixQueryParser takes a String as value like its Builder
Relates #12032 Closes #12204
1 parent 7367af5 commit 165ee4a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ public Query fuzzyQuery(Object value, Fuzziness fuzziness, int prefixLength, int
460460
return new FuzzyQuery(createTerm(value), fuzziness.asDistance(BytesRefs.toString(value)), prefixLength, maxExpansions, transpositions);
461461
}
462462

463-
public Query prefixQuery(Object value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
463+
public Query prefixQuery(String value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
464464
PrefixQuery query = new PrefixQuery(createTerm(value));
465465
if (method != null) {
466466
query.setRewriteMethod(method);

core/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public Query termsQuery(List values, @Nullable QueryParseContext context) {
184184
}
185185

186186
@Override
187-
public Query prefixQuery(Object value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
187+
public Query prefixQuery(String value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
188188
if (indexOptions() != IndexOptions.NONE || context == null) {
189189
return super.prefixQuery(value, method, context);
190190
}

core/src/main/java/org/elasticsearch/index/query/PrefixQueryParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
5555
String rewriteMethod = null;
5656
String queryName = null;
5757

58-
Object value = null;
58+
String value = null;
5959
float boost = 1.0f;
6060
String currentFieldName = null;
6161
XContentParser.Token token;
@@ -73,7 +73,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
7373
if ("_name".equals(currentFieldName)) {
7474
queryName = parser.text();
7575
} else if ("value".equals(currentFieldName) || "prefix".equals(currentFieldName)) {
76-
value = parser.objectBytes();
76+
value = parser.textOrNull();
7777
} else if ("boost".equals(currentFieldName)) {
7878
boost = parser.floatValue();
7979
} else if ("rewrite".equals(currentFieldName)) {
@@ -88,7 +88,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
8888
queryName = parser.text();
8989
} else {
9090
fieldName = currentFieldName;
91-
value = parser.objectBytes();
91+
value = parser.textOrNull();
9292
}
9393
}
9494
}

0 commit comments

Comments
 (0)