Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored MessageConsumer with onMessage to MessageHandler with handleMessage.

Browse Source
This commit is contained in:
Mark Fisher
2008-11-03 14:17:53 +00:00
parent 90dcb7e88b
commit 39a8486ac8
101 changed files with 745 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
View File

@@ -26,7 +26,7 @@ import javax.jms.QueueSession;
import javax.jms.Session;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.consumer.AbstractReplyProducingMessageConsumer;
import org.springframework.integration.consumer.AbstractReplyProducingMessageHandler;
import org.springframework.integration.consumer.ReplyMessageHolder;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
@@ -42,7 +42,7 @@ import org.springframework.util.Assert;
*
* @author Mark Fisher
*/
public class JmsOutboundGateway extends AbstractReplyProducingMessageConsumer implements InitializingBean {
public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler implements InitializingBean {
private volatile Queue jmsQueue;
@@ -74,7 +74,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageConsumer im
}
@Override
protected void onMessage(final Message<?> message, final ReplyMessageHolder replyMessageHolder) {
protected void handleRequestMessage(final Message<?> message, final ReplyMessageHolder replyMessageHolder) {
final Message<?> requestMessage = MessageBuilder.fromMessage(message).build();
this.jmsTemplate.execute(new SessionCallback() {
public Object doInJms(Session session) throws JMSException {

6
org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageConsumer.java → org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java
View File

@@ -17,7 +17,7 @@
package org.springframework.integration.jms;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.integration.message.MessageHandler;
/**
* A MessageConsumer that sends the converted Message payload within
@@ -25,9 +25,9 @@ import org.springframework.integration.message.MessageConsumer;
*
* @author Mark Fisher
*/
public class JmsSendingMessageConsumer extends AbstractJmsTemplateBasedAdapter implements MessageConsumer {
public class JmsSendingMessageHandler extends AbstractJmsTemplateBasedAdapter implements MessageHandler {
public final void onMessage(final Message<?> message) {
public final void handleMessage(final Message<?> message) {
if (message == null) {
throw new IllegalArgumentException("message must not be null");
}

4
org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParser.java
View File

@@ -23,7 +23,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
import org.springframework.integration.jms.JmsSendingMessageConsumer;
import org.springframework.integration.jms.JmsSendingMessageHandler;
import org.springframework.util.StringUtils;
/**
@@ -35,7 +35,7 @@ public class JmsOutboundChannelAdapterParser extends AbstractOutboundChannelAdap
@Override
protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(JmsSendingMessageConsumer.class);
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(JmsSendingMessageHandler.class);
String jmsTemplate = element.getAttribute(JmsAdapterParserUtils.JMS_TEMPLATE_ATTRIBUTE);
String destination = element.getAttribute(JmsAdapterParserUtils.DESTINATION_ATTRIBUTE);
String destinationName = element.getAttribute(JmsAdapterParserUtils.DESTINATION_NAME_ATTRIBUTE);

8
org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java
View File

@@ -39,7 +39,7 @@ public class JmsOutboundChannelAdapterParserTests {
"jmsOutboundWithConnectionFactoryAndDestination.xml", this.getClass());
SubscribingConsumerEndpoint endpoint = (SubscribingConsumerEndpoint) context.getBean("adapter");
DirectFieldAccessor accessor = new DirectFieldAccessor(
new DirectFieldAccessor(endpoint).getPropertyValue("consumer"));
new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
assertNotNull(accessor.getPropertyValue("jmsTemplate"));
}
@@ -49,7 +49,7 @@ public class JmsOutboundChannelAdapterParserTests {
"jmsOutboundWithConnectionFactoryAndDestinationName.xml", this.getClass());
SubscribingConsumerEndpoint endpoint = (SubscribingConsumerEndpoint) context.getBean("adapter");
DirectFieldAccessor accessor = new DirectFieldAccessor(
new DirectFieldAccessor(endpoint).getPropertyValue("consumer"));
new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
assertNotNull(accessor.getPropertyValue("jmsTemplate"));
}
@@ -59,7 +59,7 @@ public class JmsOutboundChannelAdapterParserTests {
"jmsOutboundWithDefaultConnectionFactory.xml", this.getClass());
SubscribingConsumerEndpoint endpoint = (SubscribingConsumerEndpoint) context.getBean("adapter");
DirectFieldAccessor accessor = new DirectFieldAccessor(
new DirectFieldAccessor(endpoint).getPropertyValue("consumer"));
new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
assertNotNull(accessor.getPropertyValue("jmsTemplate"));
}
@@ -69,7 +69,7 @@ public class JmsOutboundChannelAdapterParserTests {
"jmsOutboundWithHeaderMapper.xml", this.getClass());
SubscribingConsumerEndpoint endpoint = (SubscribingConsumerEndpoint) context.getBean("adapter");
DirectFieldAccessor accessor = new DirectFieldAccessor(
new DirectFieldAccessor(endpoint).getPropertyValue("consumer"));
new DirectFieldAccessor(endpoint).getPropertyValue("handler"));
JmsHeaderMapper headerMapper = (JmsHeaderMapper) accessor.getPropertyValue("headerMapper");
assertNotNull(headerMapper);
assertEquals(TestJmsHeaderMapper.class, headerMapper.getClass());

2
org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java
View File

@@ -34,7 +34,7 @@ public class JmsOutboundGatewayParserTests {
PollingConsumerEndpoint endpoint = (PollingConsumerEndpoint) context.getBean("jmsGateway");
DirectFieldAccessor accessor = new DirectFieldAccessor(endpoint);
JmsOutboundGateway gateway = (JmsOutboundGateway) accessor.getPropertyValue("consumer");
JmsOutboundGateway gateway = (JmsOutboundGateway) accessor.getPropertyValue("handler");
accessor = new DirectFieldAccessor(gateway);
MessageConverter converter = (MessageConverter)accessor.getPropertyValue("messageConverter");
assertTrue("Wrong mesage converter", converter instanceof StubMessageConverter);