From f576c987ce2615f77a8de75741b0f5448229805f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Mon, 3 Jul 2017 17:30:40 +0200 Subject: Remove QueryParseContext (#25486) QueryParseContext is currently only used as a wrapper for an XContentParser, so this change removes it entirely and changes the appropriate APIs that use it so far to only accept a parser instead. --- .../java/org/elasticsearch/search/collapse/CollapseBuilder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'core/src/main/java/org/elasticsearch/search/collapse') diff --git a/core/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java b/core/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java index 91dd71d8a2..696e7f2c4e 100644 --- a/core/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java @@ -35,7 +35,6 @@ import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.query.InnerHitBuilder; -import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.search.SearchContextException; import org.elasticsearch.search.internal.SearchContext; @@ -52,7 +51,7 @@ public class CollapseBuilder implements Writeable, ToXContentObject { public static final ParseField FIELD_FIELD = new ParseField("field"); public static final ParseField INNER_HITS_FIELD = new ParseField("inner_hits"); public static final ParseField MAX_CONCURRENT_GROUP_REQUESTS_FIELD = new ParseField("max_concurrent_group_searches"); - private static final ObjectParser PARSER = + private static final ObjectParser PARSER = new ObjectParser<>("collapse", CollapseBuilder::new); static { @@ -122,8 +121,8 @@ public class CollapseBuilder implements Writeable, ToXContentObject { } } - public static CollapseBuilder fromXContent(QueryParseContext context) throws IOException { - CollapseBuilder builder = PARSER.parse(context.parser(), new CollapseBuilder(), context); + public static CollapseBuilder fromXContent(XContentParser parser) throws IOException { + CollapseBuilder builder = PARSER.parse(parser, new CollapseBuilder(), null); return builder; } -- cgit v1.2.3