Skip to content

Fix RemoteFileSupplier #3683

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

Merged
CTMBNara merged 1 commit into from
Jan 23, 2025
Merged

Fix RemoteFileSupplier #3683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/execution/file/supplier/RemoteFileSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ private Future<Boolean> isSizeChanged() {
private Future<Void> downloadFile() {
return fileSystem.open(tmpPath, new OpenOptions())
.compose(tmpFile -> sendHttpRequest(getRequestOptions)
.compose(response -> response.pipeTo(tmpFile))
.onComplete(result -> tmpFile.close()));
.onFailure(ignored -> tmpFile.close())
.compose(response -> response.pipeTo(tmpFile)));
}

private Future<HttpClientResponse> sendHttpRequest(RequestOptions requestOptions) {
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/org/prebid/server/execution/file/supplier/RemoteFileSupplierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ public void getShouldReturnFailureOnNotOkStatusCode() {
final Future<String> result = target.get();

// then
verify(tmpFile).close();
FutureAssertion.assertThat(result).isFailed()
.hasMessage("Got unexpected response from server with status code 204 and message null");
}
Expand All @@ -147,7 +148,6 @@ public void getShouldReturnExpectedResult() {
final Future<String> result = target.get();

// then
verify(tmpFile).close();
assertThat(result.result()).isEqualTo(SAVE_PATH);
}

Expand Down Expand Up @@ -178,7 +178,6 @@ public void getShouldReturnExpectedResultWhenCheckRemoteFileSizeIsTrue() {
final Future<String> result = target.get();

// then
verify(tmpFile).close();
assertThat(result.result()).isEqualTo(SAVE_PATH);
}

Expand Down
Loading