Switch to non-deprecated ParseField.match method for o.e.search #28526
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 replaces more of the `ParseField.match` calls with the same call using a deprecation handler. It encapsulates all of the instances in the `org.elastsicsearch.search` package. Relates to elastic#28504
nik9000
approved these changes
Feb 5, 2018
| @@ -131,7 +132,7 @@ public ParseField parseField() { | |||
| public static SubAggCollectionMode parse(String value) { | |||
| SubAggCollectionMode[] modes = SubAggCollectionMode.values(); | |||
| for (SubAggCollectionMode mode : modes) { | |||
| if (mode.parseField.match(value)) { | |||
| if (mode.parseField.match(value, LoggingDeprecationHandler.INSTANCE)) { | |||
There was a problem hiding this comment.
I think it'd be cleaner to take the DeprecationHandler as an argument here. I really want to minimize the places where we use the static instance of LoggingDeprecationHandler. My ulterior motive is that we might be able to remove it entirely at some point which would be super neat.
| script = Script.parse(parser); | ||
| } else if (SearchSourceBuilder.IGNORE_FAILURE_FIELD.match(currentFieldName)) { | ||
| } else if (SearchSourceBuilder.IGNORE_FAILURE_FIELD.match(currentFieldName, | ||
| parser.getDeprecationHandler())) { |
There was a problem hiding this comment.
Just like last time, would you mind indenting this one more level?
There was a problem hiding this comment.
If you think we shouldn't I'm ok with it but I find it so much more readable that way.
dakrone
added a commit
that referenced
this pull request
Feb 8, 2018
* Switch to non-deprecated ParseField.match method for o.e.search This replaces more of the `ParseField.match` calls with the same call using a deprecation handler. It encapsulates all of the instances in the `org.elastsicsearch.search` package. Relates to #28504 * Address Nik's comments
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 replaces more of the
ParseField.matchcalls with the same call using adeprecation handler. It encapsulates all of the instances in the
org.elasticsearch.searchpackage.Relates to #28504