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 65b4653cbcc4e624ef6f3df97e328dcd7fd6249d Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue Apr 14 11:11:28 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 scheduled key deletion --- .../apache/camel/component/aws2/kms/KMS2Producer.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 83f34d8..0d04235 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 @@ -175,7 +175,7 @@ public class KMS2Producer extends DefaultProducer { } } - private void disableKey(KmsClient kmsClient, Exchange exchange) { + private void disableKey(KmsClient kmsClient, Exchange exchange) throws InvalidPayloadException { if (getConfiguration().isPojoRequest()) { Object payload = exchange.getIn().getMandatoryBody(); if (payload instanceof DisableKeyRequest) { @@ -210,6 +210,20 @@ public class KMS2Producer extends DefaultProducer { } private void scheduleKeyDeletion(KmsClient kmsClient, Exchange exchange) { + if (getConfiguration().isPojoRequest()) { + Object payload = exchange.getIn().getMandatoryBody(); + if (payload instanceof ScheduleKeyDeletionRequest) { + ScheduleKeyDeletionResponse result; + try { + result = kmsClient.scheduleKeyDeletion((ScheduleKeyDeletionRequest) payload); + } catch (AwsServiceException ase) { + LOG.trace("Schedule Key Deletion command returned the error code {}", ase.awsErrorDetails().errorCode()); + throw ase; + } + Message message = getMessageForResponse(exchange); + message.setBody(result); + } + } else { ScheduleKeyDeletionRequest.Builder builder = ScheduleKeyDeletionRequest.builder(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(KMS2Constants.KEY_ID))) { String keyId = exchange.getIn().getHeader(KMS2Constants.KEY_ID, String.class); @@ -230,6 +244,7 @@ public class KMS2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); + } } private void describeKey(KmsClient kmsClient, Exchange exchange) {