This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit f974d9ea06b37d6280598187777f0970feb85683 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Apr 16 15:09:14 2020 +0200 CAMEL-14868 - Camel-AWS2-*: Where possible, give the possiblity to the end user to pass an AWS Request pojo as body, aws2-s3 delete Object --- .../org/apache/camel/component/aws2/s3/AWS2S3Producer.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java index f8fc5ce..c5612ce 100644 --- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java +++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java @@ -335,15 +335,24 @@ public class AWS2S3Producer extends DefaultProducer { } } - private void deleteObject(S3Client s3Client, Exchange exchange) { + private void deleteObject(S3Client s3Client, Exchange exchange) throws InvalidPayloadException { final String bucketName = determineBucketName(exchange); final String sourceKey = determineKey(exchange); + if (getConfiguration().isPojoRequest()) { + Object payload = exchange.getIn().getMandatoryBody(); + if (payload instanceof DeleteObjectRequest) { + s3Client.deleteObject((DeleteObjectRequest) payload); + Message message = getMessageForResponse(exchange); + message.setBody(true); + } + } else { DeleteObjectRequest.Builder deleteObjectRequest = DeleteObjectRequest.builder().bucket(bucketName).key(sourceKey); s3Client.deleteObject(deleteObjectRequest.build()); Message message = getMessageForResponse(exchange); message.setBody(true); + } } private void listBuckets(S3Client s3Client, Exchange exchange) {
