honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove ParseFieldMatcher usages from QueryParseContext 

Original commit: elastic/x-pack-elasticsearch@93423ca15c
This commit is contained in:
javanna 2017-01-12 11:36:29 +01:00 committed by Luca Cavanna
parent 51302608cb
commit dcf5ce7a4e
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/src/main/java/org/elasticsearch/xpack/graph/rest/action/RestGraphAction.java
View File

@ -87,7 +87,7 @@ public class RestGraphAction extends XPackRestHandler {
Hop currentHop = graphRequest.createNextHop(null); Hop currentHop = graphRequest.createNextHop(null);
try (XContentParser parser = request.contentOrSourceParamParser()) { try (XContentParser parser = request.contentOrSourceParamParser()) {
QueryParseContext context = new QueryParseContext(parser, parseFieldMatcher); QueryParseContext context = new QueryParseContext(parser);
XContentParser.Token token = parser.nextToken(); XContentParser.Token token = parser.nextToken();

5
elasticsearch/src/main/java/org/elasticsearch/xpack/watcher/support/search/WatcherSearchTemplateService.java
View File

@ -6,7 +6,6 @@
package org.elasticsearch.xpack.watcher.support.search; package org.elasticsearch.xpack.watcher.support.search;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.common.ParseFieldMatcher;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -33,13 +32,11 @@ import java.util.Map;
public class WatcherSearchTemplateService extends AbstractComponent { public class WatcherSearchTemplateService extends AbstractComponent {
private final ScriptService scriptService; private final ScriptService scriptService;
private final ParseFieldMatcher parseFieldMatcher;
private final NamedXContentRegistry xContentRegistry; private final NamedXContentRegistry xContentRegistry;
public WatcherSearchTemplateService(Settings settings, ScriptService scriptService, NamedXContentRegistry xContentRegistry) { public WatcherSearchTemplateService(Settings settings, ScriptService scriptService, NamedXContentRegistry xContentRegistry) {
super(settings); super(settings);
this.scriptService = scriptService; this.scriptService = scriptService;
this.parseFieldMatcher = new ParseFieldMatcher(settings);
this.xContentRegistry = xContentRegistry; this.xContentRegistry = xContentRegistry;
} }
@ -70,7 +67,7 @@ public class WatcherSearchTemplateService extends AbstractComponent {
BytesReference source = request.getSearchSource(); BytesReference source = request.getSearchSource();
if (source != null && source.length() > 0) { if (source != null && source.length() > 0) {
try (XContentParser parser = XContentFactory.xContent(source).createParser(xContentRegistry, source)) { try (XContentParser parser = XContentFactory.xContent(source).createParser(xContentRegistry, source)) {
sourceBuilder.parseXContent(new QueryParseContext(parser, parseFieldMatcher)); sourceBuilder.parseXContent(new QueryParseContext(parser));
searchRequest.source(sourceBuilder); searchRequest.source(sourceBuilder);
} }
} }