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

INT-1568 removed the MessageHeaders.PREFIX constant since it's no longer necessary. Also added @ManagedOperation to the IntegrationMBeanExporter's getChannelSendRate(..) method.

Browse Source
This commit is contained in:
Mark Fisher
2010-11-18 00:03:48 -05:00
parent 9f1d9e87ce
commit f3e854b10c
14 changed files with 28 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java
View File

@@ -29,7 +29,6 @@ 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;
import org.springframework.integration.annotation.Headers;
import org.springframework.integration.gateway.GatewayMethodInboundMessageMapper;
@@ -200,7 +199,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests {
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"));
headers.put("baz", new LiteralExpression("hello"));
GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method, headers);
Message<?> message = mapper.toMessage(new Object[] { "test" });
assertEquals("test", message.getPayload());

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

@@ -24,7 +24,6 @@ import org.junit.runner.RunWith;
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.core.PollableChannel;
import org.springframework.test.context.ContextConfiguration;
@@ -59,7 +58,7 @@ public class HeaderEnrichedGatewayTests {
assertEquals(testPayload, message1.getPayload());
assertEquals("foo", message1.getHeaders().get("foo"));
assertEquals("bar", message1.getHeaders().get("bar"));
assertNull(message1.getHeaders().get(MessageHeaders.PREFIX + "baz"));
assertNull(message1.getHeaders().get("baz"));
testPayload = 123;
gatewayWithHeaderValues.sendInteger((Integer) testPayload);
@@ -67,7 +66,7 @@ public class HeaderEnrichedGatewayTests {
assertEquals(testPayload, message2.getPayload());
assertEquals("foo", message2.getHeaders().get("foo"));
assertEquals("bar", message2.getHeaders().get("bar"));
assertNull(message2.getHeaders().get(MessageHeaders.PREFIX + "baz"));
assertNull(message2.getHeaders().get("baz"));
testPayload = "withAnnotatedHeaders";
gatewayWithHeaderValues.sendStringWithParameterHeaders((String) testPayload, "headerA", "headerB");
@@ -86,7 +85,7 @@ public class HeaderEnrichedGatewayTests {
assertEquals(testPayload, message1.getPayload());
assertEquals(42, message1.getHeaders().get("foo"));
assertEquals("foobar", message1.getHeaders().get("bar"));
assertNull(message1.getHeaders().get(MessageHeaders.PREFIX + "baz"));
assertNull(message1.getHeaders().get("baz"));
testPayload = 123;
gatewayWithHeaderExpressions.sendInteger((Integer) testPayload);
@@ -94,7 +93,7 @@ public class HeaderEnrichedGatewayTests {
assertEquals(testPayload, message2.getPayload());
assertEquals(42, message2.getHeaders().get("foo"));
assertEquals("foobar", message2.getHeaders().get("bar"));
assertNull(message2.getHeaders().get(MessageHeaders.PREFIX + "baz"));
assertNull(message2.getHeaders().get("baz"));
testPayload = "withAnnotatedHeaders";
gatewayWithHeaderExpressions.sendStringWithParameterHeaders((String) testPayload, "headerA", "headerB");