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 0f53c8ab4464f0d69fa1d2ec48071fb713af6bc4 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Apr 16 15:16:04 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 list objects and get object range --- .../camel/component/aws2/s3/AWS2S3Producer.java | 26 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 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 73feb11..636a241 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 @@ -45,8 +45,6 @@ import software.amazon.awssdk.core.ResponseInputStream; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.core.sync.ResponseTransformer; -import software.amazon.awssdk.services.kafka.model.ListClustersRequest; -import software.amazon.awssdk.services.kafka.model.ListClustersResponse; import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest; import software.amazon.awssdk.services.s3.model.BucketCannedACL; @@ -403,11 +401,20 @@ public class AWS2S3Producer extends DefaultProducer { } } - private void getObjectRange(S3Client s3Client, Exchange exchange) { + private void getObjectRange(S3Client s3Client, Exchange exchange) throws InvalidPayloadException { final String bucketName = determineBucketName(exchange); final String sourceKey = determineKey(exchange); final String rangeStart = exchange.getIn().getHeader(AWS2S3Constants.RANGE_START, String.class); final String rangeEnd = exchange.getIn().getHeader(AWS2S3Constants.RANGE_END, String.class); + + 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 { if (ObjectHelper.isEmpty(rangeStart) || ObjectHelper.isEmpty(rangeEnd)) { throw new IllegalArgumentException("A Range start and range end header must be configured to perform a range get operation."); @@ -418,15 +425,26 @@ public class AWS2S3Producer extends DefaultProducer { Message message = getMessageForResponse(exchange); message.setBody(res); + } } - private void listObjects(S3Client s3Client, Exchange exchange) { + private void listObjects(S3Client s3Client, Exchange exchange) throws InvalidPayloadException { final String bucketName = determineBucketName(exchange); + + if (getConfiguration().isPojoRequest()) { + Object payload = exchange.getIn().getMandatoryBody(); + if (payload instanceof ListObjectsRequest) { + ListObjectsResponse objectList = s3Client.listObjects((ListObjectsRequest) payload); + Message message = getMessageForResponse(exchange); + message.setBody(objectList.contents()); + } + } else { ListObjectsResponse objectList = s3Client.listObjects(ListObjectsRequest.builder().bucket(bucketName).build()); Message message = getMessageForResponse(exchange); message.setBody(objectList.contents()); + } } private AWS2S3Operations determineOperation(Exchange exchange) {
