Remove all instances of the deprecated ParseField.match method
#28586
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This removes all the server references to the deprecated `ParseField.match` method in favor of the method that passes in the deprecation logger. Relates to elastic#28504
nik9000
approved these changes
Feb 9, 2018
| @@ -51,7 +51,7 @@ public static XContentParser createParser(NamedXContentRegistry xContentRegistry | |||
| compressedInput = new BufferedInputStream(compressedInput); | |||
| } | |||
| final XContentType contentType = XContentFactory.xContentType(compressedInput); | |||
| return XContentFactory.xContent(contentType).createParser(xContentRegistry, compressedInput); | |||
| return XContentFactory.xContent(contentType).createParser(xContentRegistry, LoggingDeprecationHandler.INSTANCE, compressedInput); | |||
There was a problem hiding this comment.
+1 for doing it this way. I think that this'll make extracting this class from core into an xcontent jar more difficult but I think we should cross that bridge in another PR.
There was a problem hiding this comment.
Maybe it doesn't have to come at all.... I think only copyCurrentStructure is part of the xcontent implementation. The rest is just "stuff that ES uses". I think.
| @@ -326,7 +328,7 @@ public MultiMatchQueryBuilder type(Object type) { | |||
| if (type == null) { | |||
| throw new IllegalArgumentException("[" + NAME + "] requires type to be non-null"); | |||
| } | |||
| this.type = Type.parse(type.toString().toLowerCase(Locale.ROOT)); | |||
| this.type = Type.parse(type.toString().toLowerCase(Locale.ROOT), LoggingDeprecationHandler.INSTANCE); | |||
There was a problem hiding this comment.
++ for doing it this way for now.
| @@ -1004,8 +1005,8 @@ protected Query doToQuery(QueryShardContext context) throws IOException { | |||
| queryParser.setFuzziness(fuzziness); | |||
| queryParser.setFuzzyPrefixLength(fuzzyPrefixLength); | |||
| queryParser.setFuzzyMaxExpansions(fuzzyMaxExpansions); | |||
| queryParser.setFuzzyRewriteMethod(QueryParsers.parseRewriteMethod(this.fuzzyRewrite)); | |||
| queryParser.setMultiTermRewriteMethod(QueryParsers.parseRewriteMethod(this.rewrite)); | |||
| queryParser.setFuzzyRewriteMethod(QueryParsers.parseRewriteMethod(this.fuzzyRewrite, LoggingDeprecationHandler.INSTANCE)); | |||
dakrone
added a commit
that referenced
this pull request
Feb 9, 2018
) This removes all the server references to the deprecated `ParseField.match` method in favor of the method that passes in the deprecation logger. Relates to #28504
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This removes all the server references to the deprecated
ParseField.matchmethod in favor of the method that passes in the deprecation logger.
Relates to #28504