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

INT-1354 added support for "expression" attributes on the <header> sub-elements of a <gateway>

Browse Source
This commit is contained in:
Mark Fisher
2010-08-17 19:15:27 +00:00
parent 700b89e99a
commit 1f0d9d6e45
7 changed files with 149 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests-context.xml
View File

@@ -5,25 +5,48 @@
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"
xmlns:int="http://www.springframework.org/schema/integration">
<int:gateway id="gateway"
<int:gateway id="gatewayWithHeaderValues"
service-interface="org.springframework.integration.gateway.HeaderEnrichedGatewayTests$SampleGateway">
<int:method name="sendString" request-channel="input">
<int:header name="foo" value="#{stringValue}"/>
<int:method name="sendString" request-channel="channel">
<int:header name="foo" value="#{stringValueFoo}"/>
<int:header name="bar" value="bar"/>
</int:method>
<int:method name="sendInteger" request-channel="input">
<int:method name="sendInteger" request-channel="channel">
<int:header name="foo" value="foo"/>
<int:header name="bar" value="bar"/>
</int:method>
<int:method name="sendStringWithParameterHeaders" request-channel="input">
<int:method name="sendStringWithParameterHeaders" request-channel="channel">
<int:header name="foo" value="foo"/>
<int:header name="bar" value="bar"/>
</int:method>
</int:gateway>
<int:gateway id="gatewayWithHeaderExpressions"
service-interface="org.springframework.integration.gateway.HeaderEnrichedGatewayTests$SampleGateway">
<int:method name="sendString" request-channel="channel">
<int:header name="foo" expression="6 * 7"/>
<int:header name="bar" expression="'foobar'"/>
</int:method>
<int:method name="sendInteger" request-channel="channel">
<int:header name="foo" expression="42"/>
<int:header name="bar" expression="@stringValueFoo + @stringValueBar"/>
</int:method>
<int:method name="sendStringWithParameterHeaders" request-channel="channel">
<int:header name="foo" expression="@stringValueFoo.length() + 39"/>
<int:header name="bar" expression="'foo' + @stringValueBar"/>
</int:method>
</int:gateway>
<bean id="stringValue" class="java.lang.String">
<bean id="stringValueFoo" class="java.lang.String">
<constructor-arg value="foo"/>
</bean>
<bean id="stringValueBar" class="java.lang.String">
<constructor-arg value="bar"/>
</bean>
<int:channel id="input"/>
<int:channel id="channel">
<int:queue/>
</int:channel>
</beans>

90
spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests.java
View File

