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

22
spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java
View File

@@ -57,33 +57,31 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
private static final Log logger = LogFactory.getLog(MessageHeaders.class);
public static final String PREFIX = "";
/**
* The key for the Message ID. This is an automatically generated UUID and
* should never be explicitly set in the header map <b>except</b> in the
* case of Message deserialization where the serialized Message's generated
* UUID is being restored.
*/
public static final String ID = PREFIX + "id";
public static final String ID = "id";
public static final String TIMESTAMP = PREFIX + "timestamp";
public static final String TIMESTAMP = "timestamp";
public static final String CORRELATION_ID = PREFIX + "correlationId";
public static final String CORRELATION_ID = "correlationId";
public static final String REPLY_CHANNEL = PREFIX + "replyChannel";
public static final String REPLY_CHANNEL = "replyChannel";
public static final String ERROR_CHANNEL = PREFIX + "errorChannel";
public static final String ERROR_CHANNEL = "errorChannel";
public static final String EXPIRATION_DATE = PREFIX + "expirationDate";
public static final String EXPIRATION_DATE = "expirationDate";
public static final String PRIORITY = PREFIX + "priority";
public static final String PRIORITY = "priority";
public static final String SEQUENCE_NUMBER = PREFIX + "sequenceNumber";
public static final String SEQUENCE_NUMBER = "sequenceNumber";
public static final String SEQUENCE_SIZE = PREFIX + "sequenceSize";
public static final String SEQUENCE_SIZE = "sequenceSize";
public static final String SEQUENCE_DETAILS = PREFIX + "sequenceDetails";
public static final String SEQUENCE_DETAILS = "sequenceDetails";
private final Map<String, Object> headers;

3
spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java
View File

@@ -26,7 +26,6 @@ import java.util.ListIterator;
import java.util.Properties;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.context.NamedComponent;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.util.Assert;
@@ -39,7 +38,7 @@ import org.springframework.util.StringUtils;
@SuppressWarnings("serial")
public class MessageHistory implements List<Properties>, Serializable {
public static final String HEADER_NAME = MessageHeaders.PREFIX + "history";
public static final String HEADER_NAME = "history";
public static final String NAME_PROPERTY = "name";

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");