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:23:29 UTC
[camel] branch camel-2.x updated (4cc5e58 -> 175732e)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4cc5e58 CAMEL-13045 - Camel-Slack: The verifier must be able to validate webhook and token at the same time
new 997d11c CAMEL-13044 - Camel-AWS MQ: it is not possible to set Broker "Public accessibility" parameter using createBroker command
new 175732e 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.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 175732e0de3100ddaaccfa82c3fe118e5375b5e4
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 d0560b6..45fe459 100644
--- a/components/camel-aws/src/main/docs/aws-mq-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-mq-component.adoc
@@ -139,6 +139,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.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 997d11c6d934e7d4128e3a2bc4b2d8faca5394fe
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 f0cbd2d..a9338c2 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
@@ -135,6 +135,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))) {
@@ -173,6 +174,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 ec28fc9..8544896 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
@@ -76,6 +76,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 6f86244..0a1ee25 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
@@ -76,6 +76,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");