Allow passing versioned media types to 7.x server #65362
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
a follow up after elastic#63071 where it missed the XContentType.fromMediaType method. That method also have to remove the vendor specific substrings (vnd.elasticsearch+ and compatible-with parameter) from mediaType value relates elastic#51816
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
…ing_vnd_media_type
jakelandis
reviewed
Nov 24, 2020
| @@ -151,7 +151,8 @@ public static XContentType fromMediaTypeOrFormat(String mediaType) { | |||
| private static String removeVersionInMediaType(String mediaType) { | |||
| if (mediaType.contains("vnd.elasticsearch")) { | |||
| return mediaType.replaceAll("vnd.elasticsearch\\+", "") | |||
| .replaceAll("\\s*;\\s*compatible-with=\\d+", ""); | |||
| .replaceAll("\\s*;\\s*compatible-with=\\d+", "") | |||
| .replaceAll("\\s*;\\s*",";"); // to allow matching using startsWith | |||
There was a problem hiding this comment.
not sure I understand the comment ?
There was a problem hiding this comment.
matching in fromMediaTypeOrFormat can use startsWith so that
application/json; charset=utf-8 can be matched. however this assumes that ; is immediately following mediaTypeWithoutParameters
I don't want to refactor this in 7.x, the intention of .replaceAll("\\s*;\\s*",";"); was to make it slightly easier if you provided application/vnd.elasticsearch+json;compatible-with=7 ; charset=utf-8 with accidental space.
There was a problem hiding this comment.
I have updated the comment with a reference to a method
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.
a follow up after #63071 where it missed the XContentType.fromMediaType
method.
That method also have to remove the vendor specific substrings
(vnd.elasticsearch+ and compatible-with parameter) from mediaType value
relates #51816
gradle check?