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

INT-1053 Message ID is now always a UUID rather than any Object type

Browse Source
This commit is contained in:
Mark Fisher
2010-03-29 17:20:28 +00:00
parent e4dc5e41e7
commit bde0bca24e
5 changed files with 129 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java
View File

@@ -31,6 +31,7 @@ import java.util.UUID;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.history.MessageHistory;
/**
@@ -45,6 +46,11 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
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 TIMESTAMP = PREFIX + "timestamp";
@@ -85,8 +91,8 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
}
public Object getId() {
return this.get(ID);
public UUID getId() {
return this.get(ID, UUID.class);
}
public Long getTimestamp() {

2
org.springframework.integration/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java
View File

@@ -19,6 +19,7 @@ package org.springframework.integration.json;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonParser;
@@ -60,6 +61,7 @@ public class InboundJsonMessageMapper implements
static {
DEFAULT_HEADER_TYPES = new HashMap<String, Class<?>>();
DEFAULT_HEADER_TYPES.put(MessageHeaders.ID, UUID.class);
DEFAULT_HEADER_TYPES.put(MessageHeaders.TIMESTAMP, Long.class);
DEFAULT_HEADER_TYPES.put(MessageHeaders.EXPIRATION_DATE, Long.class);
}