Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make indexQueryParserService available from ParseContext #8252

Merged
merged 1 commit into from Oct 28, 2014
Merged

Make indexQueryParserService available from ParseContext #8252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/org/elasticsearch/index/query/QueryParseContext.java
View file
Open in desktop
Expand Up @@ -82,7 +82,7 @@ public static void removeTypes() {

private boolean requireCustomQueryWrappingFilter = false;

final IndexQueryParserService indexQueryParser;
private final IndexQueryParserService indexQueryParser;

private final Map<String, Filter> namedFilters = Maps.newHashMap();

Expand Down Expand Up @@ -136,6 +136,10 @@ public void parser(XContentParser parser) {
public XContentParser parser() {
return parser;
}

public IndexQueryParserService indexQueryParserService() {
return indexQueryParser;
}

public AnalysisService analysisService() {
return indexQueryParser.analysisService;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
View file
Open in desktop
Expand Up @@ -83,7 +83,7 @@ public Query parse(QueryParseContext parseContext) throws IOException {
BytesReference querySource = (BytesReference) executable.run();

try (XContentParser qSourceParser = XContentFactory.xContent(querySource).createParser(querySource)) {
final QueryParseContext context = new QueryParseContext(parseContext.index(), parseContext.indexQueryParser);
final QueryParseContext context = new QueryParseContext(parseContext.index(), parseContext.indexQueryParserService());
context.reset(qSourceParser);
Query result = context.parseInnerQuery();
return result;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/query/WrapperFilterParser.java
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ public Filter parse(QueryParseContext parseContext) throws IOException, QueryPar

byte[] querySource = parser.binaryValue();
try (XContentParser qSourceParser = XContentFactory.xContent(querySource).createParser(querySource)) {
final QueryParseContext context = new QueryParseContext(parseContext.index(), parseContext.indexQueryParser);
final QueryParseContext context = new QueryParseContext(parseContext.index(), parseContext.indexQueryParserService());
context.reset(qSourceParser);
Filter result = context.parseInnerFilter();
parser.nextToken();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/index/query/WrapperQueryParser.java
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars

byte[] querySource = parser.binaryValue();
try (XContentParser qSourceParser = XContentFactory.xContent(querySource).createParser(querySource)) {
final QueryParseContext context = new QueryParseContext(parseContext.index(), parseContext.indexQueryParser);
final QueryParseContext context = new QueryParseContext(parseContext.index(), parseContext.indexQueryParserService());
context.reset(qSourceParser);
Query result = context.parseInnerQuery();
parser.nextToken();
Expand Down