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

Start switching to non-deprecated ParseField.match method (#28488) 

This commit switches all the modules and server test code to use the
non-deprecated `ParseField.match` method, passing in the parser's deprecation
handler or the logging deprecation handler when a parser is not available (like
in tests).

Relates to #28449
This commit is contained in:
Lee Hinman 2018-02-02 10:10:13 -07:00 committed by GitHub
parent 5f2121960e
commit 3ddea8d8d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 87 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsParser.java
View File

@ -39,7 +39,7 @@ public class MatrixStatsParser extends NumericValuesSourceParser {
@Override @Override
protected boolean token(String aggregationName, String currentFieldName, XContentParser.Token token, XContentParser parser, protected boolean token(String aggregationName, String currentFieldName, XContentParser.Token token, XContentParser parser,
Map<ParseField, Object> otherOptions) throws IOException { Map<ParseField, Object> otherOptions) throws IOException {
if (MULTIVALUE_MODE_FIELD.match(currentFieldName)) { if (MULTIVALUE_MODE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
if (token == XContentParser.Token.VALUE_STRING) { if (token == XContentParser.Token.VALUE_STRING) {
otherOptions.put(MULTIVALUE_MODE_FIELD, parser.text()); otherOptions.put(MULTIVALUE_MODE_FIELD, parser.text());
return true; return true;

14
modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceParser.java
View File

@ -88,11 +88,11 @@ public abstract class MultiValuesSourceParser<VS extends ValuesSource> implement
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (token == XContentParser.Token.VALUE_STRING) { } else if (token == XContentParser.Token.VALUE_STRING) {
if (CommonFields.FIELDS.match(currentFieldName)) { if (CommonFields.FIELDS.match(currentFieldName, parser.getDeprecationHandler())) {
fields = Collections.singletonList(parser.text()); fields = Collections.singletonList(parser.text());
} else if (formattable && CommonFields.FORMAT.match(currentFieldName)) { } else if (formattable && CommonFields.FORMAT.match(currentFieldName, parser.getDeprecationHandler())) {
format = parser.text(); format = parser.text();
} else if (CommonFields.VALUE_TYPE.match(currentFieldName)) { } else if (CommonFields.VALUE_TYPE.match(currentFieldName, parser.getDeprecationHandler())) {
throw new ParsingException(parser.getTokenLocation(), throw new ParsingException(parser.getTokenLocation(),
"Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "]. " + "Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "]. " +
"Multi-field aggregations do not support scripts."); "Multi-field aggregations do not support scripts.");
@ -101,12 +101,12 @@ public abstract class MultiValuesSourceParser<VS extends ValuesSource> implement
"Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "]."); "Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "].");
} }
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
if (CommonFields.MISSING.match(currentFieldName)) { if (CommonFields.MISSING.match(currentFieldName, parser.getDeprecationHandler())) {
missingMap = new HashMap<>(); missingMap = new HashMap<>();
while (parser.nextToken() != XContentParser.Token.END_OBJECT) { while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
parseMissingAndAdd(aggregationName, currentFieldName, parser, missingMap); parseMissingAndAdd(aggregationName, currentFieldName, parser, missingMap);
} }
} else if (Script.SCRIPT_PARSE_FIELD.match(currentFieldName)) { } else if (Script.SCRIPT_PARSE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
throw new ParsingException(parser.getTokenLocation(), throw new ParsingException(parser.getTokenLocation(),
"Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "]. " + "Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "]. " +
"Multi-field aggregations do not support scripts."); "Multi-field aggregations do not support scripts.");
@ -116,11 +116,11 @@ public abstract class MultiValuesSourceParser<VS extends ValuesSource> implement
"Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "]."); "Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "].");
} }
} else if (token == XContentParser.Token.START_ARRAY) { } else if (token == XContentParser.Token.START_ARRAY) {
if (Script.SCRIPT_PARSE_FIELD.match(currentFieldName)) { if (Script.SCRIPT_PARSE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
throw new ParsingException(parser.getTokenLocation(), throw new ParsingException(parser.getTokenLocation(),
"Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "]. " + "Unexpected token " + token + " [" + currentFieldName + "] in [" + aggregationName + "]. " +
"Multi-field aggregations do not support scripts."); "Multi-field aggregations do not support scripts.");
} else if (CommonFields.FIELDS.match(currentFieldName)) { } else if (CommonFields.FIELDS.match(currentFieldName, parser.getDeprecationHandler())) {
fields = new ArrayList<>(); fields = new ArrayList<>();
while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
if (token == XContentParser.Token.VALUE_STRING) { if (token == XContentParser.Token.VALUE_STRING) {

18
modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java
View File

@ -257,27 +257,27 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder<HasChildQueryBuil
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
if (QUERY_FIELD.match(currentFieldName)) { if (QUERY_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
iqb = parseInnerQueryBuilder(parser); iqb = parseInnerQueryBuilder(parser);
} else if (INNER_HITS_FIELD.match(currentFieldName)) { } else if (INNER_HITS_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
innerHitBuilder = InnerHitBuilder.fromXContent(parser); innerHitBuilder = InnerHitBuilder.fromXContent(parser);
} else { } else {
throw new ParsingException(parser.getTokenLocation(), "[has_child] query does not support [" + currentFieldName + "]"); throw new ParsingException(parser.getTokenLocation(), "[has_child] query does not support [" + currentFieldName + "]");
} }
} else if (token.isValue()) { } else if (token.isValue()) {
if (TYPE_FIELD.match(currentFieldName)) { if (TYPE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
childType = parser.text(); childType = parser.text();
} else if (SCORE_MODE_FIELD.match(currentFieldName)) { } else if (SCORE_MODE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
scoreMode = NestedQueryBuilder.parseScoreMode(parser.text()); scoreMode = NestedQueryBuilder.parseScoreMode(parser.text());
} else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName)) { } else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
boost = parser.floatValue(); boost = parser.floatValue();
} else if (MIN_CHILDREN_FIELD.match(currentFieldName)) { } else if (MIN_CHILDREN_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
minChildren = parser.intValue(true); minChildren = parser.intValue(true);
} else if (MAX_CHILDREN_FIELD.match(currentFieldName)) { } else if (MAX_CHILDREN_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
maxChildren = parser.intValue(true); maxChildren = parser.intValue(true);
} else if (IGNORE_UNMAPPED_FIELD.match(currentFieldName)) { } else if (IGNORE_UNMAPPED_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
ignoreUnmapped = parser.booleanValue(); ignoreUnmapped = parser.booleanValue();
} else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName)) { } else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
queryName = parser.text(); queryName = parser.text();
} else { } else {
throw new ParsingException(parser.getTokenLocation(), "[has_child] query does not support [" + currentFieldName + "]"); throw new ParsingException(parser.getTokenLocation(), "[has_child] query does not support [" + currentFieldName + "]");

14
modules/parent-join/src/main/java/org/elasticsearch/join/query/HasParentQueryBuilder.java
View File

@ -295,24 +295,24 @@ public class HasParentQueryBuilder extends AbstractQueryBuilder<HasParentQueryBu
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
if (QUERY_FIELD.match(currentFieldName)) { if (QUERY_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
iqb = parseInnerQueryBuilder(parser); iqb = parseInnerQueryBuilder(parser);
} else if (INNER_HITS_FIELD.match(currentFieldName)) { } else if (INNER_HITS_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
innerHits = InnerHitBuilder.fromXContent(parser); innerHits = InnerHitBuilder.fromXContent(parser);
} else { } else {
throw new ParsingException(parser.getTokenLocation(), throw new ParsingException(parser.getTokenLocation(),
"[has_parent] query does not support [" + currentFieldName + "]"); "[has_parent] query does not support [" + currentFieldName + "]");
} }
} else if (token.isValue()) { } else if (token.isValue()) {
if (TYPE_FIELD.match(currentFieldName)) { if (TYPE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
parentType = parser.text(); parentType = parser.text();
} else if (SCORE_FIELD.match(currentFieldName)) { } else if (SCORE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
score = parser.booleanValue(); score = parser.booleanValue();
} else if (IGNORE_UNMAPPED_FIELD.match(currentFieldName)) { } else if (IGNORE_UNMAPPED_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
ignoreUnmapped = parser.booleanValue(); ignoreUnmapped = parser.booleanValue();
} else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName)) { } else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
boost = parser.floatValue(); boost = parser.floatValue();
} else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName)) { } else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
queryName = parser.text(); queryName = parser.text();
} else { } else {
throw new ParsingException(parser.getTokenLocation(), throw new ParsingException(parser.getTokenLocation(),

10
modules/parent-join/src/main/java/org/elasticsearch/join/query/ParentIdQueryBuilder.java
View File

@ -132,15 +132,15 @@ public final class ParentIdQueryBuilder extends AbstractQueryBuilder<ParentIdQue
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (token.isValue()) { } else if (token.isValue()) {
if (TYPE_FIELD.match(currentFieldName)) { if (TYPE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
type = parser.text(); type = parser.text();
} else if (ID_FIELD.match(currentFieldName)) { } else if (ID_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
id = parser.text(); id = parser.text();
} else if (IGNORE_UNMAPPED_FIELD.match(currentFieldName)) { } else if (IGNORE_UNMAPPED_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
ignoreUnmapped = parser.booleanValue(); ignoreUnmapped = parser.booleanValue();
} else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName)) { } else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
boost = parser.floatValue(); boost = parser.floatValue();
} else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName)) { } else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
queryName = parser.text(); queryName = parser.text();
} else { } else {
throw new ParsingException(parser.getTokenLocation(), "[parent_id] query does not support [" + currentFieldName + "]"); throw new ParsingException(parser.getTokenLocation(), "[parent_id] query does not support [" + currentFieldName + "]");

26
modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java
View File

@ -403,7 +403,7 @@ public class PercolateQueryBuilder extends AbstractQueryBuilder<PercolateQueryBu
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (token == XContentParser.Token.START_ARRAY) { } else if (token == XContentParser.Token.START_ARRAY) {
if (DOCUMENTS_FIELD.match(currentFieldName)) { if (DOCUMENTS_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
if (documentSpecified) { if (documentSpecified) {
throw new IllegalArgumentException("[" + PercolateQueryBuilder.NAME + throw new IllegalArgumentException("[" + PercolateQueryBuilder.NAME +
"] Either specified [document] or [documents], not both"); "] Either specified [document] or [documents], not both");
@ -426,7 +426,7 @@ public class PercolateQueryBuilder extends AbstractQueryBuilder<PercolateQueryBu
"] query does not field name [" + currentFieldName + "]"); "] query does not field name [" + currentFieldName + "]");
} }
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
if (DOCUMENT_FIELD.match(currentFieldName)) { if (DOCUMENT_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
if (documentsSpecified) { if (documentsSpecified) {
throw new IllegalArgumentException("[" + PercolateQueryBuilder.NAME + throw new IllegalArgumentException("[" + PercolateQueryBuilder.NAME +
"] Either specified [document] or [documents], not both"); "] Either specified [document] or [documents], not both");
@ -442,27 +442,27 @@ public class PercolateQueryBuilder extends AbstractQueryBuilder<PercolateQueryBu
"] query does not support field name [" + currentFieldName + "]"); "] query does not support field name [" + currentFieldName + "]");
} }
} else if (token.isValue() || token == XContentParser.Token.VALUE_NULL) { } else if (token.isValue() || token == XContentParser.Token.VALUE_NULL) {
if (QUERY_FIELD.match(currentFieldName)) { if (QUERY_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
field = parser.text(); field = parser.text();
} else if (NAME_FIELD.match(currentFieldName)) { } else if (NAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
name = parser.textOrNull(); name = parser.textOrNull();
} else if (DOCUMENT_TYPE_FIELD.match(currentFieldName)) { } else if (DOCUMENT_TYPE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
documentType = parser.textOrNull(); documentType = parser.textOrNull();
} else if (INDEXED_DOCUMENT_FIELD_INDEX.match(currentFieldName)) { } else if (INDEXED_DOCUMENT_FIELD_INDEX.match(currentFieldName, parser.getDeprecationHandler())) {
indexedDocumentIndex = parser.text(); indexedDocumentIndex = parser.text();
} else if (INDEXED_DOCUMENT_FIELD_TYPE.match(currentFieldName)) { } else if (INDEXED_DOCUMENT_FIELD_TYPE.match(currentFieldName, parser.getDeprecationHandler())) {
indexedDocumentType = parser.text(); indexedDocumentType = parser.text();
} else if (INDEXED_DOCUMENT_FIELD_ID.match(currentFieldName)) { } else if (INDEXED_DOCUMENT_FIELD_ID.match(currentFieldName, parser.getDeprecationHandler())) {
indexedDocumentId = parser.text(); indexedDocumentId = parser.text();
} else if (INDEXED_DOCUMENT_FIELD_ROUTING.match(currentFieldName)) { } else if (INDEXED_DOCUMENT_FIELD_ROUTING.match(currentFieldName, parser.getDeprecationHandler())) {
indexedDocumentRouting = parser.text(); indexedDocumentRouting = parser.text();
} else if (INDEXED_DOCUMENT_FIELD_PREFERENCE.match(currentFieldName)) { } else if (INDEXED_DOCUMENT_FIELD_PREFERENCE.match(currentFieldName, parser.getDeprecationHandler())) {
indexedDocumentPreference = parser.text(); indexedDocumentPreference = parser.text();
} else if (INDEXED_DOCUMENT_FIELD_VERSION.match(currentFieldName)) { } else if (INDEXED_DOCUMENT_FIELD_VERSION.match(currentFieldName, parser.getDeprecationHandler())) {
indexedDocumentVersion = parser.longValue(); indexedDocumentVersion = parser.longValue();
} else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName)) { } else if (AbstractQueryBuilder.BOOST_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
boost = parser.floatValue(); boost = parser.floatValue();
} else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName)) { } else if (AbstractQueryBuilder.NAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
queryName = parser.text(); queryName = parser.text();
} else { } else {
throw new ParsingException(parser.getTokenLocation(), "[" + PercolateQueryBuilder.NAME + throw new ParsingException(parser.getTokenLocation(), "[" + PercolateQueryBuilder.NAME +

9
modules/reindex/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryAction.java
View File

@ -23,6 +23,7 @@ import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.client.node.NodeClient;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.rest.RestController; import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestRequest; import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.script.Script; import org.elasticsearch.script.Script;
@ -91,26 +92,26 @@ public class RestUpdateByQueryAction extends AbstractBulkByQueryRestHandler<Upda
Map.Entry<String, Object> entry = itr.next(); Map.Entry<String, Object> entry = itr.next();
String parameterName = entry.getKey(); String parameterName = entry.getKey();
Object parameterValue = entry.getValue(); Object parameterValue = entry.getValue();
if (Script.LANG_PARSE_FIELD.match(parameterName)) { if (Script.LANG_PARSE_FIELD.match(parameterName, LoggingDeprecationHandler.INSTANCE)) {
if (parameterValue instanceof String || parameterValue == null) { if (parameterValue instanceof String || parameterValue == null) {
lang = (String) parameterValue; lang = (String) parameterValue;
} else { } else {
throw new ElasticsearchParseException("Value must be of type String: [" + parameterName + "]"); throw new ElasticsearchParseException("Value must be of type String: [" + parameterName + "]");
} }
} else if (Script.PARAMS_PARSE_FIELD.match(parameterName)) { } else if (Script.PARAMS_PARSE_FIELD.match(parameterName, LoggingDeprecationHandler.INSTANCE)) {
if (parameterValue instanceof Map || parameterValue == null) { if (parameterValue instanceof Map || parameterValue == null) {
params = (Map<String, Object>) parameterValue; params = (Map<String, Object>) parameterValue;
} else { } else {
throw new ElasticsearchParseException("Value must be of type String: [" + parameterName + "]"); throw new ElasticsearchParseException("Value must be of type String: [" + parameterName + "]");
} }
} else if (ScriptType.INLINE.getParseField().match(parameterName)) { } else if (ScriptType.INLINE.getParseField().match(parameterName, LoggingDeprecationHandler.INSTANCE)) {
if (parameterValue instanceof String || parameterValue == null) { if (parameterValue instanceof String || parameterValue == null) {
script = (String) parameterValue; script = (String) parameterValue;
type = ScriptType.INLINE; type = ScriptType.INLINE;
} else { } else {
throw new ElasticsearchParseException("Value must be of type String: [" + parameterName + "]"); throw new ElasticsearchParseException("Value must be of type String: [" + parameterName + "]");
} }
} else if (ScriptType.STORED.getParseField().match(parameterName)) { } else if (ScriptType.STORED.getParseField().match(parameterName, LoggingDeprecationHandler.INSTANCE)) {
if (parameterValue instanceof String || parameterValue == null) { if (parameterValue instanceof String || parameterValue == null) {
script = (String) parameterValue; script = (String) parameterValue;
type = ScriptType.STORED; type = ScriptType.STORED;

21
server/src/test/java/org/elasticsearch/common/ParseFieldTests.java
View File

@ -18,6 +18,7 @@
*/ */
package org.elasticsearch.common; package org.elasticsearch.common;
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
@ -32,16 +33,16 @@ public class ParseFieldTests extends ESTestCase {
String[] deprecated = new String[]{"barFoo", "bar_foo", "Foobar"}; String[] deprecated = new String[]{"barFoo", "bar_foo", "Foobar"};
ParseField withDeprecations = field.withDeprecation(deprecated); ParseField withDeprecations = field.withDeprecation(deprecated);
assertThat(field, not(sameInstance(withDeprecations))); assertThat(field, not(sameInstance(withDeprecations)));
assertThat(field.match(name), is(true)); assertThat(field.match(name, LoggingDeprecationHandler.INSTANCE), is(true));
assertThat(field.match("foo bar"), is(false)); assertThat(field.match("foo bar", LoggingDeprecationHandler.INSTANCE), is(false));
for (String deprecatedName : deprecated) { for (String deprecatedName : deprecated) {
assertThat(field.match(deprecatedName), is(false)); assertThat(field.match(deprecatedName, LoggingDeprecationHandler.INSTANCE), is(false));
} }
assertThat(withDeprecations.match(name), is(true)); assertThat(withDeprecations.match(name, LoggingDeprecationHandler.INSTANCE), is(true));
assertThat(withDeprecations.match("foo bar"), is(false)); assertThat(withDeprecations.match("foo bar", LoggingDeprecationHandler.INSTANCE), is(false));
for (String deprecatedName : deprecated) { for (String deprecatedName : deprecated) {
assertThat(withDeprecations.match(deprecatedName), is(true)); assertThat(withDeprecations.match(deprecatedName, LoggingDeprecationHandler.INSTANCE), is(true));
assertWarnings("Deprecated field [" + deprecatedName + "] used, expected [foo_bar] instead"); assertWarnings("Deprecated field [" + deprecatedName + "] used, expected [foo_bar] instead");
} }
} }
@ -50,12 +51,12 @@ public class ParseFieldTests extends ESTestCase {
String name = "like_text"; String name = "like_text";
String[] deprecated = new String[]{"text", "same_as_text"}; String[] deprecated = new String[]{"text", "same_as_text"};
ParseField field = new ParseField(name).withDeprecation(deprecated).withAllDeprecated("like"); ParseField field = new ParseField(name).withDeprecation(deprecated).withAllDeprecated("like");
assertFalse(field.match("not a field name")); assertFalse(field.match("not a field name", LoggingDeprecationHandler.INSTANCE));
assertTrue(field.match("text")); assertTrue(field.match("text", LoggingDeprecationHandler.INSTANCE));
assertWarnings("Deprecated field [text] used, replaced by [like]"); assertWarnings("Deprecated field [text] used, replaced by [like]");
assertTrue(field.match("same_as_text")); assertTrue(field.match("same_as_text", LoggingDeprecationHandler.INSTANCE));
assertWarnings("Deprecated field [same_as_text] used, replaced by [like]"); assertWarnings("Deprecated field [same_as_text] used, replaced by [like]");
assertTrue(field.match("like_text")); assertTrue(field.match("like_text", LoggingDeprecationHandler.INSTANCE));
assertWarnings("Deprecated field [like_text] used, replaced by [like]"); assertWarnings("Deprecated field [like_text] used, replaced by [like]");
} }

22
server/src/test/java/org/elasticsearch/search/SearchModuleTests.java
View File

@ -22,6 +22,7 @@ import org.elasticsearch.common.inject.ModuleTestCase;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
@ -187,13 +188,17 @@ public class SearchModuleTests extends ModuleTestCase {
} }
})); }));
assertEquals(1, module.getNamedXContents().stream() assertEquals(1, module.getNamedXContents().stream()
.filter(e -> e.categoryClass.equals(SuggestionBuilder.class) && e.name.match("term")).count()); .filter(e -> e.categoryClass.equals(SuggestionBuilder.class) &&
e.name.match("term", LoggingDeprecationHandler.INSTANCE)).count());
assertEquals(1, module.getNamedXContents().stream() assertEquals(1, module.getNamedXContents().stream()
.filter(e -> e.categoryClass.equals(SuggestionBuilder.class) && e.name.match("phrase")).count()); .filter(e -> e.categoryClass.equals(SuggestionBuilder.class) &&
e.name.match("phrase", LoggingDeprecationHandler.INSTANCE)).count());
assertEquals(1, module.getNamedXContents().stream() assertEquals(1, module.getNamedXContents().stream()
.filter(e -> e.categoryClass.equals(SuggestionBuilder.class) && e.name.match("completion")).count()); .filter(e -> e.categoryClass.equals(SuggestionBuilder.class) &&
e.name.match("completion", LoggingDeprecationHandler.INSTANCE)).count());
assertEquals(1, module.getNamedXContents().stream() assertEquals(1, module.getNamedXContents().stream()
.filter(e -> e.categoryClass.equals(SuggestionBuilder.class) && e.name.match("custom")).count()); .filter(e -> e.categoryClass.equals(SuggestionBuilder.class) &&
e.name.match("custom", LoggingDeprecationHandler.INSTANCE)).count());
assertEquals(1, module.getNamedWriteables().stream() assertEquals(1, module.getNamedWriteables().stream()
.filter(e -> e.categoryClass.equals(SuggestionBuilder.class) && e.name.equals("term")).count()); .filter(e -> e.categoryClass.equals(SuggestionBuilder.class) && e.name.equals("term")).count());
@ -250,7 +255,8 @@ public class SearchModuleTests extends ModuleTestCase {
assertThat( assertThat(
module.getNamedXContents().stream() module.getNamedXContents().stream()
.filter(entry -> entry.categoryClass.equals(BaseAggregationBuilder.class) && entry.name.match("test")) .filter(entry -> entry.categoryClass.equals(BaseAggregationBuilder.class) &&
entry.name.match("test", LoggingDeprecationHandler.INSTANCE))
.collect(toList()), .collect(toList()),
hasSize(1)); hasSize(1));
} }
@ -266,7 +272,8 @@ public class SearchModuleTests extends ModuleTestCase {
assertThat( assertThat(
module.getNamedXContents().stream() module.getNamedXContents().stream()
.filter(entry -> entry.categoryClass.equals(BaseAggregationBuilder.class) && entry.name.match("test")) .filter(entry -> entry.categoryClass.equals(BaseAggregationBuilder.class) &&
entry.name.match("test", LoggingDeprecationHandler.INSTANCE))
.collect(toList()), .collect(toList()),
hasSize(1)); hasSize(1));
} }
@ -280,7 +287,8 @@ public class SearchModuleTests extends ModuleTestCase {
})); }));
assertThat( assertThat(
module.getNamedXContents().stream() module.getNamedXContents().stream()
.filter(entry -> entry.categoryClass.equals(RescorerBuilder.class) && entry.name.match("test")) .filter(entry -> entry.categoryClass.equals(RescorerBuilder.class) &&
entry.name.match("test", LoggingDeprecationHandler.INSTANCE))
.collect(toList()), .collect(toList()),
hasSize(1)); hasSize(1));
} }

