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: HttpResponse GZip content encoding equality change #843

Merged
merged 7 commits into from Oct 29, 2019
Merged

fix: HttpResponse GZip content encoding equality change #843

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f39135
Issue #842 - HttpResponse GZip content encoding equality change
egsavage Oct 14, 2019
08adb6e
Merge remote-tracking branch 'upstream/master' into http-response-gzi…
egsavage Oct 19, 2019
af5b469
Issue #842 - Added unit test, PR updates
egsavage Oct 19, 2019
2cc4fe7
Issue #842 - Adjusted spacing, dropped ignoreCase on comparison
egsavage Oct 20, 2019
beeac46
Issue #842 - Enforce locale on encoding comparison, add unit tests
egsavage Oct 27, 2019
abda56b
Issue #842 - Removed final, fixed spelling
egsavage Oct 27, 2019
80aa603
Issue #842 - test updates
egsavage Oct 29, 2019
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
8 changes: 4 additions & 4 deletions google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java
View file
Open in desktop
Expand Up @@ -334,11 +334,11 @@ public InputStream getContent() throws IOException {
try {
// gzip encoding (wrap content with GZipInputStream)
if (!returnRawInputStream
&& this.contentEncoding != null
&& (CONTENT_ENCODING_GZIP.equalsIgnoreCase(this.contentEncoding.trim())
|| CONTENT_ENCODING_XGZIP.equalsIgnoreCase(this.contentEncoding.trim()))) {
&& this.contentEncoding != null
&& (CONTENT_ENCODING_GZIP.equals(this.contentEncoding.trim())
egsavage marked this conversation as resolved.
Show resolved Hide resolved
|| CONTENT_ENCODING_XGZIP.equals(this.contentEncoding.trim()))) {
lowLevelResponseContent =
new ConsumingInputStream(new GZIPInputStream(lowLevelResponseContent));
new ConsumingInputStream(new GZIPInputStream(lowLevelResponseContent));
}
// logging (wrap content with LoggingInputStream)
Logger logger = HttpTransport.LOGGER;
Expand Down
21 changes: 10 additions & 11 deletions google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java
View file
Open in desktop
Expand Up @@ -503,20 +503,19 @@ public void testGetContent_otherEncodingWithgzipInItsName_GzipIsNotUsed() throws
mockResponse.setContentType("text/plain");

HttpTransport transport =
new MockHttpTransport() {
new MockHttpTransport() {
@Override
public LowLevelHttpRequest buildRequest(String method, final String url)
throws IOException {
return new MockLowLevelHttpRequest() {
@Override
public LowLevelHttpRequest buildRequest(String method, final String url)
throws IOException {
return new MockLowLevelHttpRequest() {
@Override
public LowLevelHttpResponse execute() throws IOException {
return mockResponse;
}
};
public LowLevelHttpResponse execute() throws IOException {
return mockResponse;
}
};
HttpRequest request =
transport.createRequestFactory().buildHeadRequest(HttpTesting.SIMPLE_GENERIC_URL);
}
};
HttpRequest request = transport.createRequestFactory().buildHeadRequest(HttpTesting.SIMPLE_GENERIC_URL);
// If gzip was used on this response, an exception would be thrown
HttpResponse response = request.execute();
assertEquals("abcd", response.parseAsString());
Expand Down