diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java index 4ca4449db1..afe2b945be 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java @@ -170,7 +170,7 @@ public abstract class AbstractMessageChannel extends IntegrationObjectSupport im Assert.notNull(message, "message must not be null"); Assert.notNull(message.getPayload(), "message payload must not be null"); if (this.shouldTrack) { - message = MessageHistory.addComponentToHistory(message, this); + message = MessageHistory.write(message, this); } message = this.convertPayloadIfNecessary(message); message = this.interceptors.preSend(message, this); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java index 5fc8bfafc4..651f4a9472 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java @@ -51,7 +51,7 @@ public abstract class MessageProducerSupport extends AbstractEndpoint implements protected void sendMessage(Message message) { if (message != null) { - message = MessageHistory.addComponentToHistory(message, this); + message = MessageHistory.write(message, this); } this.messagingTemplate.send(this.outputChannel, message); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java index c5e4bcbc78..63f1f174aa 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java @@ -90,7 +90,7 @@ public class SimpleMessagingGateway extends AbstractMessagingGateway implements try { message = this.inboundMapper.toMessage(object); if (this.shouldTrack) { - message = MessageHistory.addComponentToHistory(message, this); + message = MessageHistory.write(message, this); } } catch (Exception e) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java index 6116738ded..d119944281 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java @@ -72,7 +72,7 @@ public abstract class AbstractMessageHandler extends IntegrationObjectSupport im } try { if (message != null && this.shouldTrack) { - message = MessageHistory.addComponentToHistory(message, this); + message = MessageHistory.write(message, this); } this.handleMessageInternal(message); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java index c0cc5ae2f1..dbb950dd0e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java @@ -54,7 +54,7 @@ public class MessageHistory implements List { message.getHeaders().get(HEADER_NAME, MessageHistory.class) : null; } - public static Message addComponentToHistory(Message message, NamedComponent component) { + public static Message write(Message message, NamedComponent component) { Assert.notNull(message, "Message must not be null"); Assert.notNull(component, "Component must not be null"); Properties metadata = extractMetadata(component); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java index bd0b43f4c6..e0a1dac305 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java @@ -38,11 +38,11 @@ public class MessageHistoryTests { public void addComponents() { StringMessage original = new StringMessage("foo"); assertNull(MessageHistory.read(original)); - Message result1 = MessageHistory.addComponentToHistory(original, new TestComponent(1)); + Message result1 = MessageHistory.write(original, new TestComponent(1)); MessageHistory history1 = MessageHistory.read(result1); assertNotNull(history1); assertEquals("testComponent-1", history1.toString()); - Message result2 = MessageHistory.addComponentToHistory(result1, new TestComponent(2)); + Message result2 = MessageHistory.write(result1, new TestComponent(2)); MessageHistory history2 = MessageHistory.read(result2); assertNotNull(history2); assertEquals("testComponent-1,testComponent-2", history2.toString()); @@ -50,7 +50,7 @@ public class MessageHistoryTests { @Test(expected = UnsupportedOperationException.class) public void verifyImmutability() { - Message message = MessageHistory.addComponentToHistory(MessageBuilder.withPayload("test").build(), new TestComponent(1)); + Message message = MessageHistory.write(MessageBuilder.withPayload("test").build(), new TestComponent(1)); MessageHistory history = MessageHistory.read(message); history.add(new Properties()); } diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java index f381cd5b48..acbc6126fc 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java @@ -223,7 +223,7 @@ public class ChannelPublishingJmsMessageListener extends AbstractMessagingGatewa Message requestMessage = (object instanceof Message) ? MessageBuilder.fromMessage((Message) object).copyHeaders(headers).build() : MessageBuilder.withPayload(object).copyHeaders(headers).build(); - requestMessage = MessageHistory.addComponentToHistory(requestMessage, this); + requestMessage = MessageHistory.write(requestMessage, this); if (!this.expectReply) { this.send(requestMessage); } diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java index 83b7235c3e..f5861710ec 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java @@ -88,7 +88,7 @@ public class JmsDestinationPollingSource extends AbstractJmsTemplateBasedAdapter MessageBuilder builder = (convertedObject instanceof Message) ? MessageBuilder.fromMessage((Message) convertedObject) : MessageBuilder.withPayload(convertedObject); convertedMessage = builder.copyHeadersIfAbsent(mappedHeaders).build(); - convertedMessage = MessageHistory.addComponentToHistory(convertedMessage, this); + convertedMessage = MessageHistory.write(convertedMessage, this); } catch (Exception e) { throw new MessagingException(e.getMessage(), e); diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java index a91e7e70e4..713f6b976e 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java @@ -63,7 +63,7 @@ public class JmsSendingMessageHandler extends AbstractJmsTemplateBasedAdapter im if (message == null) { throw new IllegalArgumentException("message must not be null"); } - final Message messageToSend = MessageHistory.addComponentToHistory(message, this); + final Message messageToSend = MessageHistory.write(message, this); this.getJmsTemplate().convertAndSend(messageToSend, new MessagePostProcessor() { public javax.jms.Message postProcessMessage(javax.jms.Message jmsMessage) throws JMSException {