Use non deprecated xcontenthelper #28503
Merged
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 moves away from one of the now-deprecated XContentHelper.createParser methods in favor of specifying the deprecation logger at parser creation time. Relates to elastic#28449 Note that this doesn't move all the `createParser` calls because some of them use the already-deprecated method that doesn't specify the XContentType.
nik9000
approved these changes
Feb 2, 2018
| @@ -316,7 +317,8 @@ static Request bulk(BulkRequest bulkRequest) throws IOException { | |||
| BytesReference indexSource = indexRequest.source(); | |||
| XContentType indexXContentType = indexRequest.getContentType(); | |||
|
|
|||
| try (XContentParser parser = XContentHelper.createParser(NamedXContentRegistry.EMPTY, indexSource, indexXContentType)) { | |||
| try (XContentParser parser = XContentHelper.createParser(NamedXContentRegistry.EMPTY, | |||
| LoggingDeprecationHandler.INSTANCE, indexSource, indexXContentType)) { | |||
There was a problem hiding this comment.
Can you indent this one more time? The way it is the method args look like they are part of the try body.
There was a problem hiding this comment.
I checked but I thought we used what Intellij thought the indentation should be? (I even opened Intellij to make sure it agreed)
There was a problem hiding this comment.
I tend to disagree with IntelliJ here. It is hard to read..... Whatever works though.
4 tasks
|
@elasticmachine test this again please |
dakrone
added a commit
that referenced
this pull request
Feb 5, 2018
* Move to non-deprecated XContentHelper.createParser(...) This moves away from one of the now-deprecated XContentHelper.createParser methods in favor of specifying the deprecation logger at parser creation time. Relates to #28449 Note that this doesn't move all the `createParser` calls because some of them use the already-deprecated method that doesn't specify the XContentType. * Remove the deprecated (and now non-needed) createParser method
martijnvg
added a commit
that referenced
this pull request
Feb 7, 2018
* es/master: Added more parameter to PersistentTaskPlugin#getPersistentTasksExecutor(...) [Tests] Relax assertion in SuggestStatsIT (#28544) Make internal Rounding fields final (#28532) Fix the ability to remove old plugin [TEST] Expand failure message for wildfly integration tests Add 6.2.1 version constant Remove feature parsing for GetIndicesAction (#28535) No refresh on shard activation needed (#28013) Improve failure message when restoring an index that already exists in the cluster (#28498) Use right skip versions. [Docs] Fix incomplete URLs (#28528) Use non deprecated xcontenthelper (#28503) Painless: Fixes a null pointer exception in certain cases of for loop usage (#28506)
martijnvg
added a commit
that referenced
this pull request
Feb 7, 2018
* es/6.x: Added more parameter to PersistentTaskPlugin#getPersistentTasksExecutor(...) [Tests] Relax assertion in SuggestStatsIT (#28544) Make internal Rounding fields final (#28532) Skip verify versions for buggy cgroup2 handling Fix the ability to remove old plugin [TEST] Expand failure message for wildfly integration tests Add 6.2.1 version constant [DOCS] Adding 6.2 RNs [DOCS] Added entry for 6.2.0 RNs Remove feature parsing for GetIndicesAction (#28535) No refresh on shard activation needed (#28013) Improve failure message when restoring an index that already exists in the cluster (#28498) testIndexCausesIndexCreation should not use the `_primary` preference Use right skip versions. [Docs] Fix incomplete URLs (#28528) Use non deprecated xcontenthelper (#28503) Painless: Fixes a null pointer exception in certain cases of for loop usage (#28506)
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 moves away from one of the now-deprecated XContentHelper.createParser
methods in favor of specifying the deprecation logger at parser creation time.
Relates to #28449
Note that this doesn't move all the
createParsercalls because some of themuse the already-deprecated method that doesn't specify the XContentType.