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

INT-1257, INT-1263 Refactoring Message History (work in progress): Removed the getHistory() method from MessageHeaders. Using headers.get(MessageHistory.HEADER_NAME) instead.

Browse Source
This commit is contained in:
Mark Fisher
2010-08-25 19:31:55 +00:00
parent 1c8da6f251
commit 64ab7f5734
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.UUID;
@@ -63,8 +62,6 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
public static final String ERROR_CHANNEL = PREFIX + "errorChannel";
public static final String HISTORY = PREFIX + "history";
public static final String EXPIRATION_DATE = PREFIX + "expirationDate";
public static final String PRIORITY = PREFIX + "priority";
@@ -89,11 +86,6 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
return this.get(TIMESTAMP, Long.class);
}
@SuppressWarnings("unchecked")
public List<Properties> getHistory() {
return this.get(HISTORY, List.class);
}
public Long getExpirationDate() {
return this.get(EXPIRATION_DATE, Long.class);
}

6
spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java
View File

@@ -76,7 +76,7 @@ public class MessageHistoryIntegrationTests {
DirectChannel endOfThePipeChannel = ac.getBean("endOfThePipeChannel", DirectChannel.class);
MessageHandler handler = Mockito.spy(new MessageHandler() {
public void handleMessage(Message<?> message) {
Iterator<Properties> historyIterator = message.getHeaders().getHistory().iterator();
Iterator<Properties> historyIterator = message.getHeaders().get(MessageHistory.HEADER_NAME, MessageHistory.class).iterator();
Properties event1 = historyIterator.next();
assertEquals("sampleGateway", event1.getProperty(MessageHistory.NAME_PROPERTY));
@@ -152,7 +152,7 @@ public class MessageHistoryIntegrationTests {
DirectChannel endOfThePipeChannel = ac.getBean("endOfThePipeChannel", DirectChannel.class);
MessageHandler handler = Mockito.spy(new MessageHandler() {
public void handleMessage(Message<?> message) {
assertNull(message.getHeaders().getHistory());
assertNull(message.getHeaders().get(MessageHistory.HEADER_NAME, MessageHistory.class));
MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReplyChannel();
replyChannel.send(message);
}
@@ -169,7 +169,7 @@ public class MessageHistoryIntegrationTests {
DirectChannel endOfThePipeChannel = ac.getBean("endOfThePipeChannel", DirectChannel.class);
MessageHandler handler = Mockito.spy(new MessageHandler() {
public void handleMessage(Message<?> message) {
Iterator<Properties> historyIterator = message.getHeaders().getHistory().iterator();
Iterator<Properties> historyIterator = message.getHeaders().get(MessageHistory.HEADER_NAME, MessageHistory.class).iterator();
assertTrue(historyIterator.hasNext());
MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReplyChannel();
replyChannel.send(message);

10
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java
View File

@@ -59,7 +59,7 @@ public class JmsMessageHistoryTests {
PollableChannel jmsInputChannel = applicationContext.getBean("jmsInputChannel", PollableChannel.class);
gateway.send("hello");
Message<?> message = jmsInputChannel.receive(5000);
Iterator<Properties> historyIterator = message.getHeaders().getHistory().iterator();
Iterator<Properties> historyIterator = message.getHeaders().get(MessageHistory.HEADER_NAME, MessageHistory.class).iterator();
Properties event = historyIterator.next();
assertEquals("jms:inbound-channel-adapter", event.getProperty(MessageHistory.TYPE_PROPERTY));
assertEquals("sampleJmsInboundAdapter", event.getProperty(MessageHistory.NAME_PROPERTY));
@@ -76,7 +76,7 @@ public class JmsMessageHistoryTests {
PollableChannel jmsInputChannel = applicationContext.getBean("jmsInputChannel", PollableChannel.class);
input.send(new StringMessage("hello"));
Message<?> message = jmsInputChannel.receive(50000);
Iterator<Properties> historyIterator = message.getHeaders().getHistory().iterator();
Iterator<Properties> historyIterator = message.getHeaders().get(MessageHistory.HEADER_NAME, MessageHistory.class).iterator();
Properties event = historyIterator.next();
assertEquals("channel", event.getProperty(MessageHistory.TYPE_PROPERTY));
assertEquals("outbound-channel", event.getProperty(MessageHistory.NAME_PROPERTY));
@@ -99,7 +99,7 @@ public class JmsMessageHistoryTests {
SubscribableChannel inboundJmsChannel = applicationContext.getBean("inbound-jms-channel", SubscribableChannel.class);
MessageHandler handler = new MessageHandler() {
public void handleMessage(Message<?> message) {
Iterator<Properties> historyIterator = message.getHeaders().getHistory().iterator();
Iterator<Properties> historyIterator = message.getHeaders().get(MessageHistory.HEADER_NAME, MessageHistory.class).iterator();
Properties event = historyIterator.next();
assertEquals("gateway", event.getProperty(MessageHistory.TYPE_PROPERTY));
assertEquals("sampleGateway", event.getProperty(MessageHistory.NAME_PROPERTY));
@@ -141,7 +141,7 @@ public class JmsMessageHistoryTests {
public void fromHeaders(MessageHeaders headers, javax.jms.Message jmsMessage) {
super.fromHeaders(headers, jmsMessage);
String messageHistory = headers.getHistory().toString();
String messageHistory = headers.get(MessageHistory.HEADER_NAME, MessageHistory.class).toString();
try {
jmsMessage.setStringProperty("outbound_history", messageHistory);
}
@@ -166,7 +166,7 @@ public class JmsMessageHistoryTests {
}
history.add(historyEvent);
}
headers.put(MessageHeaders.HISTORY, history);
headers.put(MessageHistory.HEADER_NAME, history);
headers.remove("outbound_history");
return headers;
}