From 529cf4686e8147c899699c4342a8fdd377fb9ed6 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 13 Jan 2011 12:59:32 -0500 Subject: [PATCH] INT-1743 added support for MessageHistory to JMS Channel --- spring-integration-jms/.springBeans | 3 +- .../jms/config/JmsChannelFactoryBean.java | 12 +++- .../jms/config/JmsChannelHistory-context.xml | 38 ++++++++++++ .../jms/config/JmsChannelHistoryTests.java | 62 +++++++++++++++++++ 4 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistory-context.xml create mode 100644 spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java diff --git a/spring-integration-jms/.springBeans b/spring-integration-jms/.springBeans index 9b5b9fae3b..f8e5a5287d 100644 --- a/spring-integration-jms/.springBeans +++ b/spring-integration-jms/.springBeans @@ -1,13 +1,14 @@ 1 - + src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests-context.xml + src/test/java/org/springframework/integration/jms/config/JmsChannelHistory-context.xml diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelFactoryBean.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelFactoryBean.java index 8a5af71421..04f6d355f1 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelFactoryBean.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelFactoryBean.java @@ -24,6 +24,7 @@ import javax.jms.Destination; import javax.jms.ExceptionListener; import javax.jms.Session; +import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.config.AbstractFactoryBean; import org.springframework.context.SmartLifecycle; @@ -44,9 +45,10 @@ import org.springframework.util.ErrorHandler; /** * @author Mark Fisher + * @author Oleg Zhurakousky * @since 2.0 */ -public class JmsChannelFactoryBean extends AbstractFactoryBean implements SmartLifecycle, DisposableBean { +public class JmsChannelFactoryBean extends AbstractFactoryBean implements SmartLifecycle, DisposableBean, BeanNameAware { private volatile AbstractJmsChannel channel; @@ -103,6 +105,8 @@ public class JmsChannelFactoryBean extends AbstractFactoryBean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java new file mode 100644 index 0000000000..15d8e6317f --- /dev/null +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java @@ -0,0 +1,62 @@ +/* + * Copyright 2002-2011 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.jms.config; + +import static junit.framework.Assert.assertTrue; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import org.junit.Test; +import org.mockito.Mockito; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.Message; +import org.springframework.integration.MessagingException; +import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.history.MessageHistory; +import org.springframework.integration.jms.SubscribableJmsChannel; +import org.springframework.integration.message.GenericMessage; + +/** + * @author Oleg Zhurakousky + * + */ +public class JmsChannelHistoryTests { + + @Test + public void testReqRepPerformanceWithConsecutiveMessages() throws Exception{ + ActiveMqTestUtils.prepare(); + ApplicationContext ac = new ClassPathXmlApplicationContext("JmsChannelHistory-context.xml", this.getClass()); + SubscribableJmsChannel jmsChannel = ac.getBean("jmsChannel", SubscribableJmsChannel.class); + JmsService service = ac.getBean("subscriber", JmsService.class); + + jmsChannel.send(new GenericMessage("hello")); + Thread.sleep(1000); + verify(service, times(1)).handleMessage(Mockito.any(Message.class)); + } + + public static interface JmsGateway{ + public Long echo(String time); + } + + public static class JmsService implements MessageHandler{ + public void handleMessage(Message message) throws MessagingException { + MessageHistory history = MessageHistory.read(message); + assertTrue(history.contains("jmsChannel")); + } + } +}