diff options
| author | javanna <cavannaluca@gmail.com> | 2017-01-12 11:36:29 +0100 |
|---|---|---|
| committer | Luca Cavanna <javanna@users.noreply.github.com> | 2017-01-12 14:43:35 +0100 |
| commit | 8072f168a39aa968355c5e56688ec1d45b3a348d (patch) | |
| tree | 488d8d21de3f280cc781d52b5945843858d11651 | |
| parent | 83a3f0e42ca914a19cf63ce82ac6c1e617955c83 (diff) | |
Remove ParseFieldMatcher usages from QueryParseContext
50 files changed, 131 insertions, 226 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 e48373a905..6a3cd2f1ed 100644 --- a/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java +++ b/core/src/main/java/org/elasticsearch/index/query/AbstractQueryBuilder.java @@ -26,7 +26,6 @@ import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.util.BytesRef; import org.elasticsearch.action.support.ToXContentToBytes; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcherSupplier; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -309,7 +308,7 @@ public abstract class AbstractQueryBuilder<QB extends AbstractQueryBuilder<QB>> * {@link MatchAllQueryBuilder} and {@link MatchNoneQueryBuilder} support these fields so they * should use this method. */ - protected static void declareStandardFields(AbstractObjectParser<? extends QueryBuilder, ? extends ParseFieldMatcherSupplier> parser) { + protected static void declareStandardFields(AbstractObjectParser<? extends QueryBuilder, ?> parser) { parser.declareFloat((builder, value) -> builder.boost(value), AbstractQueryBuilder.BOOST_FIELD); parser.declareString((builder, value) -> builder.queryName(value), AbstractQueryBuilder.NAME_FIELD); } diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java b/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java index df5dab9e52..74e10dcebf 100644 --- a/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java +++ b/core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java @@ -20,8 +20,6 @@ package org.elasticsearch.index.query; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcher; -import org.elasticsearch.common.ParseFieldMatcherSupplier; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.xcontent.NamedXContentRegistry.UnknownNamedObjectException; import org.elasticsearch.common.xcontent.XContentLocation; @@ -31,22 +29,21 @@ import org.elasticsearch.script.Script; import java.io.IOException; import java.util.Objects; -public class QueryParseContext implements ParseFieldMatcherSupplier { +public class QueryParseContext { private static final ParseField CACHE = new ParseField("_cache").withAllDeprecated("Elasticsearch makes its own caching decisions"); private static final ParseField CACHE_KEY = new ParseField("_cache_key").withAllDeprecated("Filters are always used as cache keys"); private final XContentParser parser; - private final ParseFieldMatcher parseFieldMatcher; private final String defaultScriptLanguage; - public QueryParseContext(XContentParser parser, ParseFieldMatcher parseFieldMatcher) { - this(Script.DEFAULT_SCRIPT_LANG, parser, parseFieldMatcher); + public QueryParseContext(XContentParser parser) { + this(Script.DEFAULT_SCRIPT_LANG, parser); } - public QueryParseContext(String defaultScriptLanguage, XContentParser parser, ParseFieldMatcher parseFieldMatcher) { + //TODO this constructor can be removed from master branch + public QueryParseContext(String defaultScriptLanguage, XContentParser parser) { this.parser = Objects.requireNonNull(parser, "parser cannot be null"); - this.parseFieldMatcher = Objects.requireNonNull(parseFieldMatcher, "parse field matcher cannot be null"); this.defaultScriptLanguage = defaultScriptLanguage; } @@ -125,11 +122,6 @@ public class QueryParseContext implements ParseFieldMatcherSupplier { return result; } - @Override - public ParseFieldMatcher getParseFieldMatcher() { - return parseFieldMatcher; - } - /** * Returns the default scripting language, that should be used if scripts don't specify the script language * explicitly. diff --git a/core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java b/core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java index 13362f676a..6ae3b423ba 100644 --- a/core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java +++ b/core/src/main/java/org/elasticsearch/index/query/QueryRewriteContext.java @@ -104,7 +104,7 @@ public class QueryRewriteContext implements ParseFieldMatcherSupplier { * are configured in the index settings. The default script language will always default to Painless. */ public QueryParseContext newParseContext(XContentParser parser) { - return new QueryParseContext(parser, indexSettings.getParseFieldMatcher()); + return new QueryParseContext(parser); } public long nowInMillis() { diff --git a/core/src/main/java/org/elasticsearch/indices/IndicesService.java b/core/src/main/java/org/elasticsearch/indices/IndicesService.java index 0ab2f3ca28..77a948ecb1 100644 --- a/core/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/core/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -43,7 +43,6 @@ import org.elasticsearch.cluster.routing.RecoverySource; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -1254,7 +1253,7 @@ public class IndicesService extends AbstractLifecycleComponent * of dependencies we pass in a function that can perform the parsing. */ ShardSearchRequest.FilterParser filterParser = bytes -> { try (XContentParser parser = XContentFactory.xContent(bytes).createParser(xContentRegistry, bytes)) { - return new QueryParseContext(parser, new ParseFieldMatcher(settings)).parseInnerQueryBuilder(); + return new QueryParseContext(parser).parseInnerQueryBuilder(); } }; String[] aliases = indexNameExpressionResolver.filteringAliases(state, index, expressions); diff --git a/core/src/main/java/org/elasticsearch/rest/action/RestActions.java b/core/src/main/java/org/elasticsearch/rest/action/RestActions.java index 4a96becbbb..74836b1dc2 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/RestActions.java +++ b/core/src/main/java/org/elasticsearch/rest/action/RestActions.java @@ -25,7 +25,6 @@ import org.elasticsearch.action.ShardOperationFailedException; import org.elasticsearch.action.support.broadcast.BroadcastResponse; import org.elasticsearch.action.support.nodes.BaseNodeResponse; import org.elasticsearch.action.support.nodes.BaseNodesResponse; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent.Params; @@ -194,8 +193,8 @@ public class RestActions { return queryBuilder; } - public static QueryBuilder getQueryContent(XContentParser requestParser, ParseFieldMatcher parseFieldMatcher) { - QueryParseContext context = new QueryParseContext(requestParser, parseFieldMatcher); + public static QueryBuilder getQueryContent(XContentParser requestParser) { + QueryParseContext context = new QueryParseContext(requestParser); return context.parseTopLevelQueryBuilder(); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java index e12baa35be..10b1fd8e8b 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestValidateQueryAction.java @@ -69,7 +69,7 @@ public class RestValidateQueryAction extends BaseRestHandler { try { request.withContentOrSourceParamParserOrNull(parser -> { if (parser != null) { - validateQueryRequest.query(RestActions.getQueryContent(parser, parseFieldMatcher)); + validateQueryRequest.query(RestActions.getQueryContent(parser)); } else if (request.hasParam("q")) { validateQueryRequest.query(RestActions.urlParamsToQueryBuilder(request)); } diff --git a/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java b/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java index 49cbcfa661..dbd0c1c1d3 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/cat/RestCountAction.java @@ -67,7 +67,7 @@ public class RestCountAction extends AbstractCatAction { searchSourceBuilder.query(queryBuilder); } } else { - searchSourceBuilder.query(RestActions.getQueryContent(parser, parseFieldMatcher)); + searchSourceBuilder.query(RestActions.getQueryContent(parser)); } }); } catch (IOException e) { diff --git a/core/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java b/core/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java index 86acb1fb1b..662bac5f61 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/document/RestCountAction.java @@ -69,7 +69,7 @@ public class RestCountAction extends BaseRestHandler { searchSourceBuilder.query(queryBuilder); } } else { - searchSourceBuilder.query(RestActions.getQueryContent(parser, parseFieldMatcher)); + searchSourceBuilder.query(RestActions.getQueryContent(parser)); } }); countRequest.routing(request.param("routing")); 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); } diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java index bc6bf845c8..e805abd86c 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java @@ -110,7 +110,7 @@ public class DateHistogramAggregationBuilder PARSER.declareLong(DateHistogramAggregationBuilder::minDocCount, Histogram.MIN_DOC_COUNT_FIELD); - PARSER.declareField(DateHistogramAggregationBuilder::extendedBounds, ExtendedBounds.PARSER::apply, + PARSER.declareField(DateHistogramAggregationBuilder::extendedBounds, parser -> ExtendedBounds.PARSER.apply(parser, null), ExtendedBounds.EXTENDED_BOUNDS_FIELD, ObjectParser.ValueType.OBJECT); PARSER.declareField(DateHistogramAggregationBuilder::order, DateHistogramAggregationBuilder::parseOrder, diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java index 8516034761..0c83cde40c 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ExtendedBounds.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.aggregations.bucket.histogram; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcherSupplier; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -45,7 +44,7 @@ public class ExtendedBounds implements ToXContent, Writeable { static final ParseField MIN_FIELD = new ParseField("min"); static final ParseField MAX_FIELD = new ParseField("max"); - public static final ConstructingObjectParser<ExtendedBounds, ParseFieldMatcherSupplier> PARSER = new ConstructingObjectParser<>( + public static final ConstructingObjectParser<ExtendedBounds, Void> PARSER = new ConstructingObjectParser<>( "extended_bounds", a -> { assert a.length == 2; Long min = null; diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java index 3cf143110f..00f0f2667e 100644 --- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java +++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java @@ -74,7 +74,7 @@ public class HistogramAggregationBuilder PARSER.declareField((histogram, extendedBounds) -> { histogram.extendedBounds(extendedBounds[0], extendedBounds[1]); - }, EXTENDED_BOUNDS_PARSER::apply, ExtendedBounds.EXTENDED_BOUNDS_FIELD, ObjectParser.ValueType.OBJECT); + }, parser -> EXTENDED_BOUNDS_PARSER.apply(parser, null), ExtendedBounds.EXTENDED_BOUNDS_FIELD, ObjectParser.ValueType.OBJECT); PARSER.declareField(HistogramAggregationBuilder::order, HistogramAggregationBuilder::parseOrder, Histogram.ORDER_FIELD, ObjectParser.ValueType.OBJECT); diff --git a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java index 6ed8754c97..e2f00c0001 100644 --- a/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java +++ b/core/src/main/java/org/elasticsearch/search/suggest/completion/context/GeoQueryContext.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.suggest.completion.context; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcherSupplier; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.common.xcontent.ObjectParser; @@ -113,7 +112,7 @@ public final class GeoQueryContext implements ToXContent { return new Builder(); } - private static ObjectParser<GeoQueryContext.Builder, ParseFieldMatcherSupplier> GEO_CONTEXT_PARSER = new ObjectParser<>(NAME, null); + private static ObjectParser<GeoQueryContext.Builder, Void> GEO_CONTEXT_PARSER = new ObjectParser<>(NAME, null); static { GEO_CONTEXT_PARSER.declareField((parser, geoQueryContext, geoContextMapping) -> geoQueryContext.setGeoPoint(GeoUtils.parseGeoPoint(parser)), new ParseField(CONTEXT_VALUE), ObjectParser.ValueType.OBJECT); GEO_CONTEXT_PARSER.declareInt(GeoQueryContext.Builder::setBoost, new ParseField(CONTEXT_BOOST)); @@ -130,7 +129,7 @@ public final class GeoQueryContext implements ToXContent { XContentParser.Token token = parser.currentToken(); GeoQueryContext.Builder builder = new Builder(); if (token == XContentParser.Token.START_OBJECT) { - GEO_CONTEXT_PARSER.parse(parser, builder, context); + GEO_CONTEXT_PARSER.parse(parser, builder, null); } else if (token == XContentParser.Token.VALUE_STRING) { builder.setGeoPoint(GeoPoint.fromGeohash(parser.text())); } else { diff --git a/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java b/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java index c4eac65c21..d249c33edc 100644 --- a/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.action.search; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -162,7 +161,7 @@ public class MultiSearchRequestTests extends ESTestCase { private MultiSearchRequest parseMultiSearchRequest(String sample) throws IOException { byte[] data = StreamsUtils.copyToBytesFromClasspath(sample); RestRequest restRequest = new FakeRestRequest.Builder(xContentRegistry()).withContent(new BytesArray(data)).build(); - return RestMultiSearchAction.parseRequest(restRequest, true, ParseFieldMatcher.EMPTY); + return RestMultiSearchAction.parseRequest(restRequest, true); } @Override diff --git a/core/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java index 833ec6c5be..339c9a9136 100644 --- a/core/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java @@ -24,7 +24,6 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.ConstantScoreQuery; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.xcontent.XContent; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -332,7 +331,7 @@ public class BoolQueryBuilderTests extends AbstractQueryTestCase<BoolQueryBuilde public void testUnknownQueryName() throws IOException { String query = "{\"bool\" : {\"must\" : { \"unknown_query\" : { } } } }"; - ParsingException ex = expectThrows(ParsingException.class, () -> parseQuery(query, ParseFieldMatcher.EMPTY)); + ParsingException ex = expectThrows(ParsingException.class, () -> parseQuery(query)); assertEquals("no [query] registered for [unknown_query]", ex.getMessage()); } @@ -356,7 +355,7 @@ public class BoolQueryBuilderTests extends AbstractQueryTestCase<BoolQueryBuilde " }\n" + " }\n" + "}"; - ParsingException ex = expectThrows(ParsingException.class, () -> parseQuery(query, ParseFieldMatcher.EMPTY)); + ParsingException ex = expectThrows(ParsingException.class, () -> parseQuery(query)); assertEquals("[match] malformed query, expected [END_OBJECT] but found [FIELD_NAME]", ex.getMessage()); } diff --git a/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java index de7762246e..ccac82362a 100644 --- a/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java @@ -24,7 +24,6 @@ import org.apache.lucene.queries.TermsQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.elasticsearch.cluster.metadata.MetaData; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.test.AbstractQueryTestCase; @@ -161,7 +160,7 @@ public class IdsQueryBuilderTests extends AbstractQueryTestCase<IdsQueryBuilder> " }\n" + "}"; - IdsQueryBuilder parsed = (IdsQueryBuilder) parseQuery(contentString, ParseFieldMatcher.EMPTY); + IdsQueryBuilder parsed = (IdsQueryBuilder) parseQuery(contentString); assertEquals(testQuery, parsed); parseQuery(contentString); @@ -174,7 +173,7 @@ public class IdsQueryBuilderTests extends AbstractQueryTestCase<IdsQueryBuilder> " \"values\" : [ ]\n" + " }\n" + "}"; - parsed = (IdsQueryBuilder) parseQuery(contentString2, ParseFieldMatcher.EMPTY); + parsed = (IdsQueryBuilder) parseQuery(contentString2); assertEquals(testQuery, parsed); parseQuery(contentString2); diff --git a/core/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java index 1f602a0d14..6ebe14620f 100644 --- a/core/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query; import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -107,7 +106,7 @@ public class InnerHitBuilderTests extends ESTestCase { } XContentParser parser = createParser(shuffled); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.EMPTY); + QueryParseContext context = new QueryParseContext(parser); InnerHitBuilder secondInnerHits = InnerHitBuilder.fromXContent(context); assertThat(innerHit, not(sameInstance(secondInnerHits))); assertThat(innerHit, equalTo(secondInnerHits)); diff --git a/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java index a5684863e5..58212d161e 100644 --- a/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java @@ -32,7 +32,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery; @@ -311,7 +310,7 @@ public class MatchQueryBuilderTests extends AbstractQueryTestCase<MatchQueryBuil " }\n" + " }\n" + "}"; - MatchQueryBuilder qb = (MatchQueryBuilder) parseQuery(json, ParseFieldMatcher.EMPTY); + MatchQueryBuilder qb = (MatchQueryBuilder) parseQuery(json); checkGeneratedJson(json, qb); assertEquals(json, expectedQB, qb); @@ -342,7 +341,7 @@ public class MatchQueryBuilderTests extends AbstractQueryTestCase<MatchQueryBuil " }\n" + " }\n" + "}"; - MatchQueryBuilder qb = (MatchQueryBuilder) parseQuery(json, ParseFieldMatcher.EMPTY); + MatchQueryBuilder qb = (MatchQueryBuilder) parseQuery(json); checkGeneratedJson(json, qb); assertEquals(json, expectedQB, qb); diff --git a/core/src/test/java/org/elasticsearch/index/query/QueryParseContextTests.java b/core/src/test/java/org/elasticsearch/index/query/QueryParseContextTests.java index c509468a1a..3f8837fe74 100644 --- a/core/src/test/java/org/elasticsearch/index/query/QueryParseContextTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/QueryParseContextTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.index.query; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; @@ -69,7 +68,7 @@ public class QueryParseContextTests extends ESTestCase { QueryBuilder query = new MatchQueryBuilder("foo", "bar"); String requestBody = "{ \"query\" : " + query.toString() + "}"; try (XContentParser parser = createParser(JsonXContent.jsonXContent, requestBody)) { - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); QueryBuilder actual = context.parseTopLevelQueryBuilder(); assertEquals(query, actual); } @@ -78,7 +77,7 @@ public class QueryParseContextTests extends ESTestCase { public void testParseTopLevelBuilderEmptyObject() throws IOException { String requestBody = "{}"; try (XContentParser parser = createParser(JsonXContent.jsonXContent, requestBody)) { - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); QueryBuilder query = context.parseTopLevelQueryBuilder(); assertNull(query); } @@ -87,7 +86,7 @@ public class QueryParseContextTests extends ESTestCase { public void testParseTopLevelBuilderUnknownParameter() throws IOException { String requestBody = "{ \"foo\" : \"bar\"}"; try (XContentParser parser = createParser(JsonXContent.jsonXContent, requestBody)) { - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); ParsingException exception = expectThrows(ParsingException.class, () -> context.parseTopLevelQueryBuilder()); assertEquals("request does not support [foo]", exception.getMessage()); } @@ -97,7 +96,7 @@ public class QueryParseContextTests extends ESTestCase { QueryBuilder query = new MatchQueryBuilder("foo", "bar"); String source = query.toString(); try (XContentParser parser = createParser(JsonXContent.jsonXContent, source)) { - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); QueryBuilder actual = context.parseInnerQueryBuilder(); assertEquals(query, actual); } @@ -108,28 +107,28 @@ public class QueryParseContextTests extends ESTestCase { try (XContentParser parser = createParser(JsonXContent.jsonXContent, source)) { parser.nextToken(); parser.nextToken(); // don't start with START_OBJECT to provoke exception - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); ParsingException exception = expectThrows(ParsingException.class, () -> context.parseInnerQueryBuilder()); assertEquals("[_na] query malformed, must start with start_object", exception.getMessage()); } source = "{}"; try (XContentParser parser = createParser(JsonXContent.jsonXContent, source)) { - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.EMPTY); + QueryParseContext context = new QueryParseContext(parser); IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> context.parseInnerQueryBuilder()); assertEquals("query malformed, empty clause found at [1:2]", exception.getMessage()); } source = "{ \"foo\" : \"bar\" }"; try (XContentParser parser = createParser(JsonXContent.jsonXContent, source)) { - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); ParsingException exception = expectThrows(ParsingException.class, () -> context.parseInnerQueryBuilder()); assertEquals("[foo] query malformed, no start_object after query name", exception.getMessage()); } source = "{ \"foo\" : {} }"; try (XContentParser parser = createParser(JsonXContent.jsonXContent, source)) { - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); ParsingException exception = expectThrows(ParsingException.class, () -> context.parseInnerQueryBuilder()); assertEquals("no [query] registered for [foo]", exception.getMessage()); } diff --git a/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java index 8afe80e5f7..b26b93cf1a 100644 --- a/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java @@ -22,7 +22,6 @@ package org.elasticsearch.index.query; import org.apache.lucene.search.Query; import org.apache.lucene.search.spans.SpanNearQuery; import org.apache.lucene.search.spans.SpanQuery; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.test.AbstractQueryTestCase; @@ -149,7 +148,7 @@ public class SpanNearQueryBuilderTests extends AbstractQueryTestCase<SpanNearQue final ParsingException e = expectThrows( ParsingException.class, - () -> parseQuery(json, ParseFieldMatcher.EMPTY)); + () -> parseQuery(json)); assertThat(e.getMessage(), containsString("[span_near] query does not support [collect_payloads]")); } } diff --git a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java index 50c63e66f5..993897fe09 100644 --- a/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java @@ -20,12 +20,10 @@ package org.elasticsearch.index.query.functionscore; import com.fasterxml.jackson.core.JsonParseException; - import org.apache.lucene.index.Term; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.geo.GeoPoint; @@ -39,7 +37,6 @@ import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.xcontent.XContent; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.query.AbstractQueryBuilder; import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; @@ -617,7 +614,7 @@ public class FunctionScoreQueryBuilderTests extends AbstractQueryTestCase<Functi " }\n" + "}"; - FunctionScoreQueryBuilder parsed = (FunctionScoreQueryBuilder) parseQuery(json, ParseFieldMatcher.EMPTY); + FunctionScoreQueryBuilder parsed = (FunctionScoreQueryBuilder) parseQuery(json); // this should be equivalent to the same with a match_all query String expected = "{\n" + @@ -639,7 +636,7 @@ public class FunctionScoreQueryBuilderTests extends AbstractQueryTestCase<Functi " }\n" + "}"; - FunctionScoreQueryBuilder expectedParsed = (FunctionScoreQueryBuilder) parseQuery(json, ParseFieldMatcher.EMPTY); + FunctionScoreQueryBuilder expectedParsed = (FunctionScoreQueryBuilder) parseQuery(json); assertEquals(expectedParsed, parsed); assertEquals(json, 2, parsed.filterFunctionBuilders().length); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java index 936442f16a..4ddab52110 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.IndexService; @@ -59,7 +58,7 @@ public class AggregationCollectorTests extends ESSingleNodeTestCase { private boolean needsScores(IndexService index, String agg) throws IOException { XContentParser aggParser = createParser(JsonXContent.jsonXContent, agg); - QueryParseContext parseContext = new QueryParseContext(aggParser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(aggParser); aggParser.nextToken(); SearchContext context = createSearchContext(index); final AggregatorFactories factories = AggregatorFactories.parseAggregators(parseContext).build(context, null); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java index 2abb4dcebc..2aba0ed59e 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregatorFactoriesTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -47,8 +46,6 @@ public class AggregatorFactoriesTests extends ESTestCase { private String[] currentTypes; private NamedXContentRegistry xContentRegistry; - protected ParseFieldMatcher parseFieldMatcher; - @Override public void setUp() throws Exception { super.setUp(); @@ -65,10 +62,8 @@ public class AggregatorFactoriesTests extends ESTestCase { currentTypes[i] = type; } xContentRegistry = new NamedXContentRegistry(new SearchModule(settings, false, emptyList()).getNamedXContents()); - parseFieldMatcher = ParseFieldMatcher.STRICT; } - public void testGetAggregatorFactories_returnsUnmodifiableList() { AggregatorFactories.Builder builder = new AggregatorFactories.Builder().addAggregator(AggregationBuilders.avg("foo")); List<AggregationBuilder> aggregatorFactories = builder.getAggregatorFactories(); @@ -102,7 +97,7 @@ public class AggregatorFactoriesTests extends ESTestCase { .endObject() .endObject(); XContentParser parser = createParser(source); - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); assertSame(XContentParser.Token.START_OBJECT, parser.nextToken()); Exception e = expectThrows(ParsingException.class, () -> AggregatorFactories.parseAggregators(parseContext)); assertThat(e.toString(), containsString("Found two aggregation type definitions in [in_stock]: [filter] and [terms]")); @@ -135,7 +130,7 @@ public class AggregatorFactoriesTests extends ESTestCase { .endObject() .endObject(); XContentParser parser = createParser(source); - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); assertSame(XContentParser.Token.START_OBJECT, parser.nextToken()); Exception e = expectThrows(ParsingException.class, () -> AggregatorFactories.parseAggregators(parseContext)); assertThat(e.toString(), containsString("Found two sub aggregation definitions under [by_date]")); @@ -170,7 +165,7 @@ public class AggregatorFactoriesTests extends ESTestCase { .endObject() .endObject(); XContentParser parser = createParser(source); - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); assertSame(XContentParser.Token.START_OBJECT, parser.nextToken()); Exception e = expectThrows(ParsingException.class, () -> AggregatorFactories.parseAggregators(parseContext)); assertThat(e.toString(), containsString("Invalid aggregation name [" + name + "]")); @@ -194,7 +189,7 @@ public class AggregatorFactoriesTests extends ESTestCase { .endObject() .endObject(); XContentParser parser = createParser(source); - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); assertSame(XContentParser.Token.START_OBJECT, parser.nextToken()); Exception e = expectThrows(ParsingException.class, () -> AggregatorFactories.parseAggregators(parseContext)); assertThat(e.toString(), containsString("Two sibling aggregations cannot have the same name: [" + name + "]")); @@ -219,7 +214,7 @@ public class AggregatorFactoriesTests extends ESTestCase { .endObject() .endObject(); XContentParser parser = createParser(source); - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); assertSame(XContentParser.Token.START_OBJECT, parser.nextToken()); Exception e = expectThrows(ParsingException.class, () -> AggregatorFactories.parseAggregators(parseContext)); assertThat(e.toString(), containsString("Expected [START_OBJECT] under [field], but got a [VALUE_STRING] in [cardinality]")); @@ -244,7 +239,7 @@ public class AggregatorFactoriesTests extends ESTestCase { .endObject() .endObject(); XContentParser parser = createParser(source); - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); assertSame(XContentParser.Token.START_OBJECT, parser.nextToken()); Exception e = expectThrows(ParsingException.class, () -> AggregatorFactories.parseAggregators(parseContext)); assertThat(e.toString(), containsString("Expected [START_OBJECT] under [field], but got a [VALUE_STRING] in [tag_count]")); @@ -254,5 +249,4 @@ public class AggregatorFactoriesTests extends ESTestCase { protected NamedXContentRegistry xContentRegistry() { return xContentRegistry; } - } diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/BaseAggregationTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/BaseAggregationTestCase.java index 2d4b80932b..162b7bcd1b 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/BaseAggregationTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/BaseAggregationTestCase.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.NamedWriteableAwareStreamInput; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -64,8 +63,6 @@ public abstract class BaseAggregationTestCase<AB extends AbstractAggregationBuil private NamedWriteableRegistry namedWriteableRegistry; private NamedXContentRegistry xContentRegistry; - protected ParseFieldMatcher parseFieldMatcher; - protected abstract AB createTestAggregatorBuilder(); /** @@ -91,7 +88,6 @@ public abstract class BaseAggregationTestCase<AB extends AbstractAggregationBuil String type = randomAsciiOfLengthBetween(1, 10); currentTypes[i] = type; } - parseFieldMatcher = ParseFieldMatcher.STRICT; } @Override @@ -121,7 +117,7 @@ public abstract class BaseAggregationTestCase<AB extends AbstractAggregationBuil } protected AggregationBuilder parse(XContentParser parser) throws IOException { - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); assertSame(XContentParser.Token.START_OBJECT, parser.nextToken()); AggregatorFactories.Builder parsed = AggregatorFactories.parseAggregators(parseContext); assertThat(parsed.getAggregatorFactories(), hasSize(1)); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java index 9aaa284819..41bbdaae66 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/BasePipelineAggregationTestCase.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.aggregations; import org.elasticsearch.cluster.metadata.MetaData; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.NamedWriteableAwareStreamInput; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -66,8 +65,6 @@ public abstract class BasePipelineAggregationTestCase<AF extends AbstractPipelin private NamedWriteableRegistry namedWriteableRegistry; private NamedXContentRegistry xContentRegistry; - protected ParseFieldMatcher parseFieldMatcher; - protected abstract AF createTestAggregatorFactory(); /** @@ -93,7 +90,6 @@ public abstract class BasePipelineAggregationTestCase<AF extends AbstractPipelin String type = randomAsciiOfLengthBetween(1, 10); currentTypes[i] = type; } - parseFieldMatcher = ParseFieldMatcher.STRICT; } /** @@ -121,7 +117,7 @@ public abstract class BasePipelineAggregationTestCase<AF extends AbstractPipelin } protected PipelineAggregationBuilder parse(XContentParser parser) throws IOException { - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); assertSame(XContentParser.Token.START_OBJECT, parser.nextToken()); AggregatorFactories.Builder parsed = AggregatorFactories.parseAggregators(parseContext); assertThat(parsed.getAggregatorFactories(), hasSize(0)); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java index d52cc108d5..873084b3a8 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.search.aggregations.bucket.geogrid; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; @@ -32,7 +31,7 @@ public class GeoHashGridParserTests extends ESTestCase { int precision = randomIntBetween(1, 12); XContentParser stParser = createParser(JsonXContent.jsonXContent, "{\"field\":\"my_loc\", \"precision\":" + precision + ", \"size\": 500, \"shard_size\": 550}"); - QueryParseContext parseContext = new QueryParseContext(stParser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(stParser); XContentParser.Token token = stParser.nextToken(); assertSame(XContentParser.Token.START_OBJECT, token); // can create a factory @@ -43,7 +42,7 @@ public class GeoHashGridParserTests extends ESTestCase { int precision = randomIntBetween(1, 12); XContentParser stParser = createParser(JsonXContent.jsonXContent, "{\"field\":\"my_loc\", \"precision\":\"" + precision + "\", \"size\": \"500\", \"shard_size\": \"550\"}"); - QueryParseContext parseContext = new QueryParseContext(stParser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(stParser); XContentParser.Token token = stParser.nextToken(); assertSame(XContentParser.Token.START_OBJECT, token); // can create a factory @@ -52,7 +51,7 @@ public class GeoHashGridParserTests extends ESTestCase { public void testParseErrorOnNonIntPrecision() throws Exception { XContentParser stParser = createParser(JsonXContent.jsonXContent, "{\"field\":\"my_loc\", \"precision\":\"2.0\"}"); - QueryParseContext parseContext = new QueryParseContext(stParser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(stParser); XContentParser.Token token = stParser.nextToken(); assertSame(XContentParser.Token.START_OBJECT, token); try { @@ -66,7 +65,7 @@ public class GeoHashGridParserTests extends ESTestCase { public void testParseErrorOnBooleanPrecision() throws Exception { XContentParser stParser = createParser(JsonXContent.jsonXContent, "{\"field\":\"my_loc\", \"precision\":false}"); - QueryParseContext parseContext = new QueryParseContext(stParser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(stParser); XContentParser.Token token = stParser.nextToken(); assertSame(XContentParser.Token.START_OBJECT, token); try { @@ -79,7 +78,7 @@ public class GeoHashGridParserTests extends ESTestCase { public void testParseErrorOnPrecisionOutOfRange() throws Exception { XContentParser stParser = createParser(JsonXContent.jsonXContent, "{\"field\":\"my_loc\", \"precision\":\"13\"}"); - QueryParseContext parseContext = new QueryParseContext(stParser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(stParser); XContentParser.Token token = stParser.nextToken(); assertSame(XContentParser.Token.START_OBJECT, token); try { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java index 0db3fd6aa3..ccc3b2f09a 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.aggregations.bucket.significant; import org.apache.lucene.util.BytesRef; import org.elasticsearch.Version; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.io.stream.InputStreamStreamInput; import org.elasticsearch.common.io.stream.NamedWriteableAwareStreamInput; @@ -48,7 +47,6 @@ import org.elasticsearch.search.aggregations.bucket.significant.heuristics.Perce import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristic; import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicParser; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; -import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.TestSearchContext; @@ -219,57 +217,56 @@ public class SignificanceHeuristicTests extends ESTestCase { public void testBuilderAndParser() throws Exception { SearchModule searchModule = new SearchModule(Settings.EMPTY, false, emptyList()); ParseFieldRegistry<SignificanceHeuristicParser> heuristicParserMapper = searchModule.getSignificanceHeuristicParserRegistry(); - SearchContext searchContext = new SignificantTermsTestSearchContext(); // test jlh with string - assertTrue(parseFromString(heuristicParserMapper, searchContext, "\"jlh\":{}") instanceof JLHScore); + assertTrue(parseFromString(heuristicParserMapper, "\"jlh\":{}") instanceof JLHScore); // test gnd with string - assertTrue(parseFromString(heuristicParserMapper, searchContext, "\"gnd\":{}") instanceof GND); + assertTrue(parseFromString(heuristicParserMapper, "\"gnd\":{}") instanceof GND); // test mutual information with string boolean includeNegatives = randomBoolean(); boolean backgroundIsSuperset = randomBoolean(); String mutual = "\"mutual_information\":{\"include_negatives\": " + includeNegatives + ", \"background_is_superset\":" + backgroundIsSuperset + "}"; assertEquals(new MutualInformation(includeNegatives, backgroundIsSuperset), - parseFromString(heuristicParserMapper, searchContext, mutual)); + parseFromString(heuristicParserMapper, mutual)); String chiSquare = "\"chi_square\":{\"include_negatives\": " + includeNegatives + ", \"background_is_superset\":" + backgroundIsSuperset + "}"; assertEquals(new ChiSquare(includeNegatives, backgroundIsSuperset), - parseFromString(heuristicParserMapper, searchContext, chiSquare)); + parseFromString(heuristicParserMapper, chiSquare)); // test with builders - assertThat(parseFromBuilder(heuristicParserMapper, searchContext, new JLHScore()), instanceOf(JLHScore.class)); - assertThat(parseFromBuilder(heuristicParserMapper, searchContext, new GND(backgroundIsSuperset)), instanceOf(GND.class)); + assertThat(parseFromBuilder(heuristicParserMapper, new JLHScore()), instanceOf(JLHScore.class)); + assertThat(parseFromBuilder(heuristicParserMapper, new GND(backgroundIsSuperset)), instanceOf(GND.class)); assertEquals(new MutualInformation(includeNegatives, backgroundIsSuperset), - parseFromBuilder(heuristicParserMapper, searchContext, new MutualInformation(includeNegatives, backgroundIsSuperset))); + parseFromBuilder(heuristicParserMapper, new MutualInformation(includeNegatives, backgroundIsSuperset))); assertEquals(new ChiSquare(includeNegatives, backgroundIsSuperset), - parseFromBuilder(heuristicParserMapper, searchContext, new ChiSquare(includeNegatives, backgroundIsSuperset))); + parseFromBuilder(heuristicParserMapper, new ChiSquare(includeNegatives, backgroundIsSuperset))); // test exceptions String faultyHeuristicdefinition = "\"mutual_information\":{\"include_negatives\": false, \"some_unknown_field\": false}"; String expectedError = "unknown field [some_unknown_field]"; - checkParseException(heuristicParserMapper, searchContext, faultyHeuristicdefinition, expectedError); + checkParseException(heuristicParserMapper, faultyHeuristicdefinition, expectedError); faultyHeuristicdefinition = "\"chi_square\":{\"unknown_field\": true}"; expectedError = "unknown field [unknown_field]"; - checkParseException(heuristicParserMapper, searchContext, faultyHeuristicdefinition, expectedError); + checkParseException(heuristicParserMapper, faultyHeuristicdefinition, expectedError); faultyHeuristicdefinition = "\"jlh\":{\"unknown_field\": true}"; expectedError = "expected an empty object, but found "; - checkParseException(heuristicParserMapper, searchContext, faultyHeuristicdefinition, expectedError); + checkParseException(heuristicParserMapper, faultyHeuristicdefinition, expectedError); faultyHeuristicdefinition = "\"gnd\":{\"unknown_field\": true}"; expectedError = "unknown field [unknown_field]"; - checkParseException(heuristicParserMapper, searchContext, faultyHeuristicdefinition, expectedError); + checkParseException(heuristicParserMapper, faultyHeuristicdefinition, expectedError); } protected void checkParseException(ParseFieldRegistry<SignificanceHeuristicParser> significanceHeuristicParserRegistry, - SearchContext searchContext, String faultyHeuristicDefinition, String expectedError) throws IOException { + String faultyHeuristicDefinition, String expectedError) throws IOException { try { XContentParser stParser = createParser(JsonXContent.jsonXContent, "{\"field\":\"text\", " + faultyHeuristicDefinition + ",\"min_doc_count\":200}"); - QueryParseContext parseContext = new QueryParseContext(stParser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(stParser); stParser.nextToken(); SignificantTermsAggregationBuilder.getParser(significanceHeuristicParserRegistry).parse("testagg", parseContext); fail(); @@ -279,19 +276,19 @@ public class SignificanceHeuristicTests extends ESTestCase { } protected SignificanceHeuristic parseFromBuilder(ParseFieldRegistry<SignificanceHeuristicParser> significanceHeuristicParserRegistry, - SearchContext searchContext, SignificanceHeuristic significanceHeuristic) throws IOException { + SignificanceHeuristic significanceHeuristic) throws IOException { SignificantTermsAggregationBuilder stBuilder = significantTerms("testagg"); stBuilder.significanceHeuristic(significanceHeuristic).field("text").minDocCount(200); XContentBuilder stXContentBuilder = XContentFactory.jsonBuilder(); stBuilder.internalXContent(stXContentBuilder, null); XContentParser stParser = createParser(JsonXContent.jsonXContent, stXContentBuilder.string()); - return parseSignificanceHeuristic(significanceHeuristicParserRegistry, searchContext, stParser); + return parseSignificanceHeuristic(significanceHeuristicParserRegistry, stParser); } private SignificanceHeuristic parseSignificanceHeuristic( - ParseFieldRegistry<SignificanceHeuristicParser> significanceHeuristicParserRegistry, SearchContext searchContext, + ParseFieldRegistry<SignificanceHeuristicParser> significanceHeuristicParserRegistry, XContentParser stParser) throws IOException { - QueryParseContext parseContext = new QueryParseContext(stParser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(stParser); stParser.nextToken(); SignificantTermsAggregationBuilder aggregatorFactory = (SignificantTermsAggregationBuilder) SignificantTermsAggregationBuilder.getParser( @@ -304,10 +301,10 @@ public class SignificanceHeuristicTests extends ESTestCase { } protected SignificanceHeuristic parseFromString(ParseFieldRegistry<SignificanceHeuristicParser> significanceHeuristicParserRegistry, - SearchContext searchContext, String heuristicString) throws IOException { + String heuristicString) throws IOException { XContentParser stParser = createParser(JsonXContent.jsonXContent, "{\"field\":\"text\", " + heuristicString + ", \"min_doc_count\":200}"); - return parseSignificanceHeuristic(significanceHeuristicParserRegistry, searchContext, stParser); + return parseSignificanceHeuristic(significanceHeuristicParserRegistry, stParser); } void testBackgroundAssertions(SignificanceHeuristic heuristicIsSuperset, SignificanceHeuristic heuristicNotSuperset) { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java index bf8e742174..226f3aeada 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/FiltersTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.aggregations.metrics; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; @@ -88,7 +87,7 @@ public class FiltersTests extends BaseAggregationTestCase<FiltersAggregationBuil builder.endObject(); XContentParser parser = createParser(shuffleXContent(builder)); parser.nextToken(); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); FiltersAggregationBuilder filters = FiltersAggregationBuilder.parse("agg_name", context); // The other bucket is disabled by default assertFalse(filters.otherBucket()); @@ -100,7 +99,7 @@ public class FiltersTests extends BaseAggregationTestCase<FiltersAggregationBuil builder.endObject(); parser = createParser(shuffleXContent(builder)); parser.nextToken(); - context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + context = new QueryParseContext(parser); filters = FiltersAggregationBuilder.parse("agg_name", context); // but setting a key enables it automatically assertTrue(filters.otherBucket()); @@ -113,7 +112,7 @@ public class FiltersTests extends BaseAggregationTestCase<FiltersAggregationBuil builder.endObject(); parser = createParser(shuffleXContent(builder)); parser.nextToken(); - context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + context = new QueryParseContext(parser); filters = FiltersAggregationBuilder.parse("agg_name", context); // unless the other bucket is explicitly disabled assertFalse(filters.otherBucket()); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java index bec9ebc633..55fe1b44b7 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java @@ -187,7 +187,7 @@ public class TopHitsTests extends BaseAggregationTestCase<TopHitsAggregationBuil " }\n" + "}"; XContentParser parser = createParser(JsonXContent.jsonXContent, source); - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); assertSame(XContentParser.Token.START_OBJECT, parser.nextToken()); Exception e = expectThrows(AggregationInitializationException.class, () -> AggregatorFactories.parseAggregators(parseContext)); assertThat(e.toString(), containsString("Aggregator [top_tags_hits] of type [top_hits] cannot accept sub-aggregations")); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java index 1f4570b8b2..42f0df4beb 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java @@ -25,7 +25,6 @@ import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LongBitSet; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; @@ -42,8 +41,6 @@ import java.util.Collections; import java.util.TreeSet; public class IncludeExcludeTests extends ESTestCase { - private final ParseFieldMatcher parseFieldMatcher = ParseFieldMatcher.STRICT; - public void testEmptyTermsWithOrds() throws IOException { IncludeExclude inexcl = new IncludeExclude( new TreeSet<>(Collections.singleton(new BytesRef("foo"))), @@ -234,7 +231,7 @@ public class IncludeExcludeTests extends ESTestCase { assertEquals(field.getPreferredName(), parser.currentName()); token = parser.nextToken(); - QueryParseContext parseContext = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(parser); if (field.getPreferredName().equalsIgnoreCase("include")) { return IncludeExclude.parseInclude(parser, parseContext); } else if (field.getPreferredName().equalsIgnoreCase("exclude")) { @@ -274,7 +271,7 @@ public class IncludeExcludeTests extends ESTestCase { builder.endObject(); XContentParser parser = createParser(builder); - QueryParseContext parseContext = new QueryParseContext(parser, parseFieldMatcher); + QueryParseContext parseContext = new QueryParseContext(parser); XContentParser.Token token = parser.nextToken(); assertEquals(token, XContentParser.Token.START_OBJECT); diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java index 69b4d70b06..a4096c0e34 100644 --- a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.builder; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -65,12 +64,7 @@ public class SearchSourceBuilderTests extends AbstractSearchTestCase { } private void assertParseSearchSource(SearchSourceBuilder testBuilder, XContentParser parser) throws IOException { - assertParseSearchSource(testBuilder, parser, ParseFieldMatcher.STRICT); - } - - private void assertParseSearchSource(SearchSourceBuilder testBuilder, XContentParser parser, ParseFieldMatcher pfm) - throws IOException { - QueryParseContext parseContext = new QueryParseContext(parser, pfm); + QueryParseContext parseContext = new QueryParseContext(parser); if (randomBoolean()) { parser.nextToken(); // sometimes we move it on the START_OBJECT to // test the embedded case @@ -82,7 +76,7 @@ public class SearchSourceBuilderTests extends AbstractSearchTestCase { } private QueryParseContext createParseContext(XContentParser parser) { - return new QueryParseContext(parser, ParseFieldMatcher.STRICT); + return new QueryParseContext(parser); } public void testSerialization() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java index 76a49bf56c..944427b7e1 100644 --- a/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java @@ -22,7 +22,6 @@ package org.elasticsearch.search.fetch.subphase.highlight; import org.apache.lucene.search.Query; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -129,7 +128,7 @@ public class HighlightBuilderTests extends ESTestCase { XContentBuilder shuffled = shuffleXContent(builder); XContentParser parser = createParser(shuffled); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.EMPTY); + QueryParseContext context = new QueryParseContext(parser); parser.nextToken(); HighlightBuilder secondHighlightBuilder; try { @@ -170,7 +169,7 @@ public class HighlightBuilderTests extends ESTestCase { private <T extends Throwable> T expectParseThrows(Class<T> exceptionClass, String highlightElement) throws IOException { XContentParser parser = createParser(JsonXContent.jsonXContent, highlightElement); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); return expectThrows(exceptionClass, () -> HighlightBuilder.fromXContent(context)); } @@ -380,7 +379,7 @@ public class HighlightBuilderTests extends ESTestCase { "}\n"; XContentParser parser = createParser(JsonXContent.jsonXContent, highlightElement); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.EMPTY); + QueryParseContext context = new QueryParseContext(parser); HighlightBuilder highlightBuilder = HighlightBuilder.fromXContent(context); assertArrayEquals("setting tags_schema 'styled' should alter pre_tags", HighlightBuilder.DEFAULT_STYLED_PRE_TAG, highlightBuilder.preTags()); @@ -392,7 +391,7 @@ public class HighlightBuilderTests extends ESTestCase { "}\n"; parser = createParser(JsonXContent.jsonXContent, highlightElement); - context = new QueryParseContext(parser, ParseFieldMatcher.EMPTY); + context = new QueryParseContext(parser); highlightBuilder = HighlightBuilder.fromXContent(context); assertArrayEquals("setting tags_schema 'default' should alter pre_tags", HighlightBuilder.DEFAULT_PRE_TAGS, highlightBuilder.preTags()); @@ -413,21 +412,21 @@ public class HighlightBuilderTests extends ESTestCase { String highlightElement = "{ }"; XContentParser parser = createParser(JsonXContent.jsonXContent, highlightElement); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.EMPTY); + QueryParseContext context = new QueryParseContext(parser); HighlightBuilder highlightBuilder = HighlightBuilder.fromXContent(context); assertEquals("expected plain HighlightBuilder", new HighlightBuilder(), highlightBuilder); highlightElement = "{ \"fields\" : { } }"; parser = createParser(JsonXContent.jsonXContent, highlightElement); - context = new QueryParseContext(parser, ParseFieldMatcher.EMPTY); + context = new QueryParseContext(parser); highlightBuilder = HighlightBuilder.fromXContent(context); assertEquals("defining no field should return plain HighlightBuilder", new HighlightBuilder(), highlightBuilder); highlightElement = "{ \"fields\" : { \"foo\" : { } } }"; parser = createParser(JsonXContent.jsonXContent, highlightElement); - context = new QueryParseContext(parser, ParseFieldMatcher.EMPTY); + context = new QueryParseContext(parser); highlightBuilder = HighlightBuilder.fromXContent(context); assertEquals("expected HighlightBuilder with field", new HighlightBuilder().field(new Field("foo")), highlightBuilder); } diff --git a/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java b/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java index a53a41f4c1..728eee4a85 100644 --- a/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java +++ b/core/src/test/java/org/elasticsearch/search/internal/ShardSearchTransportRequestTests.java @@ -24,7 +24,6 @@ import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.compress.CompressedXContent; @@ -164,7 +163,7 @@ public class ShardSearchTransportRequestTests extends AbstractSearchTestCase { public QueryBuilder aliasFilter(IndexMetaData indexMetaData, String... aliasNames) { ShardSearchRequest.FilterParser filterParser = bytes -> { try (XContentParser parser = XContentFactory.xContent(bytes).createParser(xContentRegistry(), bytes)) { - return new QueryParseContext(parser, new ParseFieldMatcher(Settings.EMPTY)).parseInnerQueryBuilder(); + return new QueryParseContext(parser).parseInnerQueryBuilder(); } }; return ShardSearchRequest.parseAliasFilter(filterParser, indexMetaData, aliasNames); diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java index d4429a5502..53277bd5b3 100644 --- a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescoreBuilderTests.java @@ -23,7 +23,6 @@ import org.apache.lucene.search.Query; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.settings.Settings; @@ -119,7 +118,7 @@ public class QueryRescoreBuilderTests extends ESTestCase { XContentParser parser = createParser(shuffled); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); parser.nextToken(); RescoreBuilder<?> secondRescoreBuilder = RescoreBuilder.parseFromXContent(context); assertNotSame(rescoreBuilder, secondRescoreBuilder); @@ -252,7 +251,7 @@ public class QueryRescoreBuilderTests extends ESTestCase { */ private QueryParseContext createContext(String rescoreElement) throws IOException { XContentParser parser = createParser(JsonXContent.jsonXContent, rescoreElement); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); // move to first token, this is where the internal fromXContent assertTrue(parser.nextToken() == XContentParser.Token.START_OBJECT); return context; diff --git a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java b/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java index 8e372d9523..cb45208a39 100644 --- a/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.searchafter; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.text.Text; @@ -28,7 +27,6 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; @@ -168,7 +166,6 @@ public class SearchAfterBuilderTests extends ESTestCase { searchAfterBuilder.innerToXContent(builder); builder.endObject(); XContentParser parser = createParser(shuffleXContent(builder)); - new QueryParseContext(parser, ParseFieldMatcher.STRICT); parser.nextToken(); parser.nextToken(); parser.nextToken(); diff --git a/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java b/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java index a51fc8d412..9de5ee2a58 100644 --- a/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java @@ -30,7 +30,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; @@ -104,7 +103,7 @@ public class SliceBuilderTests extends ESTestCase { sliceBuilder.innerToXContent(builder); builder.endObject(); XContentParser parser = createParser(shuffleXContent(builder)); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); SliceBuilder secondSliceBuilder = SliceBuilder.fromXContent(context); assertNotSame(sliceBuilder, secondSliceBuilder); assertEquals(sliceBuilder, secondSliceBuilder); diff --git a/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java b/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java index fda35d8bd7..23bcbe9191 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java @@ -23,7 +23,6 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.util.Accountable; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -146,7 +145,7 @@ public abstract class AbstractSortTestCase<T extends SortBuilder<T>> extends EST String elementName = itemParser.currentName(); itemParser.nextToken(); - QueryParseContext context = new QueryParseContext(itemParser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(itemParser); T parsedItem = fromXContent(context, elementName); assertNotSame(testItem, parsedItem); assertEquals(testItem, parsedItem); diff --git a/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java index bb9761c0f2..111d4256eb 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java @@ -20,7 +20,6 @@ x * Licensed to Elasticsearch under one or more contributor package org.elasticsearch.search.sort; import org.apache.lucene.search.SortField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.query.QueryParseContext; @@ -134,7 +133,7 @@ public class FieldSortBuilderTests extends AbstractSortTestCase<FieldSortBuilder parser.nextToken(); parser.nextToken(); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); try { FieldSortBuilder.fromXContent(context, ""); diff --git a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java index 69d95e328b..1754b2126b 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java @@ -23,7 +23,6 @@ package org.elasticsearch.search.sort; import org.apache.lucene.document.LatLonDocValuesField; import org.apache.lucene.search.SortField; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; @@ -207,7 +206,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc XContentParser itemParser = createParser(JsonXContent.jsonXContent, json); itemParser.nextToken(); - QueryParseContext context = new QueryParseContext(itemParser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(itemParser); try { GeoDistanceSortBuilder.fromXContent(context, ""); @@ -228,7 +227,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc XContentParser itemParser = createParser(JsonXContent.jsonXContent, json); itemParser.nextToken(); - QueryParseContext context = new QueryParseContext(itemParser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(itemParser); try { GeoDistanceSortBuilder.fromXContent(context, ""); @@ -245,7 +244,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc XContentParser itemParser = createParser(JsonXContent.jsonXContent, json); itemParser.nextToken(); - QueryParseContext context = new QueryParseContext(itemParser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(itemParser); try { GeoDistanceSortBuilder item = GeoDistanceSortBuilder.fromXContent(context, ""); @@ -272,7 +271,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc XContentParser itemParser = createParser(JsonXContent.jsonXContent, json); itemParser.nextToken(); - QueryParseContext context = new QueryParseContext(itemParser, ParseFieldMatcher.EMPTY); + QueryParseContext context = new QueryParseContext(itemParser); GeoDistanceSortBuilder.fromXContent(context, ""); assertWarnings("Deprecated field [coerce] used, replaced by [validation_method]"); } @@ -291,7 +290,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc XContentParser itemParser = createParser(JsonXContent.jsonXContent, json); itemParser.nextToken(); - QueryParseContext context = new QueryParseContext(itemParser, ParseFieldMatcher.EMPTY); + QueryParseContext context = new QueryParseContext(itemParser); GeoDistanceSortBuilder.fromXContent(context, ""); assertWarnings("Deprecated field [ignore_malformed] used, replaced by [validation_method]"); } @@ -309,7 +308,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc XContentParser itemParser = createParser(JsonXContent.jsonXContent, json); itemParser.nextToken(); - QueryParseContext context = new QueryParseContext(itemParser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(itemParser); IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> GeoDistanceSortBuilder.fromXContent(context, "")); assertEquals("sort_mode [sum] isn't supported for sorting by geo distance", e.getMessage()); @@ -334,7 +333,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc XContentParser itemParser = createParser(JsonXContent.jsonXContent, json); itemParser.nextToken(); - QueryParseContext context = new QueryParseContext(itemParser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(itemParser); GeoDistanceSortBuilder result = GeoDistanceSortBuilder.fromXContent(context, json); assertEquals("[-19.700583312660456, -2.8225036337971687, " @@ -456,7 +455,7 @@ public class GeoDistanceSortBuilderTests extends AbstractSortTestCase<GeoDistanc private GeoDistanceSortBuilder parse(XContentBuilder sortBuilder) throws Exception { XContentParser parser = createParser(sortBuilder); - QueryParseContext parseContext = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext parseContext = new QueryParseContext(parser); parser.nextToken(); return GeoDistanceSortBuilder.fromXContent(parseContext, null); } diff --git a/core/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java index 82257de99d..1d4389c4e3 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.sort; import org.apache.lucene.search.SortField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.query.QueryParseContext; @@ -68,7 +67,7 @@ public class ScoreSortBuilderTests extends AbstractSortTestCase<ScoreSortBuilder parser.nextToken(); parser.nextToken(); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); ScoreSortBuilder scoreSort = ScoreSortBuilder.fromXContent(context, "_score"); assertEquals(order, scoreSort.order()); } @@ -81,7 +80,7 @@ public class ScoreSortBuilderTests extends AbstractSortTestCase<ScoreSortBuilder parser.nextToken(); parser.nextToken(); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.EMPTY); + QueryParseContext context = new QueryParseContext(parser); try { ScoreSortBuilder.fromXContent(context, "_score"); diff --git a/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java index 43a2b9d9b7..1ad5de4071 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.sort; import org.apache.lucene.search.SortField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.query.QueryParseContext; @@ -172,7 +171,7 @@ public class ScriptSortBuilderTests extends AbstractSortTestCase<ScriptSortBuild parser.nextToken(); parser.nextToken(); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); ScriptSortBuilder builder = ScriptSortBuilder.fromXContent(context, null); assertEquals("doc['field_name'].value * factor", builder.script().getIdOrCode()); assertEquals(Script.DEFAULT_SCRIPT_LANG, builder.script().getLang()); @@ -198,7 +197,7 @@ public class ScriptSortBuilderTests extends AbstractSortTestCase<ScriptSortBuild parser.nextToken(); parser.nextToken(); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); ScriptSortBuilder builder = ScriptSortBuilder.fromXContent(context, null); assertEquals("doc['field_name'].value", builder.script().getIdOrCode()); assertEquals(Script.DEFAULT_SCRIPT_LANG, builder.script().getLang()); @@ -218,7 +217,7 @@ public class ScriptSortBuilderTests extends AbstractSortTestCase<ScriptSortBuild parser.nextToken(); parser.nextToken(); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); Exception e = expectThrows(IllegalArgumentException.class, () -> ScriptSortBuilder.fromXContent(context, null)); assertEquals("[_script] unknown field [bad_field], parser not found", e.getMessage()); } @@ -231,7 +230,7 @@ public class ScriptSortBuilderTests extends AbstractSortTestCase<ScriptSortBuild parser.nextToken(); parser.nextToken(); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); Exception e = expectThrows(IllegalArgumentException.class, () -> ScriptSortBuilder.fromXContent(context, null)); assertEquals("[_script] unknown field [bad_field], parser not found", e.getMessage()); } @@ -243,7 +242,7 @@ public class ScriptSortBuilderTests extends AbstractSortTestCase<ScriptSortBuild parser.nextToken(); parser.nextToken(); - QueryParseContext context = new QueryParseContext(parser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(parser); Exception e = expectThrows(IllegalArgumentException.class, () -> ScriptSortBuilder.fromXContent(context, null)); assertEquals("[_script] script doesn't support values of type: START_ARRAY", e.getMessage()); } diff --git a/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java b/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java index b521060f27..cc62e546a3 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java @@ -19,7 +19,6 @@ x * Licensed to Elasticsearch under one or more contributor package org.elasticsearch.search.sort; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -238,7 +237,7 @@ public class SortBuilderTests extends ESTestCase { private List<SortBuilder<?>> parseSort(String jsonString) throws IOException { XContentParser itemParser = createParser(JsonXContent.jsonXContent, jsonString); - QueryParseContext context = new QueryParseContext(itemParser, ParseFieldMatcher.STRICT); + QueryParseContext context = new QueryParseContext(itemParser); assertEquals(XContentParser.Token.START_OBJECT, itemParser.nextToken()); assertEquals(XContentParser.Token.FIELD_NAME, itemParser.nextToken()); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java index c4c6642e03..7c864320ab 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/CategoryContextMappingTests.java @@ -23,7 +23,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexableField; import org.apache.lucene.search.suggest.document.ContextSuggestField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; @@ -257,7 +256,7 @@ public class CategoryContextMappingTests extends ESSingleNodeTestCase { } private static QueryParseContext createParseContext(XContentParser parser) { - return new QueryParseContext(parser, ParseFieldMatcher.STRICT); + return new QueryParseContext(parser); } public void testQueryContextParsingMixed() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java index d9b45baa16..f4c65b2478 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/GeoContextMappingTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.search.suggest.completion; import org.apache.lucene.index.IndexableField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; @@ -351,6 +350,6 @@ public class GeoContextMappingTests extends ESSingleNodeTestCase { } private static QueryParseContext createParseContext(XContentParser parser) { - return new QueryParseContext(parser, ParseFieldMatcher.STRICT); + return new QueryParseContext(parser); }; } diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java index 1b1614629f..192aa8ee1d 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/QueryContextTestCase.java @@ -19,7 +19,6 @@ package org.elasticsearch.search.suggest.completion; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; @@ -50,7 +49,7 @@ public abstract class QueryContextTestCase<QC extends ToXContent> extends ESTest toXContent.toXContent(builder, ToXContent.EMPTY_PARAMS); XContentParser parser = createParser(builder); parser.nextToken(); - QC fromXContext = fromXContent(new QueryParseContext(parser, ParseFieldMatcher.STRICT)); + QC fromXContext = fromXContent(new QueryParseContext(parser)); assertEquals(toXContent, fromXContext); assertEquals(toXContent.hashCode(), fromXContext.hashCode()); } diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java index 683f4ccf02..7d83fcaf58 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/TransportSearchTemplateAction.java @@ -85,7 +85,7 @@ public class TransportSearchTemplateAction extends HandledTransportAction<Search try (XContentParser parser = XContentFactory.xContent(source).createParser(xContentRegistry, source)) { SearchSourceBuilder builder = SearchSourceBuilder.searchSource(); - builder.parseXContent(new QueryParseContext(parser, parseFieldMatcher)); + builder.parseXContent(new QueryParseContext(parser)); builder.explain(request.isExplain()); builder.profile(request.isProfile()); searchRequest.source(builder); diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java index 51477b7603..6d9ad38e87 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java +++ b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestReindexAction.java @@ -23,7 +23,6 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.inject.Inject; @@ -78,7 +77,7 @@ public class RestReindexAction extends AbstractBaseReindexRestHandler<ReindexReq XContentBuilder builder = XContentFactory.contentBuilder(parser.contentType()); builder.map(source); try (XContentParser innerParser = parser.contentType().xContent().createParser(parser.getXContentRegistry(), builder.bytes())) { - request.getSearchRequest().source().parseXContent(new QueryParseContext(innerParser, ParseFieldMatcher.EMPTY)); + request.getSearchRequest().source().parseXContent(new QueryParseContext(innerParser)); } }; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java index 468a5aaf3a..01bab59eb2 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java @@ -20,7 +20,6 @@ package org.elasticsearch.test; import com.fasterxml.jackson.core.io.JsonStringEncoder; - import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; @@ -38,7 +37,6 @@ import org.elasticsearch.action.termvectors.MultiTermVectorsResponse; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; -import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.collect.Tuple; @@ -521,12 +519,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> * Parses the query provided as string argument and compares it with the expected result provided as argument as a {@link QueryBuilder} */ protected void assertParsedQuery(String queryAsString, QueryBuilder expectedQuery) throws IOException { - assertParsedQuery(queryAsString, expectedQuery, ParseFieldMatcher.STRICT); - } - - protected void assertParsedQuery(String queryAsString, QueryBuilder expectedQuery, ParseFieldMatcher matcher) - throws IOException { - QueryBuilder newQuery = parseQuery(queryAsString, matcher); + QueryBuilder newQuery = parseQuery(queryAsString); assertNotSame(newQuery, expectedQuery); assertEquals(expectedQuery, newQuery); assertEquals(expectedQuery.hashCode(), newQuery.hashCode()); @@ -535,37 +528,24 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> /** * Parses the query provided as bytes argument and compares it with the expected result provided as argument as a {@link QueryBuilder} */ - private void assertParsedQuery(XContentParser parser, QueryBuilder expectedQuery) throws IOException { - assertParsedQuery(parser, expectedQuery, ParseFieldMatcher.STRICT); - } - - private void assertParsedQuery(XContentParser parser, QueryBuilder expectedQuery, ParseFieldMatcher matcher) - throws IOException { - QueryBuilder newQuery = parseQuery(parser, matcher); + private static void assertParsedQuery(XContentParser parser, QueryBuilder expectedQuery) throws IOException { + QueryBuilder newQuery = parseQuery(parser); assertNotSame(newQuery, expectedQuery); assertEquals(expectedQuery, newQuery); assertEquals(expectedQuery.hashCode(), newQuery.hashCode()); } - protected QueryBuilder parseQuery(String queryAsString) throws IOException { - return parseQuery(queryAsString, ParseFieldMatcher.STRICT); - } - - protected QueryBuilder parseQuery(XContentParser parser) throws IOException { - return parseQuery(parser, ParseFieldMatcher.STRICT); - } - protected QueryBuilder parseQuery(AbstractQueryBuilder<?> builder) throws IOException { - return parseQuery(createParser(JsonXContent.jsonXContent, builder.buildAsBytes(XContentType.JSON)), ParseFieldMatcher.STRICT); + return parseQuery(createParser(JsonXContent.jsonXContent, builder.buildAsBytes(XContentType.JSON))); } - protected QueryBuilder parseQuery(String queryAsString, ParseFieldMatcher matcher) throws IOException { + protected QueryBuilder parseQuery(String queryAsString) throws IOException { XContentParser parser = createParser(JsonXContent.jsonXContent, queryAsString); - return parseQuery(parser, matcher); + return parseQuery(parser); } - private QueryBuilder parseQuery(XContentParser parser, ParseFieldMatcher matcher) throws IOException { - QueryParseContext context = createParseContext(parser, matcher); + protected static QueryBuilder parseQuery(XContentParser parser) throws IOException { + QueryParseContext context = createParseContext(parser); QueryBuilder parseInnerQueryBuilder = context.parseInnerQueryBuilder(); assertNull(parser.nextToken()); return parseInnerQueryBuilder; @@ -774,11 +754,8 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> return serviceHolder.createShardContext(); } - /** - * @return a new {@link QueryParseContext} based on the base test index and queryParserService - */ - protected static QueryParseContext createParseContext(XContentParser parser, ParseFieldMatcher matcher) { - return new QueryParseContext(parser, matcher); + private static QueryParseContext createParseContext(XContentParser parser) { + return new QueryParseContext(parser); } /** |