diff options
author | javanna <cavannaluca@gmail.com> | 2015-08-26 15:12:47 +0200 |
---|---|---|
committer | Luca Cavanna <cavannaluca@gmail.com> | 2015-08-26 15:50:01 +0200 |
commit | 94dd6c5f0eaf27002167f019c19e88a753ade5ae (patch) | |
tree | 5151b31a48d03900d131a6acf95062f0aded2f8c /core/src/main/java/org | |
parent | 0872a6ea39e8d43979234b3c586bf5a33550eef0 (diff) |
[TEST] unify parsing code in tests
Also clean up static method in MoreLikeThisFetchService, fix randomly failing TermsQueryBuilderTest#testNullValues and rename mappedFieldNamesSmall to MAPPED_LEAF_FIELD_NAMES.
Diffstat (limited to 'core/src/main/java/org')
4 files changed, 4 insertions, 10 deletions
diff --git a/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java index 1dbf6665c7..b248dc1c29 100644 --- a/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java @@ -94,7 +94,7 @@ public abstract class AbstractQueryBuilder<QB extends AbstractQueryBuilder> exte //norelease to be made abstract once all query builders override doToQuery providing their own specific implementation. protected Query doToQuery(QueryShardContext context) throws IOException { - return context.indexQueryParserService().queryParser(getName()).parse(context); + return context.indexQueryParserService().indicesQueriesRegistry().queryParsers().get(getName()).parse(context); } @Override diff --git a/core/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java b/core/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java index eff170ba5c..c2ee7d8b7e 100644 --- a/core/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java +++ b/core/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java @@ -137,13 +137,7 @@ public class IndexQueryParserService extends AbstractIndexComponent { return this.queryStringLenient; } - //norelease we might want to get rid of this as it was temporarily introduced for our default doToQuery impl - //seems to be used only in tests - public QueryParser<?> queryParser(String name) { - return indicesQueriesRegistry.queryParsers().get(name); - } - - public IndicesQueriesRegistry indicesQueriesRegistry() { + IndicesQueriesRegistry indicesQueriesRegistry() { return indicesQueriesRegistry; } diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java index 1115ffcb66..a7c4572fb1 100644 --- a/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryBuilder.java @@ -37,7 +37,7 @@ public class SpanFirstQueryBuilder extends AbstractQueryBuilder<SpanFirstQueryBu private final int end; - static final SpanFirstQueryBuilder SPAN_FIRST_QUERY_BUILDER = new SpanFirstQueryBuilder(null, -1); + static final SpanFirstQueryBuilder PROTOTYPE = new SpanFirstQueryBuilder(null, -1); /** * Query that matches spans queries defined in <code>matchBuilder</code> diff --git a/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java b/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java index 987dbc0645..995bb4dc49 100644 --- a/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java +++ b/core/src/main/java/org/elasticsearch/index/query/SpanFirstQueryParser.java @@ -89,6 +89,6 @@ public class SpanFirstQueryParser extends BaseQueryParser<SpanFirstQueryBuilder> @Override public SpanFirstQueryBuilder getBuilderPrototype() { - return SpanFirstQueryBuilder.SPAN_FIRST_QUERY_BUILDER; + return SpanFirstQueryBuilder.PROTOTYPE; } } |