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

956: Chech for null to prevent autoboxing NPE. #1241

Merged
merged 2 commits into from
Feb 13, 2019
Merged

956: Chech for null to prevent autoboxing NPE. #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86c4e84
956: Chech for null to prevent autoboxing NPE.
Feb 13, 2019
bbf2b0c
956: Add an unit test.
Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

package com.google.api.client.googleapis.media;

import static com.google.common.base.MoreObjects.firstNonNull;

import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpBackOffIOExceptionHandler;
import com.google.api.client.http.HttpBackOffUnsuccessfulResponseHandler;
Expand Down Expand Up @@ -182,7 +184,8 @@ public void download(GenericUrl requestUrl, HttpHeaders requestHeaders, OutputSt
HttpResponse response =
executeCurrentRequest(lastBytePos, requestUrl, requestHeaders, outputStream);
// All required bytes have been downloaded from the server.
mediaContentLength = response.getHeaders().getContentLength();
mediaContentLength =
firstNonNull(response.getHeaders().getContentLength(), mediaContentLength);
bytesDownloaded = mediaContentLength;
updateStateAndNotifyListener(DownloadState.MEDIA_COMPLETE);
return;
Expand Down
26 changes: 25 additions & 1 deletion ...-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpDownloaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,16 @@ private static class MediaTransport extends MockHttpTransport {
boolean testServerError;
boolean testClientError;
boolean directDownloadEnabled;
boolean contentLengthIncluded;

protected MediaTransport(int contentLength) {
this.contentLength = contentLength;
this.contentLengthIncluded = true;
}

protected MediaTransport(int contentLength, boolean contentLengthIncluded) {
this.contentLength = contentLength;
this.contentLengthIncluded = contentLengthIncluded;
}

@Override
Expand Down Expand Up @@ -74,7 +81,9 @@ public LowLevelHttpResponse execute() {
return response;
}
response.setStatusCode(200);
response.addHeader("Content-Length", String.valueOf(contentLength));
if (contentLengthIncluded) {
response.addHeader("Content-Length", String.valueOf(contentLength));
}
response.setContent(
new ByteArrayInputStream(new byte[contentLength - bytesDownloaded]));
return response;
Expand Down Expand Up @@ -327,7 +336,22 @@ public void testSetBytesDownloadedWithDirectDownload() throws Exception {
MediaHttpDownloader downloader = new MediaHttpDownloader(fakeTransport, null);
downloader.setDirectDownloadEnabled(true);
downloader.setBytesDownloaded(contentLength - 10000);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
downloader.download(new GenericUrl(TEST_REQUEST_URL), outputStream);
assertEquals(10000, outputStream.size());

// There should be 1 download call made.
assertEquals(1, fakeTransport.lowLevelExecCalls);
}

public void testSetBytesDownloadedWithDirectDownloadAndContentLengthNull() throws Exception {
int contentLength = MediaHttpDownloader.MAXIMUM_CHUNK_SIZE;
MediaTransport fakeTransport = new MediaTransport(contentLength,false);
fakeTransport.directDownloadEnabled = true;
fakeTransport.bytesDownloaded = contentLength - 10000;
MediaHttpDownloader downloader = new MediaHttpDownloader(fakeTransport, null);
downloader.setDirectDownloadEnabled(true);
downloader.setBytesDownloaded(contentLength - 10000);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
downloader.download(new GenericUrl(TEST_REQUEST_URL), outputStream);
assertEquals(10000, outputStream.size());
Expand Down