Spring/spring-integration-aws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix S3MessageHandler for key from file

Browse Source
This commit is contained in:
abilan
2023-07-13 15:57:57 -04:00
parent 4e2ed1a7bb
commit 29235e643a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/integration/aws/outbound/S3MessageHandler.java
View File

@@ -266,6 +266,9 @@ public class S3MessageHandler extends AbstractReplyProducingMessageHandler {
if (this.keyExpression != null) {
key = this.keyExpression.getValue(this.evaluationContext, requestMessage, String.class);
}
else if (payload instanceof File fileToUpload) {
key = fileToUpload.getName();
}
if (payload instanceof File fileToUpload && fileToUpload.isDirectory()) {
UploadDirectoryRequest.Builder uploadDirectoryRequest =
@@ -302,9 +305,6 @@ public class S3MessageHandler extends AbstractReplyProducingMessageHandler {
requestBody = AsyncRequestBody.fromBytes(body);
}
else if (payload instanceof File fileToUpload) {
if (key == null) {
putObjectRequestBuilder.key(fileToUpload.getName());
}
if (putObjectRequest.contentMD5() == null) {
String contentMd5 = Md5Utils.md5AsBase64(fileToUpload);
putObjectRequestBuilder.contentMD5(contentMd5);