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 a32d5e7bfaef0227628b81673a145971be6f7384 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Apr 16 15:13:15 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 bucket and get object --- .../camel/component/aws2/s3/AWS2S3Producer.java | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) 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 c5612ce..73feb11 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 @@ -362,25 +362,45 @@ public class AWS2S3Producer extends DefaultProducer { message.setBody(bucketsList.buckets()); } - private void deleteBucket(S3Client s3Client, Exchange exchange) { + private void deleteBucket(S3Client s3Client, Exchange exchange) throws InvalidPayloadException { final String bucketName = determineBucketName(exchange); + + if (getConfiguration().isPojoRequest()) { + Object payload = exchange.getIn().getMandatoryBody(); + if (payload instanceof DeleteBucketRequest) { + DeleteBucketResponse resp = s3Client.deleteBucket((DeleteBucketRequest) payload); + Message message = getMessageForResponse(exchange); + message.setBody(resp); + } + } else { DeleteBucketRequest.Builder deleteBucketRequest = DeleteBucketRequest.builder().bucket(bucketName); DeleteBucketResponse resp = s3Client.deleteBucket(deleteBucketRequest.build()); Message message = getMessageForResponse(exchange); message.setBody(resp); + } } - private void getObject(S3Client s3Client, Exchange exchange) { + private void getObject(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 GetObjectRequest) { + ResponseInputStream<GetObjectResponse> res = s3Client.getObject((GetObjectRequest) payload, ResponseTransformer.toInputStream()); + Message message = getMessageForResponse(exchange); + message.setBody(res); + } + } else { GetObjectRequest.Builder req = GetObjectRequest.builder().bucket(bucketName).key(sourceKey); ResponseInputStream<GetObjectResponse> res = s3Client.getObject(req.build(), ResponseTransformer.toInputStream()); Message message = getMessageForResponse(exchange); message.setBody(res); + } } private void getObjectRange(S3Client s3Client, Exchange exchange) {
