You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/08/10 14:42:01 UTC
svn commit: r564575 - in /activemq/camel/trunk/components:
camel-activemq/src/main/java/org/apache/camel/component/activemq/
camel-activemq/src/main/resources/META-INF/services/org/apache/camel/
camel-activemq/src/main/resources/org/ camel-activemq/src...
Author: jstrachan
Date: Fri Aug 10 05:42:00 2007
New Revision: 564575
URL: http://svn.apache.org/viewvc?view=rev&rev=564575
Log:
added more test cases for CAMEL-96 - along with a type converter for ActiveMQ destinations <-> String etc
Added:
activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConverter.java (with props)
activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
activemq/camel/trunk/components/camel-activemq/src/main/resources/org/
activemq/camel/trunk/components/camel-activemq/src/main/resources/org/apache/
activemq/camel/trunk/components/camel-activemq/src/main/resources/org/apache/camel/
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
- copied, changed from r564568, activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
Modified:
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
Added: activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConverter.java?view=auto&rev=564575
==============================================================================
--- activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConverter.java (added)
+++ activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConverter.java Fri Aug 10 05:42:00 2007
@@ -0,0 +1,42 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.activemq;
+
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.camel.Converter;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+@Converter
+public class ActiveMQConverter {
+ /**
+ * Converts a URL in ActiveMQ syntax to a destination such as to support
+ * "queue://foo.bar" or 'topic://bar.whatnot". Things default to queues if no scheme.
+ *
+ * This allows ActiveMQ destinations to be passed around as Strings and converted back again.
+ *
+ * @param name is the name of the queue or the full URI using prefixes queue:// or topic://
+ * @return the ActiveMQ destination
+ */
+ @Converter
+ public static ActiveMQDestination toDestination(String name) {
+ return ActiveMQDestination.createDestination(name, ActiveMQDestination.QUEUE_TYPE);
+ }
+
+}
Propchange: activemq/camel/trunk/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/TypeConverter?view=auto&rev=564575
==============================================================================
--- activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/TypeConverter (added)
+++ activemq/camel/trunk/components/camel-activemq/src/main/resources/META-INF/services/org/apache/camel/TypeConverter Fri Aug 10 05:42:00 2007
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+org.apache.camel.component.activemq
\ No newline at end of file
Modified: activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java?view=diff&rev=564575&r1=564574&r2=564575
==============================================================================
--- activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java Fri Aug 10 05:42:00 2007
@@ -25,31 +25,46 @@
import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
import org.apache.camel.component.jms.JmsExchange;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.mock.AssertionClause;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.jms.Message;
+import javax.jms.Destination;
import java.util.Date;
+import java.util.List;
/**
* @version $Revision: 538973 $
*/
public class ActiveMQJmsHeaderRouteTest extends ContextTestSupport {
+ private static final transient Log LOG = LogFactory.getLog(ActiveMQJmsHeaderRouteTest.class);
+
protected Object expectedBody = "<time>" + new Date() + "</time>";
protected ActiveMQQueue replyQueue = new ActiveMQQueue("test.reply.queue");
protected String correlationID = "ABC-123";
protected String messageType = getClass().getName();
- public void testJmsRouteWithTextMessage() throws Exception {
+ public void testForwardingAMessageAcrossJMSKeepingCustomJMSHeaders() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(expectedBody);
- resultEndpoint.message(0).header("cheese").isEqualTo(123);
- resultEndpoint.message(0).header("JMSReplyTo").convertTo(String.class).isEqualTo(replyQueue.toString());
- resultEndpoint.message(0).header("JMSCorrelationID").isEqualTo(correlationID);
- resultEndpoint.message(0).header("JMSType").isEqualTo(messageType);
+ AssertionClause firstMessageExpectations = resultEndpoint.message(0);
+ firstMessageExpectations.header("cheese").isEqualTo(123);
+ firstMessageExpectations.header("JMSReplyTo").isEqualTo(replyQueue);
+ firstMessageExpectations.header("JMSCorrelationID").isEqualTo(correlationID);
+ firstMessageExpectations.header("JMSType").isEqualTo(messageType);
template.sendBodyAndHeader("activemq:test.a", expectedBody, "cheese", 123);
resultEndpoint.assertIsSatisfied();
+
+ List<Exchange> list = resultEndpoint.getReceivedExchanges();
+ Exchange exchange = list.get(0);
+ Object replyTo = exchange.getIn().getHeader("JMSReplyTo");
+ LOG.info("Reply to is: " + replyTo);
+ Destination destination = assertIsInstanceOf(Destination.class, replyTo);
+ assertEquals("ReplyTo", replyQueue.toString(), destination.toString());
}
protected CamelContext createCamelContext() throws Exception {
Copied: activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java (from r564568, activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java?view=diff&rev=564575&p1=activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java&r1=564568&p2=activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java&r2=564575
==============================================================================
--- activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java Fri Aug 10 05:42:00 2007
@@ -20,36 +20,55 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
-import org.apache.camel.component.jms.JmsExchange;
+import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-import javax.jms.Message;
+import javax.jms.Destination;
import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @version $Revision: 538973 $
*/
-public class ActiveMQJmsHeaderRouteTest extends ContextTestSupport {
+public class ActiveMQReplyToHeaderUsingConverterTest extends ContextTestSupport {
+ private static final transient Log LOG = LogFactory.getLog(ActiveMQReplyToHeaderUsingConverterTest.class);
+
protected Object expectedBody = "<time>" + new Date() + "</time>";
- protected ActiveMQQueue replyQueue = new ActiveMQQueue("test.reply.queue");
+ protected String replyQueueName = "queue://test.my.reply.queue";
protected String correlationID = "ABC-123";
protected String messageType = getClass().getName();
- public void testJmsRouteWithTextMessage() throws Exception {
+ public void testSendingAMessageFromCamelSetsCustomJmsHeaders() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedBodiesReceived(expectedBody);
- resultEndpoint.message(0).header("cheese").isEqualTo(123);
- resultEndpoint.message(0).header("JMSReplyTo").convertTo(String.class).isEqualTo(replyQueue.toString());
- resultEndpoint.message(0).header("JMSCorrelationID").isEqualTo(correlationID);
- resultEndpoint.message(0).header("JMSType").isEqualTo(messageType);
-
- template.sendBodyAndHeader("activemq:test.a", expectedBody, "cheese", 123);
+ AssertionClause firstMessage = resultEndpoint.message(0);
+ firstMessage.header("cheese").isEqualTo(123);
+ firstMessage.header("JMSCorrelationID").isEqualTo(correlationID);
+ firstMessage.header("JMSReplyTo").isEqualTo(ActiveMQConverter.toDestination(replyQueueName));
+ firstMessage.header("JMSType").isEqualTo(messageType);
+
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put("cheese", 123);
+ headers.put("JMSReplyTo", replyQueueName);
+ headers.put("JMSCorrelationID", correlationID);
+ headers.put("JMSType", messageType);
+ template.sendBodyAndHeaders("activemq:test.a", expectedBody, headers);
resultEndpoint.assertIsSatisfied();
+
+ List<Exchange> list = resultEndpoint.getReceivedExchanges();
+ Exchange exchange = list.get(0);
+ Object replyTo = exchange.getIn().getHeader("JMSReplyTo");
+ LOG.info("Reply to is: " + replyTo);
+ Destination destination = assertIsInstanceOf(Destination.class, replyTo);
+ assertEquals("ReplyTo", replyQueueName, destination.toString());
}
protected CamelContext createCamelContext() throws Exception {
@@ -65,16 +84,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("activemq:test.a").process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- // lets set the custom JMS headers using the JMS API
- JmsExchange jmsExchange = assertIsInstanceOf(JmsExchange.class, exchange);
- Message inMessage = jmsExchange.getInMessage();
- inMessage.setJMSReplyTo(replyQueue);
- inMessage.setJMSCorrelationID(correlationID);
- inMessage.setJMSType(messageType);
- }
- }).to("activemq:test.b");
+ from("activemq:test.a").to("activemq:test.b");
from("activemq:test.b").to("mock:result");
}
Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?view=diff&rev=564575&r1=564574&r2=564575
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java Fri Aug 10 05:42:00 2007
@@ -77,7 +77,10 @@
public Object getHeader(String name) {
Object answer = null;
- if (jmsMessage != null) {
+
+ // we will exclude using JMS-prefixed headers here to avoid strangeness with some JMS providers
+ // e.g. ActiveMQ returns the String not the Destination type for "JMSReplyTo"!
+ if (jmsMessage != null && !name.startsWith("JMS")) {
try {
answer = jmsMessage.getObjectProperty(name);
} catch (JMSException e) {