4
server/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java
View File

@ -268,10 +268,10 @@ public class IncludeExcludeTests extends ESTestCase {
IncludeExclude exc = null; IncludeExclude exc = null;
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
assertEquals(XContentParser.Token.FIELD_NAME, token); assertEquals(XContentParser.Token.FIELD_NAME, token);
if (IncludeExclude.INCLUDE_FIELD.match(parser.currentName())) { if (IncludeExclude.INCLUDE_FIELD.match(parser.currentName(), parser.getDeprecationHandler())) {
token = parser.nextToken(); token = parser.nextToken();
inc = IncludeExclude.parseInclude(parser); inc = IncludeExclude.parseInclude(parser);
} else if (IncludeExclude.EXCLUDE_FIELD.match(parser.currentName())) { } else if (IncludeExclude.EXCLUDE_FIELD.match(parser.currentName(), parser.getDeprecationHandler())) {
token = parser.nextToken(); token = parser.nextToken();
exc = IncludeExclude.parseExclude(parser); exc = IncludeExclude.parseExclude(parser);
} else { } else {

10
server/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java
View File

@ -160,15 +160,15 @@ public class CustomSuggesterSearchIT extends ESIntegTestCase {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
currentFieldName = parser.currentName(); currentFieldName = parser.currentName();
} else if (token.isValue()) { } else if (token.isValue()) {
if (SuggestionBuilder.ANALYZER_FIELD.match(currentFieldName)) { if (SuggestionBuilder.ANALYZER_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
analyzer = parser.text(); analyzer = parser.text();
} else if (SuggestionBuilder.FIELDNAME_FIELD.match(currentFieldName)) { } else if (SuggestionBuilder.FIELDNAME_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
fieldname = parser.text(); fieldname = parser.text();
} else if (SuggestionBuilder.SIZE_FIELD.match(currentFieldName)) { } else if (SuggestionBuilder.SIZE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
sizeField = parser.intValue(); sizeField = parser.intValue();
} else if (SuggestionBuilder.SHARDSIZE_FIELD.match(currentFieldName)) { } else if (SuggestionBuilder.SHARDSIZE_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
shardSize = parser.intValue(); shardSize = parser.intValue();
} else if (RANDOM_SUFFIX_FIELD.match(currentFieldName)) { } else if (RANDOM_SUFFIX_FIELD.match(currentFieldName, parser.getDeprecationHandler())) {
suffix = parser.text(); suffix = parser.text();
} }
} else { } else {

12
test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
View File

@ -65,6 +65,7 @@ import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.MockBigArrays; import org.elasticsearch.common.util.MockBigArrays;
import org.elasticsearch.common.util.MockPageCacheRecycler; import org.elasticsearch.common.util.MockPageCacheRecycler;
import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContent; import org.elasticsearch.common.xcontent.XContent;
@ -1093,35 +1094,36 @@ public abstract class ESTestCase extends LuceneTestCase {
* Create a new {@link XContentParser}. * Create a new {@link XContentParser}.
*/ */
protected final XContentParser createParser(XContentBuilder builder) throws IOException { protected final XContentParser createParser(XContentBuilder builder) throws IOException {
return builder.generator().contentType().xContent().createParser(xContentRegistry(), builder.bytes()); return builder.generator().contentType().xContent()
.createParser(xContentRegistry(), LoggingDeprecationHandler.INSTANCE, builder.bytes());
} }
/** /**
* Create a new {@link XContentParser}. * Create a new {@link XContentParser}.
*/ */
protected final XContentParser createParser(XContent xContent, String data) throws IOException { protected final XContentParser createParser(XContent xContent, String data) throws IOException {
return xContent.createParser(xContentRegistry(), data); return xContent.createParser(xContentRegistry(), LoggingDeprecationHandler.INSTANCE, data);
} }
/** /**
* Create a new {@link XContentParser}. * Create a new {@link XContentParser}.
*/ */
protected final XContentParser createParser(XContent xContent, InputStream data) throws IOException { protected final XContentParser createParser(XContent xContent, InputStream data) throws IOException {
return xContent.createParser(xContentRegistry(), data); return xContent.createParser(xContentRegistry(), LoggingDeprecationHandler.INSTANCE, data);
} }
/** /**
* Create a new {@link XContentParser}. * Create a new {@link XContentParser}.
*/ */
protected final XContentParser createParser(XContent xContent, byte[] data) throws IOException { protected final XContentParser createParser(XContent xContent, byte[] data) throws IOException {
return xContent.createParser(xContentRegistry(), data); return xContent.createParser(xContentRegistry(), LoggingDeprecationHandler.INSTANCE, data);
} }
/** /**
* Create a new {@link XContentParser}. * Create a new {@link XContentParser}.
*/ */
protected final XContentParser createParser(XContent xContent, BytesReference data) throws IOException { protected final XContentParser createParser(XContent xContent, BytesReference data) throws IOException {
return xContent.createParser(xContentRegistry(), data); return xContent.createParser(xContentRegistry(), LoggingDeprecationHandler.INSTANCE, data);
} }
/** /**