-
Notifications
You must be signed in to change notification settings - Fork 1k
Add PresignedFileDownload return type for presigned URL downloads #7004
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.
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
Open
jencymaryjoseph
wants to merge
1
commit into
feature/master/pre-signed-url-getobject
Choose a base branch
from
jencyjos/pre-signed-url-getobject/presigned-file-download
base: feature/master/pre-signed-url-getobject
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
.../java/software/amazon/awssdk/transfer/s3/internal/model/DefaultPresignedFileDownload.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.amazon.awssdk.transfer.s3.internal.model; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
| import software.amazon.awssdk.annotations.SdkInternalApi; | ||
| import software.amazon.awssdk.transfer.s3.model.CompletedFileDownload; | ||
| import software.amazon.awssdk.transfer.s3.model.PresignedFileDownload; | ||
| import software.amazon.awssdk.transfer.s3.progress.TransferProgress; | ||
| import software.amazon.awssdk.utils.ToString; | ||
| import software.amazon.awssdk.utils.Validate; | ||
|
|
||
| @SdkInternalApi | ||
| public final class DefaultPresignedFileDownload implements PresignedFileDownload { | ||
| private final CompletableFuture<CompletedFileDownload> completionFuture; | ||
| private final TransferProgress progress; | ||
|
|
||
| public DefaultPresignedFileDownload(CompletableFuture<CompletedFileDownload> completionFuture, | ||
| TransferProgress progress) { | ||
| this.completionFuture = Validate.paramNotNull(completionFuture, "completionFuture"); | ||
| this.progress = Validate.paramNotNull(progress, "progress"); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableFuture<CompletedFileDownload> completionFuture() { | ||
| return completionFuture; | ||
| } | ||
|
|
||
| @Override | ||
| public TransferProgress progress() { | ||
| return progress; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return ToString.builder("DefaultPresignedFileDownload") | ||
| .add("completionFuture", completionFuture) | ||
| .add("progress", progress) | ||
| .build(); | ||
| } | ||
| } | ||
34 changes: 34 additions & 0 deletions
34
...manager/src/main/java/software/amazon/awssdk/transfer/s3/model/PresignedFileDownload.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.amazon.awssdk.transfer.s3.model; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
| import software.amazon.awssdk.annotations.SdkPublicApi; | ||
| import software.amazon.awssdk.annotations.ThreadSafe; | ||
|
|
||
| /** | ||
| * A download transfer of a single object from S3 using a presigned URL. | ||
| * | ||
| * <p>Unlike {@link FileDownload}, this type does not support pause/resume because presigned URLs | ||
| * have a limited lifetime and cannot be reliably resumed after expiration. | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is the expiry time only limitation for not implementing this for pause/resume? |
||
| */ | ||
| @SdkPublicApi | ||
| @ThreadSafe | ||
| public interface PresignedFileDownload extends ObjectTransfer { | ||
|
|
||
| @Override | ||
| CompletableFuture<CompletedFileDownload> completionFuture(); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can add equals and hashcode methods and also add test with EqualsVerifier something like DefaultDownloadTest