@@ -21,21 +21,18 @@ import static junit.framework.Assert.assertNull;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.annotation.Header;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.PollableChannel;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Oleg Zhurakousky
* @author Mark Fisher
* @since 2.0
*/
@RunWith(SpringJUnit4ClassRunner.class)
@@ -43,52 +40,69 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
public class HeaderEnrichedGatewayTests {
@Autowired
private SampleGateway gateway;
private SampleGateway gatewayWithHeaderValues;
@Autowired
private DirectChannel input;
private SampleGateway gatewayWithHeaderExpressions;
@Autowired
private PollableChannel channel;
private Object testPayload;
@Test
public void validateStaticHeaderMappings() throws Exception {
MessageHandler handler = Mockito.mock(MessageHandler.class);
input.subscribe(handler);
this.prepareHandlerForTest(handler);
public void validateHeaderValueMappings() throws Exception {
testPayload = "hello";
gateway.sendString((String) testPayload);
Mockito.verify(handler, Mockito.times(1)).handleMessage(Mockito.any(Message.class));
this.prepareHandlerForTest(handler);
gatewayWithHeaderValues.sendString((String) testPayload);
Message<?> message1 = channel.receive(0);
assertEquals(testPayload, message1.getPayload());
assertEquals("foo", message1.getHeaders().get("foo"));
assertEquals("bar", message1.getHeaders().get("bar"));
assertNull(message1.getHeaders().get(MessageHeaders.PREFIX + "baz"));
testPayload = 123;
gateway.sendInteger((Integer) testPayload);
Mockito.verify(handler, Mockito.times(1)).handleMessage(Mockito.any(Message.class));
this.prepareHandlerForTest(handler);
gatewayWithHeaderValues.sendInteger((Integer) testPayload);
Message<?> message2 = channel.receive(0);
assertEquals(testPayload, message2.getPayload());
assertEquals("foo", message2.getHeaders().get("foo"));
assertEquals("bar", message2.getHeaders().get("bar"));
assertNull(message2.getHeaders().get(MessageHeaders.PREFIX + "baz"));
testPayload = "withAnnotatedHeaders";
gateway.sendStringWithParameterHeaders((String) testPayload, "headerA", "headerB");
Mockito.verify(handler, Mockito.times(1)).handleMessage(Mockito.any(Message.class));
gatewayWithHeaderValues.sendStringWithParameterHeaders((String) testPayload, "headerA", "headerB");
Message<?> message3 = channel.receive(0);
assertEquals("foo", message3.getHeaders().get("foo"));
assertEquals("bar", message3.getHeaders().get("bar"));
assertEquals("headerA", message3.getHeaders().get("headerA"));
assertEquals("headerB", message3.getHeaders().get("headerB"));
}
@Test
public void validateHeaderExpressionMappings() throws Exception {
testPayload = "hello";
gatewayWithHeaderExpressions.sendString((String) testPayload);
Message<?> message1 = channel.receive(0);
assertEquals(testPayload, message1.getPayload());
assertEquals(42, message1.getHeaders().get("foo"));
assertEquals("foobar", message1.getHeaders().get("bar"));
assertNull(message1.getHeaders().get(MessageHeaders.PREFIX + "baz"));
private void prepareHandlerForTest(MessageHandler handler) {
Mockito.reset(handler);
Mockito.doAnswer(new Answer<Object>() {
public Object answer(InvocationOnMock invocation) {
Message<?> message = (Message<?>) invocation.getArguments()[0];
assertEquals(testPayload, message.getPayload());
assertEquals("foo", message.getHeaders().get("foo"));
assertEquals("bar", message.getHeaders().get("bar"));
assertNull(message.getHeaders().get(MessageHeaders.PREFIX + "baz"));
if (message.getPayload().equals("withAnnotatedHeaders")){
assertEquals("headerA", message.getHeaders().get("headerA"));
assertEquals("headerB", message.getHeaders().get("headerB"));
}
return null;
}})
.when(handler).handleMessage(Mockito.any(Message.class));
testPayload = 123;
gatewayWithHeaderExpressions.sendInteger((Integer) testPayload);
Message<?> message2 = channel.receive(0);
assertEquals(testPayload, message2.getPayload());
assertEquals(42, message2.getHeaders().get("foo"));
assertEquals("foobar", message2.getHeaders().get("bar"));
assertNull(message2.getHeaders().get(MessageHeaders.PREFIX + "baz"));
testPayload = "withAnnotatedHeaders";
gatewayWithHeaderExpressions.sendStringWithParameterHeaders((String) testPayload, "headerA", "headerB");
Message<?> message3 = channel.receive(0);
assertEquals(42, message3.getHeaders().get("foo"));
assertEquals("foobar", message3.getHeaders().get("bar"));
assertEquals("headerA", message3.getHeaders().get("headerA"));
assertEquals("headerB", message3.getHeaders().get("headerB"));
}

15
spring-integration-core/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java
View File

@@ -25,6 +25,9 @@ import java.util.Map;
import org.junit.Test;
import org.springframework.expression.Expression;
import org.springframework.expression.common.LiteralExpression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.annotation.Header;
@@ -192,17 +195,17 @@ public class ArgumentArrayMessageMapperToMessageTests {
}
@Test
public void toMessageWithPayloadAndStaticHeaders() throws Exception {
public void toMessageWithPayloadAndHeaders() throws Exception {
Method method = TestService.class.getMethod("sendPayload", String.class);
Map<String, Object> headers = new HashMap<String, Object>();
headers.put("foo", "foo");
headers.put("bar", "bar");
headers.put(MessageHeaders.PREFIX + "baz", "hello");
Map<String, Expression> headers = new HashMap<String, Expression>();
headers.put("foo", new LiteralExpression("foo"));
headers.put("bar", new SpelExpressionParser().parseExpression("6 * 7"));
headers.put(MessageHeaders.PREFIX + "baz", new LiteralExpression("hello"));
ArgumentArrayMessageMapper mapper = new ArgumentArrayMessageMapper(method, headers);
Message<?> message = mapper.toMessage(new Object[] { "test" });
assertEquals("test", message.getPayload());
assertEquals("foo", message.getHeaders().get("foo"));
assertEquals("bar", message.getHeaders().get("bar"));
assertEquals(42, message.getHeaders().get("bar"));
}