renamed MessageHistory's static 'addComponentToHistory' method to 'wr…

…ite'; simpler and more consistent with the new 'read' method

spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java

@@ -170,7 +170,7 @@ public final boolean send(Message<?> message, long timeout) {
 		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);

spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java

@@ -51,7 +51,7 @@ protected void onInit() {
 
 	protected void sendMessage(Message<?> message) {
 		if (message != null) {
-			message = MessageHistory.addComponentToHistory(message, this);
+			message = MessageHistory.write(message, this);
 		}
 		this.messagingTemplate.send(this.outputChannel, message);
 	}

spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java

@@ -90,7 +90,7 @@ protected Message<?> toMessage(Object object) {
 		try {
 			message = this.inboundMapper.toMessage(object);
 			if (this.shouldTrack) {
-				message = MessageHistory.addComponentToHistory(message, this);
+				message = MessageHistory.write(message, this);
 			}
 		}
 		catch (Exception e) {

spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java

@@ -72,7 +72,7 @@ public final void handleMessage(Message<?> message) {
 		}
 		try {
 			if (message != null && this.shouldTrack) {
-				message = MessageHistory.addComponentToHistory(message, this);
+				message = MessageHistory.write(message, this);
 			}
 			this.handleMessageInternal(message);
 		}

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

@@ -54,7 +54,7 @@ public static MessageHistory read(Message<?> message) {
 				message.getHeaders().get(HEADER_NAME, MessageHistory.class) : null;
 	}
 
-	public static <T> Message<T> addComponentToHistory(Message<T> message, NamedComponent component) {
+	public static <T> Message<T> write(Message<T> message, NamedComponent component) {
 		Assert.notNull(message, "Message must not be null");
 		Assert.notNull(component, "Component must not be null");
 		Properties metadata = extractMetadata(component);

spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java

@@ -38,19 +38,19 @@ public class MessageHistoryTests {
 	public void addComponents() {
 		StringMessage original = new StringMessage("foo");
 		assertNull(MessageHistory.read(original));
-		Message<String> result1 = MessageHistory.addComponentToHistory(original, new TestComponent(1));
+		Message<String> result1 = MessageHistory.write(original, new TestComponent(1));
 		MessageHistory history1 = MessageHistory.read(result1);
 		assertNotNull(history1);
 		assertEquals("testComponent-1", history1.toString());
-		Message<String> result2 = MessageHistory.addComponentToHistory(result1, new TestComponent(2));
+		Message<String> result2 = MessageHistory.write(result1, new TestComponent(2));
 		MessageHistory history2 = MessageHistory.read(result2);
 		assertNotNull(history2);
 		assertEquals("testComponent-1,testComponent-2", history2.toString());
 	}
 
 	@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());
 	}

spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java

@@ -223,7 +223,7 @@ public void onMessage(javax.jms.Message jmsMessage, Session session) throws JMSE
 		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);
 		}

spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java

@@ -88,7 +88,7 @@ public Message<Object> receive() {
 			MessageBuilder<Object> builder = (convertedObject instanceof Message)
 					? MessageBuilder.fromMessage((Message<Object>) 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);

spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java

@@ -63,7 +63,7 @@ public final void handleMessage(Message<?> message) {
 		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 {