Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: default application/json charset to utf-8 #1305

Merged
merged 4 commits into from
Mar 3, 2021
Merged

fix: default application/json charset to utf-8 #1305

merged 4 commits into from
Mar 3, 2021

Conversation

chingor13
Copy link
Collaborator

Fixes #1102

@chingor13 chingor13 requested a review from a team as a code owner March 2, 2021 20:47
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Mar 2, 2021
chingor13
chingor13 commented Mar 2, 2021
View reviewed changes
google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java Outdated
Comment on lines 522 to 526
// fallback to well-known charsets
if (mediaType.getType().equals("application") && mediaType.getSubType().equals("json")) {
// https://tools.ietf.org/html/rfc4627 - JSON must be encoded with UTF-8
return StandardCharsets.UTF_8;
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fallback code can be refactored if we want to add more defaults.

@codecov
Copy link

codecov bot commented Mar 2, 2021 •
edited
Loading

Codecov Report

Merging #1305 (bc8c228) into master (1db338b) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@      Coverage Diff       @@
##   master   #1305   +/-   ##
==============================
==============================

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1db338b...9505eae. Read the comment docs.

@chingor13 chingor13 requested a review from elharo March 3, 2021 16:15
@chingor13 chingor13 added the automerge Merge the pull request once unit tests and other checks pass. label Mar 3, 2021
@gcf-merge-on-green gcf-merge-on-green bot merged commit c4dfb48 into master Mar 3, 2021
@gcf-merge-on-green gcf-merge-on-green bot deleted the json-charsets branch March 3, 2021 17:20
@gcf-merge-on-green gcf-merge-on-green bot removed the automerge Merge the pull request once unit tests and other checks pass. label Mar 3, 2021
gcf-merge-on-green bot pushed a commit that referenced this pull request Mar 15, 2021
@release-please
chore: release 1.39.1 (#1300)
02a2b0b 
🤖 I have created a release \*beep\* \*boop\*
---
### [1.39.1](https://www.github.com/googleapis/google-http-java-client/compare/v1.39.0...v1.39.1) (2021-03-15)


### Bug Fixes

* default application/json charset to utf-8 ([#1305](https://www.github.com/googleapis/google-http-java-client/issues/1305)) ([c4dfb48](https://www.github.com/googleapis/google-http-java-client/commit/c4dfb48cb8248564b19efdf1a4272eb6fafe3138)), closes [#1102](https://www.github.com/googleapis/google-http-java-client/issues/1102)
* when disconnecting, close the underlying connection before the response InputStream ([#1315](https://www.github.com/googleapis/google-http-java-client/issues/1315)) ([f84ed59](https://www.github.com/googleapis/google-http-java-client/commit/f84ed5964f376ada5eb724a3d1f3ac526d31d9c5)), closes [#1303](https://www.github.com/googleapis/google-http-java-client/issues/1303)


### Documentation

* 19.0.0 libraries-bom ([#1312](https://www.github.com/googleapis/google-http-java-client/issues/1312)) ([62be21b](https://www.github.com/googleapis/google-http-java-client/commit/62be21b84a5394455d828b0f97f9e53352b8aa18))
* update version ([#1296](https://www.github.com/googleapis/google-http-java-client/issues/1296)) ([f17755c](https://www.github.com/googleapis/google-http-java-client/commit/f17755cf5e8ccbf441131ebb13fe60028fb63850))


### Dependencies

* update dependency com.fasterxml.jackson.core:jackson-core to v2.12.2 ([#1309](https://www.github.com/googleapis/google-http-java-client/issues/1309)) ([aa7d703](https://www.github.com/googleapis/google-http-java-client/commit/aa7d703d94e5e34d849bc753cfe8bd332ff80443))
* update dependency com.google.protobuf:protobuf-java to v3.15.3 ([#1301](https://www.github.com/googleapis/google-http-java-client/issues/1301)) ([1db338b](https://www.github.com/googleapis/google-http-java-client/commit/1db338b8b98465e03e93013b40fd8d821ac245c8))
* update dependency com.google.protobuf:protobuf-java to v3.15.6 ([#1310](https://www.github.com/googleapis/google-http-java-client/issues/1310)) ([9cb50e4](https://www.github.com/googleapis/google-http-java-client/commit/9cb50e49e1cfc196b915465bb6ecbd90fb6d04d7))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
This was referenced Mar 16, 2021
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
This was referenced Mar 16, 2021
Closed
Closed
Merged
Closed
Closed
Closed
Closed
Merged
Closed
Closed
Merged
Closed
Closed
Merged
Closed
Closed
Closed
Closed
@lesv lesv mentioned this pull request Sep 22, 2021
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elharo elharo elharo approved these changes

Assignees
No one assigned
Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

the default charset incorrect when the content-type is application/json
2 participants
@chingor13 @elharo