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 9dc925b59d008140eb9e4e4a80e6277b6992132c Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue Apr 14 10:39:19 2020 +0200 CAMEL-14868 - Camel-AWS2-*: Where possible, give the possiblity to the end user to pass an AWS Request pojo as body, aws2-kms list keys --- .../camel/component/aws2/kms/KMS2Configuration.java | 13 +++++++++++++ .../apache/camel/component/aws2/kms/KMS2Producer.java | 17 +++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java index a8b7e4c6..b3cde67 100644 --- a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java +++ b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java @@ -47,6 +47,8 @@ public class KMS2Configuration implements Cloneable { private Integer proxyPort; @UriParam private String region; + @UriParam(defaultValue = "false") + private boolean pojoRequest; public KmsClient getKmsClient() { return kmsClient; @@ -137,6 +139,17 @@ public class KMS2Configuration implements Cloneable { public void setRegion(String region) { this.region = region; } + + public boolean isPojoRequest() { + return pojoRequest; + } + + /** + * If we want to use a POJO request as body or not + */ + public void setPojoRequest(boolean pojoRequest) { + this.pojoRequest = pojoRequest; + } // ************************************************* // diff --git a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java index 74ab670..46069e0 100644 --- a/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java +++ b/components/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Producer.java @@ -25,6 +25,8 @@ import org.apache.camel.util.URISupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import software.amazon.awssdk.awscore.exception.AwsServiceException; +import software.amazon.awssdk.services.ec2.model.RunInstancesRequest; +import software.amazon.awssdk.services.ec2.model.RunInstancesResponse; import software.amazon.awssdk.services.kms.KmsClient; import software.amazon.awssdk.services.kms.model.CreateKeyRequest; import software.amazon.awssdk.services.kms.model.CreateKeyResponse; @@ -109,6 +111,20 @@ public class KMS2Producer extends DefaultProducer { } private void listKeys(KmsClient kmsClient, Exchange exchange) { + if (getConfiguration().isPojoRequest()) { + Object payload = exchange.getIn().getMandatoryBody(); + if (payload instanceof ListKeysRequest) { + ListKeysResponse result; + try { + result = kmsClient.listKeys((ListKeysRequest) payload); + } catch (AwsServiceException ase) { + LOG.trace("List Keys command returned the error code {}", ase.awsErrorDetails().errorCode()); + throw ase; + } + Message message = getMessageForResponse(exchange); + message.setBody(result); + } + } else { ListKeysRequest.Builder builder = ListKeysRequest.builder(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(KMS2Constants.LIMIT))) { int limit = exchange.getIn().getHeader(KMS2Constants.LIMIT, Integer.class); @@ -123,6 +139,7 @@ public class KMS2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); + } } private void createKey(KmsClient kmsClient, Exchange exchange) {