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 19e9b25897925178f278923c7e4f89e6b5a68cca Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Apr 15 12:36:55 2020 +0200 CAMEL-14868 - Camel-AWS2-*: Where possible, give the possiblity to the end user to pass an AWS Request pojo as body, aws2-mq list brokers --- .../camel/component/aws2/mq/MQ2Configuration.java | 13 +++++++++++++ .../apache/camel/component/aws2/mq/MQ2Producer.java | 20 +++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Configuration.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Configuration.java index 32efa04..2128ab2 100644 --- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Configuration.java +++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Configuration.java @@ -47,6 +47,8 @@ public class MQ2Configuration implements Cloneable { private Integer proxyPort; @UriParam private String region; + @UriParam(defaultValue = "false") + private boolean pojoRequest; public MqClient getAmazonMqClient() { return amazonMqClient; @@ -138,6 +140,17 @@ public class MQ2Configuration 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-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java index c10bec6..d9a769d 100644 --- a/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java +++ b/components/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2Producer.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; +import org.apache.camel.InvalidPayloadException; import org.apache.camel.Message; import org.apache.camel.support.DefaultProducer; import org.apache.camel.util.ObjectHelper; @@ -27,6 +28,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.kms.model.ListKeysRequest; +import software.amazon.awssdk.services.kms.model.ListKeysResponse; import software.amazon.awssdk.services.mq.MqClient; import software.amazon.awssdk.services.mq.model.ConfigurationId; import software.amazon.awssdk.services.mq.model.CreateBrokerRequest; @@ -110,7 +113,21 @@ public class MQ2Producer extends DefaultProducer { return (MQ2Endpoint)super.getEndpoint(); } - private void listBrokers(MqClient mqClient, Exchange exchange) { + private void listBrokers(MqClient mqClient, Exchange exchange) throws InvalidPayloadException { + if (getConfiguration().isPojoRequest()) { + Object payload = exchange.getIn().getMandatoryBody(); + if (payload instanceof ListBrokersRequest) { + ListBrokersResponse result; + try { + result = mqClient.listBrokers((ListBrokersRequest) payload); + } catch (AwsServiceException ase) { + LOG.trace("List Brokers command returned the error code {}", ase.awsErrorDetails().errorCode()); + throw ase; + } + Message message = getMessageForResponse(exchange); + message.setBody(result); + } + } else { ListBrokersRequest.Builder builder = ListBrokersRequest.builder(); if (ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQ2Constants.MAX_RESULTS))) { int maxResults = exchange.getIn().getHeader(MQ2Constants.MAX_RESULTS, Integer.class); @@ -125,6 +142,7 @@ public class MQ2Producer extends DefaultProducer { } Message message = getMessageForResponse(exchange); message.setBody(result); + } } @SuppressWarnings("unchecked")
