This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8e3780d372a589a8dc77b1763ea7a1d241e87c3c
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jan 10 10:10:45 2019 +0100
CAMEL-13044 - Camel-AWS MQ: it is not possible to set Broker "Public
accessibility" parameter using createBroker command
---
.../apache/camel/component/aws/mq/MQConstants.java | 21 +++++++++++----------
.../apache/camel/component/aws/mq/MQProducer.java | 7 +++++++
.../component/aws/mq/MQProducerSpringTest.java | 1 +
.../camel/component/aws/mq/MQProducerTest.java | 1 +
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQConstants.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQConstants.java
index 31ef98f..937d780 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQConstants.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQConstants.java
@@ -21,14 +21,15 @@ package org.apache.camel.component.aws.mq;
*
*/
public interface MQConstants {
- String OPERATION = "CamelAwsMQOperation";
- String MAX_RESULTS = "CamelAwsMQMaxResults";
- String BROKER_NAME = "CamelAwsMQBrokerName";
- String BROKER_ENGINE = "CamelAwsMQBrokerEngine";
- String BROKER_ENGINE_VERSION = "CamelAwsMQBrokerEngineVersion";
- String BROKER_ID = "CamelAwsMQBrokerID";
- String CONFIGURATION_ID = "CamelAwsMQConfigurationID";
- String BROKER_DEPLOYMENT_MODE = "CamelAwsMQBrokerDeploymentMode";
- String BROKER_INSTANCE_TYPE = "CamelAwsMQBrokerInstanceType";
- String BROKER_USERS = "CamelAwsMQBrokerUsers";
+ String OPERATION = "CamelAwsMQOperation";
+ String MAX_RESULTS = "CamelAwsMQMaxResults";
+ String BROKER_NAME = "CamelAwsMQBrokerName";
+ String BROKER_ENGINE = "CamelAwsMQBrokerEngine";
+ String BROKER_ENGINE_VERSION = "CamelAwsMQBrokerEngineVersion";
+ String BROKER_ID = "CamelAwsMQBrokerID";
+ String CONFIGURATION_ID = "CamelAwsMQConfigurationID";
+ String BROKER_DEPLOYMENT_MODE = "CamelAwsMQBrokerDeploymentMode";
+ String BROKER_INSTANCE_TYPE = "CamelAwsMQBrokerInstanceType";
+ String BROKER_USERS = "CamelAwsMQBrokerUsers";
+ String BROKER_PUBLICLY_ACCESSIBLE = "CamelAwsMQBrokerPubliclyAccessible";
}
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
index d02848e..b8043c8 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/mq/MQProducer.java
@@ -130,6 +130,7 @@ public class MQProducer extends DefaultProducer {
String brokerEngineVersion;
String deploymentMode;
String instanceType;
+ Boolean publiclyAccessible;
List<User> users;
CreateBrokerRequest request = new CreateBrokerRequest();
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_NAME))) {
@@ -166,6 +167,12 @@ public class MQProducer extends DefaultProducer {
} else {
throw new IllegalArgumentException("A Users list must be
specified");
}
+ if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(MQConstants.BROKER_PUBLICLY_ACCESSIBLE)))
{
+ publiclyAccessible =
exchange.getIn().getHeader(MQConstants.BROKER_PUBLICLY_ACCESSIBLE,
Boolean.class);
+ request.withPubliclyAccessible(publiclyAccessible);
+ } else {
+ request.withPubliclyAccessible(false);
+ }
CreateBrokerResult result;
try {
result = mqClient.createBroker(request);
diff --git
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
index 7822cf9..ce8a81d 100644
---
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
+++
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/MQProducerSpringTest.java
@@ -75,6 +75,7 @@ public class MQProducerSpringTest extends
CamelSpringTestSupport {
exchange.getIn().setHeader(MQConstants.BROKER_INSTANCE_TYPE,
"mq.t2.micro");
exchange.getIn().setHeader(MQConstants.BROKER_ENGINE,
EngineType.ACTIVEMQ.name());
exchange.getIn().setHeader(MQConstants.BROKER_ENGINE_VERSION,
"5.15.6");
+
exchange.getIn().setHeader(MQConstants.BROKER_PUBLICLY_ACCESSIBLE, false);
List<User> users = new ArrayList<>();
User user = new User();
user.setUsername("camel");
diff --git
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
index 54f12a0..5e2128d 100644
---
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
+++
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/mq/MQProducerTest.java
@@ -75,6 +75,7 @@ public class MQProducerTest extends CamelTestSupport {
exchange.getIn().setHeader(MQConstants.BROKER_INSTANCE_TYPE,
"mq.t2.micro");
exchange.getIn().setHeader(MQConstants.BROKER_ENGINE,
EngineType.ACTIVEMQ.name());
exchange.getIn().setHeader(MQConstants.BROKER_ENGINE_VERSION,
"5.15.6");
+
exchange.getIn().setHeader(MQConstants.BROKER_PUBLICLY_ACCESSIBLE, false);
List<User> users = new ArrayList<>();
User user = new User();
user.setUsername("camel");
