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

INT-1257, INT-1263 Refactoring Message History (work in progress): Removed MessageHistoryWriter. Added MessageHistory.

Browse Source
This commit is contained in:
Mark Fisher
2010-08-25 19:25:26 +00:00
parent 85eaa2688f
commit 1c8da6f251
12 changed files with 293 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java
View File

@@ -38,9 +38,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.Message;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.config.ConsumerEndpointFactoryBean;
import org.springframework.integration.context.MessageHistoryWriter;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageHistory;
/**
* @author Oleg Zhurakousky
@@ -79,60 +79,60 @@ public class MessageHistoryIntegrationTests {
Iterator<Properties> historyIterator = message.getHeaders().getHistory().iterator();
Properties event1 = historyIterator.next();
assertEquals("sampleGateway", event1.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("gateway", event1.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("sampleGateway", event1.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("gateway", event1.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event2 = historyIterator.next();
assertEquals("bridgeInChannel", event2.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("channel", event2.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("bridgeInChannel", event2.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("channel", event2.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event3 = historyIterator.next();
assertEquals("testBridge", event3.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("bridge", event3.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("testBridge", event3.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("bridge", event3.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event4 = historyIterator.next();
assertEquals("headerEnricherChannel", event4.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("channel", event4.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("headerEnricherChannel", event4.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("channel", event4.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event5 = historyIterator.next();
assertEquals("testHeaderEnricher", event5.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("transformer", event5.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("testHeaderEnricher", event5.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("transformer", event5.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event6 = historyIterator.next();
assertEquals("chainChannel", event6.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("channel", event6.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("chainChannel", event6.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("channel", event6.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event7 = historyIterator.next();
assertEquals("sampleChain", event7.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("chain", event7.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("sampleChain", event7.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("chain", event7.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event8 = historyIterator.next();
assertEquals("filterChannel", event8.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("channel", event8.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("filterChannel", event8.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("channel", event8.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event9 = historyIterator.next();
assertEquals("testFilter", event9.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("filter", event9.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("testFilter", event9.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("filter", event9.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event10 = historyIterator.next();
assertEquals("splitterChannel", event10.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("channel", event10.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("splitterChannel", event10.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("channel", event10.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event11 = historyIterator.next();
assertEquals("testSplitter", event11.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("splitter", event11.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("testSplitter", event11.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("splitter", event11.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event12 = historyIterator.next();
assertEquals("aggregatorChannel", event12.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("channel", event12.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("aggregatorChannel", event12.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("channel", event12.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event13 = historyIterator.next();
assertEquals("testAggregator", event13.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("aggregator", event13.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("testAggregator", event13.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("aggregator", event13.getProperty(MessageHistory.TYPE_PROPERTY));
Properties event14 = historyIterator.next();
assertEquals("endOfThePipeChannel", event14.getProperty(MessageHistoryWriter.NAME_PROPERTY));
assertEquals("channel", event14.getProperty(MessageHistoryWriter.TYPE_PROPERTY));
assertEquals("endOfThePipeChannel", event14.getProperty(MessageHistory.NAME_PROPERTY));
assertEquals("channel", event14.getProperty(MessageHistory.TYPE_PROPERTY));
MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReplyChannel();
replyChannel.send(message);
@@ -181,12 +181,12 @@ public class MessageHistoryIntegrationTests {
}
@Test(expected=BeanDefinitionParsingException.class)
public void testMessageHistoryMoreThenOneNamespaceFail() {
public void testMessageHistoryMoreThanOneNamespaceFail() {
new ClassPathXmlApplicationContext("messageHistoryWithHistoryWriterNamespace-fail.xml", MessageHistoryIntegrationTests.class);
}
@Test(expected=BeanCreationException.class)
public void testMessageHistoryMoreThenOneFail() {
@Test(expected=BeanCreationException.class) @Ignore
public void testMessageHistoryMoreThanOneFail() {
new ClassPathXmlApplicationContext("messageHistoryWithHistoryWriter-fail.xml", MessageHistoryIntegrationTests.class);
}

4
spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriter-fail.xml
View File

@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
<bean class="org.springframework.integration.context.MessageHistoryWriter"/>
<bean class="org.springframework.integration.context.MessageHistoryWriter"/>
<bean class="org.springframework.integration.context.MessageHistoryBeanPostProcessor"/>
<bean class="org.springframework.integration.context.MessageHistoryBeanPostProcessor"/>
</beans>