You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/11/26 09:51:40 UTC
[1/2] git commit: CAMEL-6809 Introduced BridgeEndpoint option to
avoid the side effect of rabbitmq.EXCHANGE_NAME header
Updated Branches:
refs/heads/camel-2.12.x a993a0efd -> f7ee839d1
CAMEL-6809 Introduced BridgeEndpoint option to avoid the side effect of rabbitmq.EXCHANGE_NAME header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f7ee839d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f7ee839d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f7ee839d
Branch: refs/heads/camel-2.12.x
Commit: f7ee839d1a27d445a30bbb0b486ae7d744c8b147
Parents: e8c7f0e
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Nov 26 16:45:07 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Nov 26 16:50:49 2013 +0800
----------------------------------------------------------------------
.../apache/camel/component/rabbitmq/RabbitMQEndpoint.java | 9 +++++++++
.../apache/camel/component/rabbitmq/RabbitMQProducer.java | 5 +++--
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f7ee839d/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 b008646..f54f41f 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
@@ -49,6 +49,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
private boolean autoAck = true;
private boolean autoDelete = true;
private boolean durable = true;
+ private boolean bridgeEndpoint;
private String queue = String.valueOf(UUID.randomUUID().toString().hashCode());
private String exchangeName;
private String exchangeType = "direct";
@@ -230,4 +231,12 @@ public class RabbitMQEndpoint extends DefaultEndpoint {
public void setRoutingKey(String routingKey) {
this.routingKey = routingKey;
}
+
+ public void setBridgeEndpoint(boolean bridgeEndpoint) {
+ this.bridgeEndpoint = bridgeEndpoint;
+ }
+
+ public boolean isBridgeEndpoint() {
+ return bridgeEndpoint;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f7ee839d/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
index 67e3005..3331a7d 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQProducer.java
@@ -80,11 +80,12 @@ public class RabbitMQProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
String exchangeName = exchange.getIn().getHeader(RabbitMQConstants.EXCHANGE_NAME, String.class);
- if (exchangeName == null) {
+ // If it is BridgeEndpoint we should ignore the message header of EXCHANGE_NAME
+ if (exchangeName == null || getEndpoint().isBridgeEndpoint()) {
exchangeName = getEndpoint().getExchangeName();
}
if (ObjectHelper.isEmpty(exchangeName)) {
- throw new IllegalArgumentException("ExchangeName is not provided in header " + RabbitMQConstants.EXCHANGE_NAME);
+ throw new IllegalArgumentException("ExchangeName is not provided in the endpoint: " + getEndpoint());
}
String key = exchange.getIn().getHeader(RabbitMQConstants.ROUTING_KEY, "", String.class);
[2/2] git commit: CAMEL-7009 Added an integration test to verify the
ReplyTo header setting
Posted by ni...@apache.org.
CAMEL-7009 Added an integration test to verify the ReplyTo header setting
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e8c7f0e1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e8c7f0e1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e8c7f0e1
Branch: refs/heads/camel-2.12.x
Commit: e8c7f0e1e2e53ae64e9b03b8051b485bc0e465bd
Parents: a993a0e
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Nov 26 16:24:15 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Nov 26 16:50:49 2013 +0800
----------------------------------------------------------------------
.../apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e8c7f0e1/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
index 0c57391..da7b27a 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTest.java
@@ -55,6 +55,7 @@ public class RabbitMQConsumerIntTest extends CamelTestSupport {
public void sentMessageIsReceived() throws InterruptedException, IOException {
to.expectedMessageCount(1);
+ to.expectedHeaderReceived(RabbitMQConstants.REPLY_TO, "myReply");
ConnectionFactory factory = new ConnectionFactory();
factory.setHost("localhost");
@@ -65,6 +66,7 @@ public class RabbitMQConsumerIntTest extends CamelTestSupport {
Connection conn = factory.newConnection();
AMQP.BasicProperties.Builder properties = new AMQP.BasicProperties.Builder();
+ properties.replyTo("myReply");
Channel channel = conn.createChannel();
channel.basicPublish(EXCHANGE, "", properties.build(), "hello world".getBytes());