diff options
Diffstat (limited to 'core/src/main/java/org/elasticsearch/rest/action/search')
3 files changed, 8 insertions, 11 deletions
diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java b/core/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java index a3c845555b..7aea9bb63f 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/search/RestExplainAction.java @@ -65,7 +65,7 @@ public class RestExplainAction extends BaseRestHandler { String queryString = request.param("q"); request.withContentOrSourceParamParserOrNull(parser -> { if (parser != null) { - explainRequest.query(RestActions.getQueryContent(parser, parseFieldMatcher)); + explainRequest.query(RestActions.getQueryContent(parser)); } else if (queryString != null) { QueryBuilder query = RestActions.urlParamsToQueryBuilder(request); explainRequest.query(query); diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java b/core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java index d265db94d9..5cfa7795e0 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/search/RestMultiSearchAction.java @@ -24,7 +24,6 @@ import org.elasticsearch.action.search.MultiSearchRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.client.node.NodeClient; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.inject.Inject; @@ -69,15 +68,14 @@ public class RestMultiSearchAction extends BaseRestHandler { @Override public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException { - MultiSearchRequest multiSearchRequest = parseRequest(request, allowExplicitIndex, parseFieldMatcher); + MultiSearchRequest multiSearchRequest = parseRequest(request, allowExplicitIndex); return channel -> client.multiSearch(multiSearchRequest, new RestToXContentListener<>(channel)); } /** * Parses a {@link RestRequest} body and returns a {@link MultiSearchRequest} */ - public static MultiSearchRequest parseRequest(RestRequest restRequest, boolean allowExplicitIndex, - ParseFieldMatcher parseFieldMatcher) throws IOException { + public static MultiSearchRequest parseRequest(RestRequest restRequest, boolean allowExplicitIndex) throws IOException { MultiSearchRequest multiRequest = new MultiSearchRequest(); if (restRequest.hasParam("max_concurrent_searches")) { multiRequest.maxConcurrentSearchRequests(restRequest.paramAsInt("max_concurrent_searches", 0)); @@ -85,7 +83,7 @@ public class RestMultiSearchAction extends BaseRestHandler { parseMultiLineRequest(restRequest, multiRequest.indicesOptions(), allowExplicitIndex, (searchRequest, parser) -> { try { - final QueryParseContext queryParseContext = new QueryParseContext(parser, parseFieldMatcher); + final QueryParseContext queryParseContext = new QueryParseContext(parser); searchRequest.source(SearchSourceBuilder.fromXContent(queryParseContext)); multiRequest.add(searchRequest); } catch (IOException e) { diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java index 68669fe07e..ba60e3068d 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java @@ -23,7 +23,6 @@ import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.client.node.NodeClient; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.Strings; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -68,7 +67,7 @@ public class RestSearchAction extends BaseRestHandler { public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException { SearchRequest searchRequest = new SearchRequest(); request.withContentOrSourceParamParserOrNull(parser -> - parseSearchRequest(searchRequest, request, parseFieldMatcher, parser)); + parseSearchRequest(searchRequest, request, parser)); return channel -> client.search(searchRequest, new RestStatusToXContentListener<>(channel)); } @@ -79,15 +78,15 @@ public class RestSearchAction extends BaseRestHandler { * @param requestContentParser body of the request to read. This method does not attempt to read the body from the {@code request} * parameter */ - public static void parseSearchRequest(SearchRequest searchRequest, RestRequest request, ParseFieldMatcher parseFieldMatcher, - XContentParser requestContentParser) throws IOException { + public static void parseSearchRequest(SearchRequest searchRequest, RestRequest request, + XContentParser requestContentParser) throws IOException { if (searchRequest.source() == null) { searchRequest.source(new SearchSourceBuilder()); } searchRequest.indices(Strings.splitStringByCommaToArray(request.param("index"))); if (requestContentParser != null) { - QueryParseContext context = new QueryParseContext(requestContentParser, parseFieldMatcher); + QueryParseContext context = new QueryParseContext(requestContentParser); searchRequest.source().parseXContent(context); } |