Skip to content

Performance improvements for SRA changes. #4864

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
millems merged 1 commit into from
Jan 30, 2024
Merged

Performance improvements for SRA changes. #4864

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
2 changes: 1 addition & 1 deletion ...p-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/BaseSignRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ default <T> boolean hasProperty(SignerProperty<T> property) {
* The value, {@link T}, is return when present, and an exception is thrown otherwise.
*/
default <T> T requireProperty(SignerProperty<T> property) {
return Validate.notNull(property(property), property.toString() + " must not be null!");
return Validate.notNull(property(property), "%s must not be null!", property);
}

/**
Expand Down
12 changes: 12 additions & 0 deletions ...src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,18 @@ private <T extends Identity> SdkHttpFullRequest doSraSign(SdkHttpFullRequest req
private SdkHttpFullRequest toSdkHttpFullRequest(SignedRequest signedRequest) {
SdkHttpRequest request = signedRequest.request();

// Optimization: don't do any conversion if we can avoid it.
if (request instanceof SdkHttpFullRequest) {
SdkHttpFullRequest fullRequest = (SdkHttpFullRequest) request;
if (signedRequest.payload().orElse(null) == fullRequest.contentStreamProvider().orElse(null)) {
return fullRequest;
}

return fullRequest.toBuilder()
.contentStreamProvider(signedRequest.payload().orElse(null))
.build();
}

return SdkHttpFullRequest.builder()
.contentStreamProvider(signedRequest.payload().orElse(null))
.protocol(request.protocol())
Expand Down