Added 'message-converter' attribute for <jms-source> when creating a JmsMessageDrivenSourceAdapter (INT-102).

spring-integration-core/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceAdapterParserTests.java

@@ -19,6 +19,10 @@ package org.springframework.integration.adapter.jms.config;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import javax.jms.JMSException;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
 import org.junit.Test;
 
 import org.springframework.beans.factory.BeanCreationException;
@@ -28,6 +32,8 @@ import org.springframework.integration.adapter.jms.JmsMessageDrivenSourceAdapter
 import org.springframework.integration.adapter.jms.JmsPollingSourceAdapter;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.Message;
+import org.springframework.jms.support.converter.MessageConversionException;
+import org.springframework.jms.support.converter.MessageConverter;
 
 /**
  * @author Mark Fisher
@@ -104,6 +110,19 @@ public class JmsSourceAdapterParserTests {
 		context.stop();
 	}
 
+	@Test
+	public void testMessageDrivenAdapterWithMessageConverter() {
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
+				"messageDrivenAdapterWithMessageConverter.xml", this.getClass());
+		JmsMessageDrivenSourceAdapter adapter = (JmsMessageDrivenSourceAdapter) context.getBean("adapter");
+		assertEquals(JmsMessageDrivenSourceAdapter.class, adapter.getClass());
+		MessageChannel channel = (MessageChannel) context.getBean("channel");
+		Message<?> message = channel.receive(3000);
+		assertNotNull("message should not be null", message);
+		assertEquals("converted-test-message", message.getPayload());
+		context.stop();
+	}
+
 	@Test(expected=BeanDefinitionStoreException.class)
 	public void testPollingAdapterWithConnectionFactoryOnly() {
 		try {
@@ -159,4 +178,19 @@ public class JmsSourceAdapterParserTests {
 		}
 	}
 
+
+	public static class TestMessageConverter implements MessageConverter {
+
+		public Object fromMessage(javax.jms.Message message) throws JMSException, MessageConversionException {
+			String original = ((TextMessage) message).getText();
+			return "converted-" + original;
+		}
+
+		public javax.jms.Message toMessage(Object object, Session session) throws JMSException,
+				MessageConversionException {
+			return null;
+		}
+
+	}
+
 }

spring-integration-core/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithMessageConverter.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:si="http://www.springframework.org/schema/integration"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+
+	<si:message-bus/>
+
+	<si:channel id="channel"/>
+
+	<si:jms-source id="adapter"
+	               connection-factory="connectionFactory"
+	               destination="testDestination"
+	               channel="channel"
+	               message-converter="converter"/>
+
+	<bean id="converter" class="org.springframework.integration.adapter.jms.config.JmsSourceAdapterParserTests$TestMessageConverter"/>
+
+	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
+		<constructor-arg>
+			<bean class="org.springframework.integration.adapter.jms.StubConnection">
+				<constructor-arg value="test-message"/>
+			</bean>
+		</constructor-arg>
+	</bean>
+
+	<bean id="testDestination" class="org.springframework.integration.adapter.jms.StubDestination"/>
+
+</beans>

spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java

@@ -80,6 +80,18 @@ public class EndpointParserTests {
 		assertEquals("test", bean.getMessage());
 	}
 
+	@Test
+	public void testHandlerChainEndpoint() throws InterruptedException {
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
+				"endpointWithHandlerChainElement.xml", this.getClass());
+		MessageChannel channel = (MessageChannel) context.getBean("testChannel");
+		MessageChannel replyChannel = (MessageChannel) context.getBean("replyChannel");
+		channel.send(new StringMessage("test"));
+		Message<?> reply = replyChannel.receive(500);
+		assertNotNull(reply);
+		assertEquals("test-1-2-3", reply.getPayload());
+	}
+
 	@Test
 	public void testDefaultConcurrency() throws InterruptedException {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(

spring-integration-core/src/test/java/org/springframework/integration/config/TestConcatenatingHandler.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed 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.springframework.integration.config;
+
+import org.springframework.integration.handler.MessageHandler;
+import org.springframework.integration.message.Message;
+import org.springframework.integration.message.StringMessage;
+
+/**
+ * @author Mark Fisher
+ */
+public class TestConcatenatingHandler implements MessageHandler {
+
+	private String value;
+
+
+	public TestConcatenatingHandler(String value) {
+		this.value = value;
+	}
+
+
+	public Message<?> handle(Message<?> message) {
+		return new StringMessage(message.getPayload() + this.value);
+	}
+
+}

spring-integration-core/src/test/java/org/springframework/integration/config/endpointWithHandlerChainElement.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+
+	<message-bus/>
+
+	<channel id="testChannel" capacity="50"/>
+
+	<channel id="replyChannel"/>
+
+	<handler-chain id="chain">
+		<handler ref="handler1"/>
+		<handler ref="handler2"/>
+		<handler ref="handler3"/>
+	</handler-chain>
+
+	<endpoint input-channel="testChannel" handler-ref="chain" default-output-channel="replyChannel">
+		<schedule period="100"/>
+	</endpoint>
+
+	<beans:bean id="handler1" class="org.springframework.integration.config.TestConcatenatingHandler">
+		<beans:constructor-arg value="-1"/>
+	</beans:bean>
+
+	<beans:bean id="handler2" class="org.springframework.integration.config.TestConcatenatingHandler">
+		<beans:constructor-arg value="-2"/>
+	</beans:bean>
+
+	<beans:bean id="handler3" class="org.springframework.integration.config.TestConcatenatingHandler">
+		<beans:constructor-arg value="-3"/>
+	</beans:bean>
+
+</beans:beans>