Separate Content-type and charset in RiakObject. #647
Merged
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.
Fixes #549 (CLIENTS-602).
Currently the Java client will attach a RiakObject's charset setting to the content-type:
While not 100% wrong, we should separate them.
If you save the above object to Riak, and fetch it via the HTTP interface you'll get: "application/json;charset=UTF-16; charset=UTF-16" since we duplicate the charset to the proper charset buffer, but don't remove it from the content-type.
This PR introduces a proper
charsetmember on the RiakObject class. We will no longer attach it to thecontent-type, and we don't care if they set one there or not, as to not break existing code.If this new charset member is not set it will attempt to see if there is one present in the
content-typefor thegetCharset()andhasCharset()methods, for backwards compatibility.Thanks to @gfbett for reporting the issue.