You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/04/06 07:25:32 UTC
[1/4] camel git commit: CAMEL-9815 Add URI parameter to skip
declaration of exchange
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 8cb691789 -> 9d8f0c200
refs/heads/master 92becd2a9 -> b86e52d0a
CAMEL-9815 Add URI parameter to skip declaration of exchange
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/27f6cdbd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/27f6cdbd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/27f6cdbd
Branch: refs/heads/master
Commit: 27f6cdbd8eb1e56fc6b482a7e0e25fdedefd9d1d
Parents: 92becd2
Author: Fabian Chanton <fa...@misurio.ch>
Authored: Tue Apr 5 11:21:06 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 6 07:18:35 2016 +0200
----------------------------------------------------------------------
.../component/rabbitmq/RabbitMQDeclareSupport.java | 8 +++++++-
.../camel/component/rabbitmq/RabbitMQEndpoint.java | 14 ++++++++++++++
.../component/rabbitmq/RabbitMQEndpointTest.java | 6 ++++++
3 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/27f6cdbd/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index aa4df2f..2539d50 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -45,7 +45,9 @@ public class RabbitMQDeclareSupport {
}
private void declareAndBindExchangeWithQueue(final Channel channel) throws IOException {
- declareExchange(channel, endpoint.getExchangeName(), endpoint.getExchangeType(), resolvedExchangeArguments());
+ if(shouldDeclareExchange()){
+ declareExchange(channel, endpoint.getExchangeName(), endpoint.getExchangeType(), resolvedExchangeArguments());
+ }
if (shouldDeclareQueue()) {
// need to make sure the queueDeclare is same with the exchange declare
@@ -80,6 +82,10 @@ public class RabbitMQDeclareSupport {
private boolean shouldDeclareQueue() {
return !endpoint.isSkipQueueDeclare() && endpoint.getQueue() != null;
}
+
+ private boolean shouldDeclareExchange() {
+ return !endpoint.isSkipExchangeDeclare();
+ }
private void populateQueueArgumentsFromConfigurer(final Map<String, Object> queueArgs) {
if (endpoint.getQueueArgsConfigurer() != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/27f6cdbd/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
----------------------------------------------------------------------
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 3600d33..4293ca7 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
@@ -80,6 +80,8 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
@UriParam(label = "producer")
private boolean skipQueueDeclare;
@UriParam
+ private boolean skipExchangeDeclare;
+ @UriParam
private Address[] addresses;
@UriParam(defaultValue = "" + ConnectionFactory.DEFAULT_CONNECTION_TIMEOUT)
private int connectionTimeout = ConnectionFactory.DEFAULT_CONNECTION_TIMEOUT;
@@ -403,6 +405,18 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
public boolean isSkipQueueDeclare() {
return skipQueueDeclare;
}
+
+ /**
+ * If true the producer will not declare the exchange.
+ * This can be used if we need to declare the queue but not the exchange
+ */
+ public void setSkipExchangeDeclare(boolean skipExchangeDeclare) {
+ this.skipExchangeDeclare = skipExchangeDeclare;
+ }
+
+ public boolean isSkipExchangeDeclare() {
+ return skipExchangeDeclare;
+ }
/**
* If the bridgeEndpoint is true, the producer will ignore the message header of "rabbitmq.EXCHANGE_NAME" and "rabbitmq.ROUTING_KEY"
http://git-wip-us.apache.org/repos/asf/camel/blob/27f6cdbd/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
----------------------------------------------------------------------
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 a3290c9..291c907 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
@@ -254,4 +254,10 @@ public class RabbitMQEndpointTest extends CamelTestSupport {
RabbitMQEndpoint endpoint = context.getEndpoint("rabbitmq:localhost/exchange?skipQueueDeclare=true", RabbitMQEndpoint.class);
assertTrue(endpoint.isSkipQueueDeclare());
}
+
+ @Test
+ public void createEndpointWithSkipExchangeDeclareEnabled() throws Exception {
+ RabbitMQEndpoint endpoint = context.getEndpoint("rabbitmq:localhost/exchange?skipExchangeDeclare=true", RabbitMQEndpoint.class);
+ assertTrue(endpoint.isSkipExchangeDeclare());
+ }
}
[2/4] camel git commit: Fixed CS. This closes #928.
Posted by da...@apache.org.
Fixed CS. This closes #928.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b86e52d0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b86e52d0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b86e52d0
Branch: refs/heads/master
Commit: b86e52d0a6e5b5d6095727346594978ea2a15cf7
Parents: 27f6cdb
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 6 07:21:13 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 6 07:23:47 2016 +0200
----------------------------------------------------------------------
.../camel/component/rabbitmq/RabbitMQDeclareSupport.java | 6 +++---
.../org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b86e52d0/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index 2539d50..5b17370 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -45,9 +45,9 @@ public class RabbitMQDeclareSupport {
}
private void declareAndBindExchangeWithQueue(final Channel channel) throws IOException {
- if(shouldDeclareExchange()){
- declareExchange(channel, endpoint.getExchangeName(), endpoint.getExchangeType(), resolvedExchangeArguments());
- }
+ if (shouldDeclareExchange()) {
+ declareExchange(channel, endpoint.getExchangeName(), endpoint.getExchangeType(), resolvedExchangeArguments());
+ }
if (shouldDeclareQueue()) {
// need to make sure the queueDeclare is same with the exchange declare
http://git-wip-us.apache.org/repos/asf/camel/blob/b86e52d0/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
----------------------------------------------------------------------
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 4293ca7..71721cf 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
@@ -407,7 +407,6 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
}
/**
- * If true the producer will not declare the exchange.
* This can be used if we need to declare the queue but not the exchange
*/
public void setSkipExchangeDeclare(boolean skipExchangeDeclare) {
[3/4] camel git commit: CAMEL-9815 Add URI parameter to skip
declaration of exchange
Posted by da...@apache.org.
CAMEL-9815 Add URI parameter to skip declaration of exchange
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1c710c4b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1c710c4b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1c710c4b
Branch: refs/heads/camel-2.17.x
Commit: 1c710c4bae03012d92daef294f63ab350c4e78fa
Parents: 8cb6917
Author: Fabian Chanton <fa...@misurio.ch>
Authored: Tue Apr 5 11:21:06 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 6 07:25:17 2016 +0200
----------------------------------------------------------------------
.../component/rabbitmq/RabbitMQDeclareSupport.java | 8 +++++++-
.../camel/component/rabbitmq/RabbitMQEndpoint.java | 14 ++++++++++++++
.../component/rabbitmq/RabbitMQEndpointTest.java | 6 ++++++
3 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1c710c4b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index aa4df2f..2539d50 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -45,7 +45,9 @@ public class RabbitMQDeclareSupport {
}
private void declareAndBindExchangeWithQueue(final Channel channel) throws IOException {
- declareExchange(channel, endpoint.getExchangeName(), endpoint.getExchangeType(), resolvedExchangeArguments());
+ if(shouldDeclareExchange()){
+ declareExchange(channel, endpoint.getExchangeName(), endpoint.getExchangeType(), resolvedExchangeArguments());
+ }
if (shouldDeclareQueue()) {
// need to make sure the queueDeclare is same with the exchange declare
@@ -80,6 +82,10 @@ public class RabbitMQDeclareSupport {
private boolean shouldDeclareQueue() {
return !endpoint.isSkipQueueDeclare() && endpoint.getQueue() != null;
}
+
+ private boolean shouldDeclareExchange() {
+ return !endpoint.isSkipExchangeDeclare();
+ }
private void populateQueueArgumentsFromConfigurer(final Map<String, Object> queueArgs) {
if (endpoint.getQueueArgsConfigurer() != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/1c710c4b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
----------------------------------------------------------------------
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 3600d33..4293ca7 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
@@ -80,6 +80,8 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
@UriParam(label = "producer")
private boolean skipQueueDeclare;
@UriParam
+ private boolean skipExchangeDeclare;
+ @UriParam
private Address[] addresses;
@UriParam(defaultValue = "" + ConnectionFactory.DEFAULT_CONNECTION_TIMEOUT)
private int connectionTimeout = ConnectionFactory.DEFAULT_CONNECTION_TIMEOUT;
@@ -403,6 +405,18 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
public boolean isSkipQueueDeclare() {
return skipQueueDeclare;
}
+
+ /**
+ * If true the producer will not declare the exchange.
+ * This can be used if we need to declare the queue but not the exchange
+ */
+ public void setSkipExchangeDeclare(boolean skipExchangeDeclare) {
+ this.skipExchangeDeclare = skipExchangeDeclare;
+ }
+
+ public boolean isSkipExchangeDeclare() {
+ return skipExchangeDeclare;
+ }
/**
* If the bridgeEndpoint is true, the producer will ignore the message header of "rabbitmq.EXCHANGE_NAME" and "rabbitmq.ROUTING_KEY"
http://git-wip-us.apache.org/repos/asf/camel/blob/1c710c4b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
----------------------------------------------------------------------
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 a3290c9..291c907 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
@@ -254,4 +254,10 @@ public class RabbitMQEndpointTest extends CamelTestSupport {
RabbitMQEndpoint endpoint = context.getEndpoint("rabbitmq:localhost/exchange?skipQueueDeclare=true", RabbitMQEndpoint.class);
assertTrue(endpoint.isSkipQueueDeclare());
}
+
+ @Test
+ public void createEndpointWithSkipExchangeDeclareEnabled() throws Exception {
+ RabbitMQEndpoint endpoint = context.getEndpoint("rabbitmq:localhost/exchange?skipExchangeDeclare=true", RabbitMQEndpoint.class);
+ assertTrue(endpoint.isSkipExchangeDeclare());
+ }
}
[4/4] camel git commit: Fixed CS. This closes #928.
Posted by da...@apache.org.
Fixed CS. This closes #928.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d8f0c20
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d8f0c20
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d8f0c20
Branch: refs/heads/camel-2.17.x
Commit: 9d8f0c200d2085c961bf72d0b29545bb555fc0dd
Parents: 1c710c4
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 6 07:21:13 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 6 07:25:23 2016 +0200
----------------------------------------------------------------------
.../camel/component/rabbitmq/RabbitMQDeclareSupport.java | 6 +++---
.../org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9d8f0c20/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index 2539d50..5b17370 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -45,9 +45,9 @@ public class RabbitMQDeclareSupport {
}
private void declareAndBindExchangeWithQueue(final Channel channel) throws IOException {
- if(shouldDeclareExchange()){
- declareExchange(channel, endpoint.getExchangeName(), endpoint.getExchangeType(), resolvedExchangeArguments());
- }
+ if (shouldDeclareExchange()) {
+ declareExchange(channel, endpoint.getExchangeName(), endpoint.getExchangeType(), resolvedExchangeArguments());
+ }
if (shouldDeclareQueue()) {
// need to make sure the queueDeclare is same with the exchange declare
http://git-wip-us.apache.org/repos/asf/camel/blob/9d8f0c20/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java
----------------------------------------------------------------------
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 4293ca7..71721cf 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
@@ -407,7 +407,6 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
}
/**
- * If true the producer will not declare the exchange.
* This can be used if we need to declare the queue but not the exchange
*/
public void setSkipExchangeDeclare(boolean skipExchangeDeclare) {