From 64ab7f573409416c816bd7cae8a5d07470b652e4 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 25 Aug 2010 19:31:55 +0000 Subject: [PATCH] INT-1257, INT-1263 Refactoring Message History (work in progress): Removed the getHistory() method from MessageHeaders. Using headers.get(MessageHistory.HEADER_NAME) instead. --- .../springframework/integration/MessageHeaders.java | 8 -------- .../history/MessageHistoryIntegrationTests.java | 6 +++--- .../integration/jms/config/JmsMessageHistoryTests.java | 10 +++++----- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java index 468f6121e9..909c1ce4c1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java @@ -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, 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, Serializable { return this.get(TIMESTAMP, Long.class); } - @SuppressWarnings("unchecked") - public List getHistory() { - return this.get(HISTORY, List.class); - } - public Long getExpirationDate() { return this.get(EXPIRATION_DATE, Long.class); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java index eb8573c6b5..ee492b0f01 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java @@ -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 historyIterator = message.getHeaders().getHistory().iterator(); + Iterator 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 historyIterator = message.getHeaders().getHistory().iterator(); + Iterator historyIterator = message.getHeaders().get(MessageHistory.HEADER_NAME, MessageHistory.class).iterator(); assertTrue(historyIterator.hasNext()); MessageChannel replyChannel = (MessageChannel) message.getHeaders().getReplyChannel(); replyChannel.send(message); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java index fb6bc3e9bf..03d0ebb24a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java @@ -59,7 +59,7 @@ public class JmsMessageHistoryTests { PollableChannel jmsInputChannel = applicationContext.getBean("jmsInputChannel", PollableChannel.class); gateway.send("hello"); Message message = jmsInputChannel.receive(5000); - Iterator historyIterator = message.getHeaders().getHistory().iterator(); + Iterator 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 historyIterator = message.getHeaders().getHistory().iterator(); + Iterator 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 historyIterator = message.getHeaders().getHistory().iterator(); + Iterator 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; }