From ad3e0b8428c04ad063604f538ab972262eb6f44c Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 25 Nov 2009 21:14:26 +0000
Subject: [PATCH] INT-891 The Mail header-enricher now supports SpEL
 expressions within the "expression" attribute.

---
 .../config/spring-integration-mail-2.0.xsd    |  4 ++--
 .../MailHeaderEnricherTests-context.xml       | 11 ++++++++-
 .../mail/config/MailHeaderEnricherTests.java  | 24 +++++++++++++++----
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/org.springframework.integration.mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd b/org.springframework.integration.mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
index 38a8f029fc..ac63fafcd6 100644
--- a/org.springframework.integration.mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
+++ b/org.springframework.integration.mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.0.xsd
@@ -210,8 +210,8 @@
 	<xsd:complexType name="headerType">
 		<xsd:attribute name="value" type="xsd:string" />
 		<xsd:attribute name="ref" type="xsd:string" />
-		<!-- TODO add 'overwrite' and the expression below -->
-		<!-- xsd:attribute name="expression" type="xsd:string" / -->
+		<!-- TODO add 'overwrite' -->
+		<xsd:attribute name="expression" type="xsd:string" />
 	</xsd:complexType>
 
 	<xsd:complexType name="transformerType">
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml
index 52fb4562e3..7085c27f9b 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration/mail
 			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
 
-	<header-enricher input-channel="input">
+	<header-enricher input-channel="literalValuesInput">
 		<to value="test.to"/>
 		<cc value="test.cc"/>
 		<bcc value="test.bcc"/>
@@ -16,4 +16,13 @@
 		<subject value="test.subject"/>
 	</header-enricher>
 
+	<header-enricher input-channel="expressionsInput">
+		<to expression="payload + '.to'"/>
+		<cc expression="payload + '.cc'"/>
+		<bcc expression="payload + '.bcc'"/>
+		<from expression="payload + '.from'"/>
+		<reply-to expression="payload + '.reply-to'"/>
+		<subject expression="payload + '.subject'"/>
+	</header-enricher>
+
 </beans:beans>
diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
index 1ebc474404..53fc06d39f 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java
@@ -40,12 +40,15 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 public class MailHeaderEnricherTests {
 
-	@Autowired @Qualifier("input")
-	private MessageChannel channel;
+	@Autowired @Qualifier("literalValuesInput")
+	private MessageChannel literalValuesInput;
+
+	@Autowired @Qualifier("expressionsInput")
+	private MessageChannel expressionsInput;
 
 	@Test
-	public void test() {
-		MessageChannelTemplate template = new MessageChannelTemplate(channel);
+	public void literalValues() {
+		MessageChannelTemplate template = new MessageChannelTemplate(literalValuesInput);
 		Message<?> result = template.sendAndReceive(new StringMessage("test"));
 		Map<String, Object> headers = result.getHeaders();
 		assertEquals("test.to", headers.get(MailHeaders.TO));
@@ -56,4 +59,17 @@ public class MailHeaderEnricherTests {
 		assertEquals("test.subject", headers.get(MailHeaders.SUBJECT));
 	}
 
+	@Test
+	public void expressions() {
+		MessageChannelTemplate template = new MessageChannelTemplate(expressionsInput);
+		Message<?> result = template.sendAndReceive(new StringMessage("foo"));
+		Map<String, Object> headers = result.getHeaders();
+		assertEquals("foo.to", headers.get(MailHeaders.TO));
+		assertEquals("foo.cc", headers.get(MailHeaders.CC));
+		assertEquals("foo.bcc", headers.get(MailHeaders.BCC));
+		assertEquals("foo.from", headers.get(MailHeaders.FROM));
+		assertEquals("foo.reply-to", headers.get(MailHeaders.REPLY_TO));
+		assertEquals("foo.subject", headers.get(MailHeaders.SUBJECT));
+	}
+
 }