You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/01/10 09:33:16 UTC
[camel] branch camel-2.21.x updated (7cbc287 -> cd1304f)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7cbc287 CAMEL-13041 - Added docs
new a8f6674 CAMEL-13044 - Camel-AWS MQ: it is not possible to set Broker "Public accessibility" parameter using createBroker command
new cd1304f CAMEL-13045 - Updated docs
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel-aws/src/main/docs/aws-mq-component.adoc | 2 ++
.../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 +
5 files changed, 22 insertions(+), 10 deletions(-)
[camel] 02/02: CAMEL-13045 - Updated docs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cd1304f6272f710a8e1fcb063988f813d06d625c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jan 10 10:17:43 2019 +0100
CAMEL-13045 - Updated docs
---
components/camel-aws/src/main/docs/aws-mq-component.adoc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/components/camel-aws/src/main/docs/aws-mq-component.adoc b/components/camel-aws/src/main/docs/aws-mq-component.adoc
index 520e266..21454b5 100644
--- a/components/camel-aws/src/main/docs/aws-mq-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-mq-component.adoc
@@ -113,6 +113,8 @@ the https://aws.amazon.com/it/ec2/[Amazon EC2] service.
|`CamelAwsMQBrokerEngineVersion` |`String` |The Broker Engine Version for MQ. Currently you can choose between 5.15.6 and 5.15.0 of ACTIVEMQ
|`CamelAwsMQBrokerUsers` |`List<User>` |The list of users for MQ
+
+|`CamelAwsMQBrokerPubliclyAccessible` |`Boolean` |If the MQ instance must be publicly available or not. Default is false.
|=======================================================================
Dependencies
[camel] 01/02: CAMEL-13044 - Camel-AWS MQ: it is not possible to
set Broker "Public accessibility" parameter using createBroker command
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a8f6674cfbb27f3e881493198c7610171ccf09bf
Author: Andrea Cosentino <an...@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");