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 2018/07/02 08:33:07 UTC
[camel] branch master updated (b2cc756 -> 2bb65c7)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b2cc756 Upgrade Chronicle Wire to version 1.16.10
new 509348a CAMEL-12612 - Added support for Rabbitmq exclusive consumer
new 2bb65c7 CAMEL-12612 - Regen
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-rabbitmq/src/main/docs/rabbitmq-component.adoc | 6 ++++--
.../apache/camel/component/rabbitmq/RabbitConsumer.java | 2 +-
.../camel/component/rabbitmq/RabbitMQComponent.java | 15 +++++++++++++++
.../apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 14 ++++++++++++++
.../camel/component/rabbitmq/RabbitMQComponentTest.java | 3 +++
.../camel/component/rabbitmq/RabbitMQEndpointTest.java | 6 ++++++
.../springboot/RabbitMQComponentConfiguration.java | 14 ++++++++++++++
7 files changed, 57 insertions(+), 3 deletions(-)
[camel] 02/02: CAMEL-12612 - Regen
Posted by ac...@apache.org.
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 2bb65c78633ece027112367853c38419fb7f60fa
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 2 10:28:10 2018 +0200
CAMEL-12612 - Regen
---
.../camel-rabbitmq/src/main/docs/rabbitmq-component.adoc | 6 ++++--
.../springboot/RabbitMQComponentConfiguration.java | 14 ++++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
index 7f4402b..ae5153c 100644
--- a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
+++ b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
@@ -47,7 +47,7 @@ exchange name determines which exchange the queue will bind to.
=== Options
// component options: START
-The RabbitMQ component supports 48 options, which are listed below.
+The RabbitMQ component supports 49 options, which are listed below.
@@ -92,6 +92,7 @@ The RabbitMQ component supports 48 options, which are listed below.
| *autoDelete* (common) | If it is true, the exchange will be deleted when it is no longer in use | true | boolean
| *durable* (common) | If we are declaring a durable exchange (the exchange will survive a server restart) | true | boolean
| *exclusive* (common) | Exclusive queues may only be accessed by the current connection, and are deleted when that connection closes. | false | boolean
+| *exclusiveConsumer* (consumer) | Request exclusive access to the queue (meaning only this consumer can access the queue). This is useful when you want a long-lived shared queue to be temporarily accessible by just one consumer. | false | boolean
| *passive* (common) | Passive queues depend on the queue already to be available at RabbitMQ. | false | boolean
| *skipQueueDeclare* (common) | If true the producer will not declare and bind a queue. This can be used for directing messages via an existing routing key. | false | boolean
| *skipQueueBind* (common) | If true the queue will not be bound to the exchange after declaring it | false | boolean
@@ -125,7 +126,7 @@ with the following path and query parameters:
|===
-==== Query Parameters (60 parameters):
+==== Query Parameters (61 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -154,6 +155,7 @@ with the following path and query parameters:
| *autoAck* (consumer) | If messages should be auto acknowledged | true | boolean
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
| *concurrentConsumers* (consumer) | Number of concurrent consumers when consuming from broker. (eg similar as to the same option for the JMS component). | 1 | int
+| *exclusiveConsumer* (consumer) | Request exclusive access to the queue (meaning only this consumer can access the queue). This is useful when you want a long-lived shared queue to be temporarily accessible by just one consumer. | false | boolean
| *prefetchCount* (consumer) | The maximum number of messages that the server will deliver, 0 if unlimited. You need to specify the option of prefetchSize, prefetchCount, prefetchGlobal at the same time | | int
| *prefetchEnabled* (consumer) | Enables the quality of service on the RabbitMQConsumer side. You need to specify the option of prefetchSize, prefetchCount, prefetchGlobal at the same time | false | boolean
| *prefetchGlobal* (consumer) | If the settings should be applied to the entire channel rather than each consumer You need to specify the option of prefetchSize, prefetchCount, prefetchGlobal at the same time | false | boolean
diff --git a/platforms/spring-boot/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java
index bedcf07..0cc7d8a 100644
--- a/platforms/spring-boot/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-rabbitmq-starter/src/main/java/org/apache/camel/component/rabbitmq/springboot/RabbitMQComponentConfiguration.java
@@ -235,6 +235,12 @@ public class RabbitMQComponentConfiguration
*/
private Boolean exclusive = false;
/**
+ * Request exclusive access to the queue (meaning only this consumer can
+ * access the queue). This is useful when you want a long-lived shared queue
+ * to be temporarily accessible by just one consumer.
+ */
+ private Boolean exclusiveConsumer = false;
+ /**
* Passive queues depend on the queue already to be available at RabbitMQ.
*/
private Boolean passive = false;
@@ -587,6 +593,14 @@ public class RabbitMQComponentConfiguration
this.exclusive = exclusive;
}
+ public Boolean getExclusiveConsumer() {
+ return exclusiveConsumer;
+ }
+
+ public void setExclusiveConsumer(Boolean exclusiveConsumer) {
+ this.exclusiveConsumer = exclusiveConsumer;
+ }
+
public Boolean getPassive() {
return passive;
}
[camel] 01/02: CAMEL-12612 - Added support for Rabbitmq exclusive
consumer
Posted by ac...@apache.org.
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 509348a3230d7e7b69a2a37255a69f41dadd7fa3
Author: Darrell King <ki...@gmail.com>
AuthorDate: Sun Jul 1 08:58:15 2018 +0100
CAMEL-12612 - Added support for Rabbitmq exclusive consumer
---
.../apache/camel/component/rabbitmq/RabbitConsumer.java | 2 +-
.../camel/component/rabbitmq/RabbitMQComponent.java | 15 +++++++++++++++
.../apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 14 ++++++++++++++
.../camel/component/rabbitmq/RabbitMQComponentTest.java | 3 +++
.../camel/component/rabbitmq/RabbitMQEndpointTest.java | 6 ++++++
5 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
index 8727673..b30a051 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitConsumer.java
@@ -174,7 +174,7 @@ class RabbitConsumer implements com.rabbitmq.client.Consumer {
if (channel == null) {
throw new IOException("The RabbitMQ channel is not open");
}
- tag = channel.basicConsume(consumer.getEndpoint().getQueue(), consumer.getEndpoint().isAutoAck(), this);
+ tag = channel.basicConsume(consumer.getEndpoint().getQueue(), consumer.getEndpoint().isAutoAck(), "", false, consumer.getEndpoint().isExclusiveConsumer(), null, this);
}
/**
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
index c258a5c..96c1ac8 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
@@ -59,6 +59,8 @@ public class RabbitMQComponent extends UriEndpointComponent {
private boolean autoDelete = true;
@Metadata(label = "common", defaultValue = "true")
private boolean durable = true;
+ @Metadata(label = "consumer")
+ private boolean exclusiveConsumer;
@Metadata(label = "common")
private boolean exclusive;
@Metadata(label = "common")
@@ -229,6 +231,7 @@ public class RabbitMQComponent extends UriEndpointComponent {
endpoint.setAutoDelete(isAutoDelete());
endpoint.setDurable(isDurable());
endpoint.setExclusive(isExclusive());
+ endpoint.setExclusiveConsumer(isExclusiveConsumer());
endpoint.setPassive(isPassive());
endpoint.setSkipExchangeDeclare(isSkipExchangeDeclare());
endpoint.setSkipQueueBind(isSkipQueueBind());
@@ -742,6 +745,18 @@ public class RabbitMQComponent extends UriEndpointComponent {
this.exclusive = exclusive;
}
+ public boolean isExclusiveConsumer() {
+ return exclusiveConsumer;
+ }
+
+ /**
+ * Request exclusive access to the queue (meaning only this consumer can access the queue). This is useful
+ * when you want a long-lived shared queue to be temporarily accessible by just one consumer.
+ */
+ public void setExclusiveConsumer(boolean exclusiveConsumer) {
+ this.exclusiveConsumer = exclusiveConsumer;
+ }
+
public boolean isPassive() {
return passive;
}
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
index 39de2e3..837ca59 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
@@ -76,6 +76,8 @@ public class RabbitMQEndpoint extends DefaultEndpoint implements AsyncEndpoint {
private boolean autoDelete = true;
@UriParam(label = "common", defaultValue = "true")
private boolean durable = true;
+ @UriParam(label = "consumer", defaultValue = "false")
+ private boolean exclusiveConsumer;
@UriParam(label = "common")
private boolean exclusive;
@UriParam(label = "common")
@@ -985,6 +987,18 @@ public class RabbitMQEndpoint extends DefaultEndpoint implements AsyncEndpoint {
this.exclusive = exclusive;
}
+ public boolean isExclusiveConsumer() {
+ return exclusiveConsumer;
+ }
+
+ /**
+ * Request exclusive access to the queue (meaning only this consumer can access the queue). This is useful
+ * when you want a long-lived shared queue to be temporarily accessible by just one consumer.
+ */
+ public void setExclusiveConsumer(boolean exclusiveConsumer) {
+ this.exclusiveConsumer = exclusiveConsumer;
+ }
+
public boolean isPassive() {
return passive;
}
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
index d734917..4b59443 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
@@ -44,6 +44,7 @@ public class RabbitMQComponentTest {
assertEquals(true, endpoint.isAutoAck());
assertEquals(true, endpoint.isAutoDelete());
assertEquals(true, endpoint.isDurable());
+ assertEquals(false, endpoint.isExclusiveConsumer());
assertEquals("direct", endpoint.getExchangeType());
assertEquals(ConnectionFactory.DEFAULT_CONNECTION_TIMEOUT, endpoint.getConnectionTimeout());
assertEquals(ConnectionFactory.DEFAULT_CHANNEL_MAX, endpoint.getRequestedChannelMax());
@@ -68,6 +69,7 @@ public class RabbitMQComponentTest {
params.put("requestedChannelMax", 456);
params.put("requestedFrameMax", 789);
params.put("requestedHeartbeat", 321);
+ params.put("exclusiveConsumer", true);
RabbitMQEndpoint endpoint = createEndpoint(params);
@@ -86,6 +88,7 @@ public class RabbitMQComponentTest {
assertEquals(456, endpoint.getRequestedChannelMax());
assertEquals(789, endpoint.getRequestedFrameMax());
assertEquals(321, endpoint.getRequestedHeartbeat());
+ assertEquals(true, endpoint.isExclusiveConsumer());
}
private RabbitMQEndpoint createEndpoint(Map<String, Object> params) throws Exception {
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
index 518e9e6..914173a 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
@@ -345,6 +345,12 @@ public class RabbitMQEndpointTest extends CamelTestSupport {
}
@Test
+ public void createEndpointWithExclusiveConsumerEnabled() throws Exception {
+ RabbitMQEndpoint endpoint = context.getEndpoint("rabbitmq:localhost/exchange?exclusiveConsumer=true", RabbitMQEndpoint.class);
+ assertTrue(endpoint.isExclusiveConsumer());
+ }
+
+ @Test
public void createEndpointWithPassiveEnabled() throws Exception {
RabbitMQEndpoint endpoint = context.getEndpoint("rabbitmq:localhost/exchange?passive=true", RabbitMQEndpoint.class);
assertTrue(endpoint.isPassive());