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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1e960d
fix: default application/json charset to utf-8
chingor13 Mar 2, 2021
0dd63c9
fix: invert equality check to avoid NPE
chingor13 Mar 2, 2021
b57091d
revert: VisibleForTesting was not used
chingor13 Mar 2, 2021
9505eae
chore: fix lint
chingor13 Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java
View file
Open in desktop
Expand Up @@ -512,8 +512,17 @@ public String parseAsString() throws IOException {
* @since 1.10
*/
public Charset getContentCharset() {
return mediaType == null || mediaType.getCharsetParameter() == null
? StandardCharsets.ISO_8859_1
: mediaType.getCharsetParameter();
if (mediaType != null) {
// use specified charset parameter from content/type header if available
if (mediaType.getCharsetParameter() != null) {
return mediaType.getCharsetParameter();
}
// fallback to well-known charsets
if ("application".equals(mediaType.getType()) && "json".equals(mediaType.getSubType())) {
// https://tools.ietf.org/html/rfc4627 - JSON must be encoded with UTF-8
return StandardCharsets.UTF_8;
}
}
return StandardCharsets.ISO_8859_1;
}
}
32 changes: 32 additions & 0 deletions google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java
View file
Open in desktop
Expand Up @@ -58,10 +58,12 @@ public void testParseAsString_none() throws Exception {

private static final String SAMPLE = "123\u05D9\u05e0\u05D9\u05D1";
private static final String SAMPLE2 = "123abc";
private static final String JSON_SAMPLE = "{\"foo\": \"ßar\"}";
private static final String VALID_CONTENT_TYPE = "text/plain";
private static final String VALID_CONTENT_TYPE_WITH_PARAMS =
"application/vnd.com.google.datastore.entity+json; charset=utf-8; version=v1; q=0.9";
private static final String INVALID_CONTENT_TYPE = "!!!invalid!!!";
private static final String JSON_CONTENT_TYPE = "application/json";

public void testParseAsString_utf8() throws Exception {
HttpTransport transport =
Expand All @@ -83,6 +85,7 @@ public LowLevelHttpResponse execute() throws IOException {
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
HttpResponse response = request.execute();
assertEquals(SAMPLE, response.parseAsString());
assertEquals("UTF-8", response.getContentCharset().name());
}

public void testParseAsString_noContentType() throws Exception {
Expand All @@ -104,6 +107,7 @@ public LowLevelHttpResponse execute() throws IOException {
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
HttpResponse response = request.execute();
assertEquals(SAMPLE2, response.parseAsString());
assertEquals("ISO-8859-1", response.getContentCharset().name());
}

public void testParseAsString_validContentType() throws Exception {
Expand All @@ -129,6 +133,7 @@ public LowLevelHttpResponse execute() throws IOException {
assertEquals(SAMPLE2, response.parseAsString());
assertEquals(VALID_CONTENT_TYPE, response.getContentType());
assertNotNull(response.getMediaType());
assertEquals("ISO-8859-1", response.getContentCharset().name());
}

public void testParseAsString_validContentTypeWithParams() throws Exception {
Expand All @@ -154,6 +159,7 @@ public LowLevelHttpResponse execute() throws IOException {
assertEquals(SAMPLE2, response.parseAsString());
assertEquals(VALID_CONTENT_TYPE_WITH_PARAMS, response.getContentType());
assertNotNull(response.getMediaType());
assertEquals("UTF-8", response.getContentCharset().name());
}

public void testParseAsString_invalidContentType() throws Exception {
Expand All @@ -179,6 +185,32 @@ public LowLevelHttpResponse execute() throws IOException {
assertEquals(SAMPLE2, response.parseAsString());
assertEquals(INVALID_CONTENT_TYPE, response.getContentType());
assertNull(response.getMediaType());
assertEquals("ISO-8859-1", response.getContentCharset().name());
}

public void testParseAsString_jsonContentType() throws IOException {
HttpTransport transport =
new MockHttpTransport() {
@Override
public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
return new MockLowLevelHttpRequest() {
@Override
public LowLevelHttpResponse execute() throws IOException {
MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
result.setContent(JSON_SAMPLE);
result.setContentType(JSON_CONTENT_TYPE);
return result;
}
};
}
};
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);

HttpResponse response = request.execute();
assertEquals(JSON_SAMPLE, response.parseAsString());
assertEquals(JSON_CONTENT_TYPE, response.getContentType());
assertEquals("UTF-8", response.getContentCharset().name());
}

public void testStatusCode_negative_dontThrowException() throws Exception {
Expand Down