diff options
| author | javanna <cavannaluca@gmail.com> | 2017-01-12 11:36:29 +0100 |
|---|---|---|
| committer | Luca Cavanna <javanna@users.noreply.github.com> | 2017-01-12 14:43:35 +0100 |
| commit | 8072f168a39aa968355c5e56688ec1d45b3a348d (patch) | |
| tree | 488d8d21de3f280cc781d52b5945843858d11651 /core/src/main/java/org/elasticsearch/search/suggest/completion | |
| parent | 83a3f0e42ca914a19cf63ce82ac6c1e617955c83 (diff) | |
Remove ParseFieldMatcher usages from QueryParseContext
Diffstat (limited to 'core/src/main/java/org/elasticsearch/search/suggest/completion')
| -rw-r--r-- | core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java index 6ed8754c97..e2f00c0001 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.suggest.completion.context; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcherSupplier; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.common.xcontent.ObjectParser; @@ -113,7 +112,7 @@ public final class GeoQueryContext implements ToXContent { return new Builder(); } - private static ObjectParser<GeoQueryContext.Builder, ParseFieldMatcherSupplier> GEO_CONTEXT_PARSER = new ObjectParser<>(NAME, null); + private static ObjectParser<GeoQueryContext.Builder, Void> GEO_CONTEXT_PARSER = new ObjectParser<>(NAME, null); static { GEO_CONTEXT_PARSER.declareField((parser, geoQueryContext, geoContextMapping) -> geoQueryContext.setGeoPoint(GeoUtils.parseGeoPoint(parser)), new ParseField(CONTEXT_VALUE), ObjectParser.ValueType.OBJECT); GEO_CONTEXT_PARSER.declareInt(GeoQueryContext.Builder::setBoost, new ParseField(CONTEXT_BOOST)); @@ -130,7 +129,7 @@ public final class GeoQueryContext implements ToXContent { XContentParser.Token token = parser.currentToken(); GeoQueryContext.Builder builder = new Builder(); if (token == XContentParser.Token.START_OBJECT) { - GEO_CONTEXT_PARSER.parse(parser, builder, context); + GEO_CONTEXT_PARSER.parse(parser, builder, null); } else if (token == XContentParser.Token.VALUE_STRING) { builder.setGeoPoint(GeoPoint.fromGeohash(parser.text())); } else { |