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 2011/10/15 12:51:33 UTC
svn commit: r1183621 - in /camel/trunk/components/camel-jms/src:
main/java/org/apache/camel/component/jms/JmsBinding.java
test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
Author: davsclaus
Date: Sat Oct 15 10:51:33 2011
New Revision: 1183621
URL: http://svn.apache.org/viewvc?rev=1183621&view=rev
Log:
CAMEL-4540: Direct routing JMS to JMS now checks for jmsMessageType matches if configured on destination endpoint.
Added:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java?rev=1183621&r1=1183620&r2=1183621&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java Sat Oct 15 10:51:33 2011
@@ -252,6 +252,24 @@ public class JmsBinding {
JmsMessage jmsMessage = (JmsMessage)camelMessage;
if (!jmsMessage.shouldCreateNewMessage() || force) {
answer = jmsMessage.getJmsMessage();
+
+ if (!force) {
+ // answer must match endpoint type
+ JmsMessageType type = endpoint != null ? endpoint.getConfiguration().getJmsMessageType() : null;
+ if (type != null && answer != null) {
+ if (type == JmsMessageType.Text) {
+ answer = answer instanceof TextMessage ? answer : null;
+ } else if (type == JmsMessageType.Bytes) {
+ answer = answer instanceof BytesMessage ? answer : null;
+ } else if (type == JmsMessageType.Map) {
+ answer = answer instanceof MapMessage ? answer : null;
+ } else if (type == JmsMessageType.Object) {
+ answer = answer instanceof ObjectMessage ? answer : null;
+ } else if (type == JmsMessageType.Stream) {
+ answer = answer instanceof StreamMessage ? answer : null;
+ }
+ }
+ }
}
}
Added: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java?rev=1183621&view=auto
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java (added)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java Sat Oct 15 10:51:33 2011
@@ -0,0 +1,105 @@
+/**
+ * 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.jms;
+
+import javax.jms.ConnectionFactory;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+
+/**
+ *
+ */
+public class FromTextToBytesMessageTest extends CamelTestSupport {
+
+ @Test
+ public void testTextToBytes() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:bar");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("activemq:queue:foo", "3");
+
+ assertMockEndpointsSatisfied();
+
+ javax.jms.Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage();
+ assertNotNull(msg);
+ assertIsInstanceOf(javax.jms.BytesMessage.class, msg);
+ }
+
+ @Test
+ public void testTextToBytesHeader() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:bar");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("activemq:queue:header", "3");
+
+ assertMockEndpointsSatisfied();
+
+ javax.jms.Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage();
+ assertNotNull(msg);
+ assertIsInstanceOf(javax.jms.BytesMessage.class, msg);
+ }
+
+ @Test
+ public void testTextToText() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:bar");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("activemq:queue:text", "Hello");
+
+ assertMockEndpointsSatisfied();
+
+ javax.jms.Message msg = mock.getReceivedExchanges().get(0).getIn(JmsMessage.class).getJmsMessage();
+ assertNotNull(msg);
+ assertIsInstanceOf(javax.jms.TextMessage.class, msg);
+ }
+
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext camelContext = super.createCamelContext();
+
+ ConnectionFactory connectionFactory = CamelJmsTestHelper.createConnectionFactory();
+ camelContext.addComponent("activemq", jmsComponentAutoAcknowledge(connectionFactory));
+
+ return camelContext;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("activemq:queue:foo?jmsMessageType=Text")
+ .to("activemq:queue:bar?jmsMessageType=Bytes");
+
+ from("activemq:queue:header?jmsMessageType=Text")
+ .setHeader("myHeader", constant("123"))
+ .to("activemq:queue:bar?jmsMessageType=Bytes");
+
+ from("activemq:queue:text?jmsMessageType=Text")
+ .to("activemq:queue:bar?jmsMessageType=Text");
+
+ from("activemq:queue:bar")
+ .to("mock:bar");
+ }
+ };
+ }
+}