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

INT-1183 added bean resolution support for expression based splitters

Browse Source
This commit is contained in:
Mark Fisher
2010-06-16 21:38:00 +00:00
parent 40f05047d2
commit 1c75b71884
3 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageProcessingSplitter.java
View File

@@ -16,6 +16,7 @@
package org.springframework.integration.splitter;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.core.convert.ConversionService;
import org.springframework.integration.core.Message;
import org.springframework.integration.handler.AbstractMessageProcessor;
@@ -45,6 +46,9 @@ abstract class AbstractMessageProcessingSplitter extends AbstractMessageSplitter
if (conversionService != null && this.messageProcessor instanceof AbstractMessageProcessor) {
((AbstractMessageProcessor) this.messageProcessor).setConversionService(conversionService);
}
if (this.messageProcessor instanceof BeanFactoryAware) {
((BeanFactoryAware) this.messageProcessor).setBeanFactory(this.getBeanFactory());
}
}
@Override

12
spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests-context.xml
View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/integration"
<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"
xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd">
<channel id="input"/>
<channel id="output">
<queue/>
</channel>
<splitter input-channel="input" expression="payload.numbers.?[#this&lt;5]" output-channel="output"/>
<splitter input-channel="simpleInput" expression="payload.numbers.?[#this&lt;5]" output-channel="output"/>
<splitter input-channel="beanResolvingInput" expression="@testBean.split(payload)" output-channel="output"/>
<beans:bean id="testBean" class="org.springframework.integration.splitter.SpelSplitterIntegrationTests$TestBean"/>
</beans:beans>

38
spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests.java
View File

@@ -26,7 +26,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.integration.channel.PollableChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
@@ -41,17 +40,20 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@RunWith(SpringJUnit4ClassRunner.class)
public class SpelSplitterIntegrationTests {
@Autowired @Qualifier("input")
private MessageChannel input;
@Autowired
private MessageChannel simpleInput;
@Autowired @Qualifier("output")
@Autowired
private MessageChannel beanResolvingInput;
@Autowired
private PollableChannel output;
@Test
public void split() {
public void simple() {
Message<?> message = MessageBuilder.withPayload(new TestBean()).setHeader("foo", "foo").build();
this.input.send(message);
this.simpleInput.send(message);
Message<?> one = output.receive(0);
Message<?> two = output.receive(0);
Message<?> three = output.receive(0);
@@ -66,9 +68,23 @@ public class SpelSplitterIntegrationTests {
assertEquals("foo", four.getHeaders().get("foo"));
assertNull(output.receive(0));
}
@Test
public void beanResolving() {
Message<?> message = MessageBuilder.withPayload("a,b,c,d").build();
this.beanResolvingInput.send(message);
Message<?> a = output.receive(0);
Message<?> b = output.receive(0);
Message<?> c = output.receive(0);
Message<?> d = output.receive(0);
assertEquals("a", a.getPayload());
assertEquals("b", b.getPayload());
assertEquals("c", c.getPayload());
assertEquals("d", d.getPayload());
assertNull(output.receive(0));
}
static class TestBean {
private final List<Integer> numbers = new ArrayList<Integer>();
@@ -82,6 +98,10 @@ public class SpelSplitterIntegrationTests {
public List<Integer> getNumbers() {
return this.numbers;
}
public String[] split(String s) {
return s.split(",");
}
}
}