From 1b1f95c0045fde7bf028c118e962c5c0788f2a27 Mon Sep 17 00:00:00 2001
From: Tim Ysewyn <Tim.Ysewyn@me.com>
Date: Wed, 20 Aug 2014 14:14:20 +0200
Subject: [PATCH] Java DSL: Fix EnricherSpec to prevent assertions

Fixes: https://github.com/spring-projects/spring-integration-extensions/issues/101
---
 .../integration/dsl/EnricherSpec.java         |  9 ++-
 .../dsl/test/IntegrationFlowTests.java        | 69 +++++++++++++++++++
 2 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/EnricherSpec.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/EnricherSpec.java
index 2b8d8d6..52dafba 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/EnricherSpec.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/EnricherSpec.java
@@ -33,6 +33,7 @@ import org.springframework.util.Assert;
 
 /**
  * @author Artem Bilan
+ * @author Tim Ysewyn
  */
 public class EnricherSpec extends MessageHandlerSpec<EnricherSpec, ContentEnricher> {
 
@@ -128,8 +129,12 @@ public class EnricherSpec extends MessageHandlerSpec<EnricherSpec, ContentEnrich
 
 	@Override
 	protected ContentEnricher doGet() {
-		this.enricher.setPropertyExpressions(this.propertyExpressions);
-		this.enricher.setHeaderExpressions(this.headerExpressions);
+		if(!this.propertyExpressions.isEmpty()) {
+			this.enricher.setPropertyExpressions(this.propertyExpressions);
+		}
+		if(!this.headerExpressions.isEmpty()) {
+			this.enricher.setHeaderExpressions(this.headerExpressions);
+		}
 		return this.enricher;
 	}
 
diff --git a/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/IntegrationFlowTests.java b/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/IntegrationFlowTests.java
index c1b924e..ba7d9ef 100644
--- a/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/IntegrationFlowTests.java
+++ b/spring-integration-java-dsl/src/test/java/org/springframework/integration/dsl/test/IntegrationFlowTests.java
@@ -150,6 +150,7 @@ import de.flapdoodle.embed.process.runtime.Network;
 
 /**
  * @author Artem Bilan
+ * @author Tim Ysewyn
  */
 @ContextConfiguration(initializers = ConfigFileApplicationContextInitializer.class)
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -230,6 +231,14 @@ public class IntegrationFlowTests {
 	@Qualifier("enricherInput")
 	private FixedSubscriberChannel enricherInput;
 
+	@Autowired
+	@Qualifier("enricherInput2")
+	private FixedSubscriberChannel enricherInput2;
+
+	@Autowired
+	@Qualifier("enricherInput3")
+	private FixedSubscriberChannel enricherInput3;
+
 	@Autowired
 	@Qualifier("splitInput")
 	private MessageChannel splitInput;
@@ -562,6 +571,41 @@ public class IntegrationFlowTests {
 		assertThat(new Date(), Matchers.greaterThanOrEqualTo(result.getDate()));
 	}
 
+	@Test
+	public void testContentEnricher2() {
+		QueueChannel replyChannel = new QueueChannel();
+		Message<?> message = MessageBuilder.withPayload(new TestPojo("Bar"))
+				.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannel)
+				.build();
+		this.enricherInput2.send(message);
+		Message<?> receive = replyChannel.receive(5000);
+		assertNotNull(receive);
+		assertNull(receive.getHeaders().get("foo"));
+		Object payload = receive.getPayload();
+		assertThat(payload, instanceOf(TestPojo.class));
+		TestPojo result = (TestPojo) payload;
+		assertEquals("Bar Bar", result.getName());
+		assertNotNull(result.getDate());
+		assertThat(new Date(), Matchers.greaterThanOrEqualTo(result.getDate()));
+	}
+
+	@Test
+	public void testContentEnricher3() {
+		QueueChannel replyChannel = new QueueChannel();
+		Message<?> message = MessageBuilder.withPayload(new TestPojo("Bar"))
+				.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannel)
+				.build();
+		this.enricherInput3.send(message);
+		Message<?> receive = replyChannel.receive(5000);
+		assertNotNull(receive);
+		assertEquals("Bar Bar", receive.getHeaders().get("foo"));
+		Object payload = receive.getPayload();
+		assertThat(payload, instanceOf(TestPojo.class));
+		TestPojo result = (TestPojo) payload;
+		assertEquals("Bar", result.getName());
+		assertNull(result.getDate());
+	}
+
 	@Test
 	public void testSplitterResequencer() {
 		QueueChannel replyChannel = new QueueChannel();
@@ -1404,6 +1448,31 @@ public class IntegrationFlowTests {
 					.get();
 		}
 
+		@Bean
+		@DependsOn("enrichFlow")
+		public IntegrationFlow enricherFlow2() {
+			return IntegrationFlows.fromFixedMessageChannel("enricherInput2")
+					.enrich(e -> e.requestChannel("enrichChannel")
+									.requestPayloadExpression("payload")
+									.shouldClonePayload(false)
+									.propertyExpression("name", "payload['name']")
+									.propertyExpression("date", "new java.util.Date()")
+					)
+					.get();
+		}
+
+		@Bean
+		@DependsOn("enrichFlow")
+		public IntegrationFlow enricherFlow3() {
+			return IntegrationFlows.fromFixedMessageChannel("enricherInput3")
+					.enrich(e -> e.requestChannel("enrichChannel")
+									.requestPayloadExpression("payload")
+									.shouldClonePayload(false)
+									.headerExpression("foo", "payload['name']")
+					)
+					.get();
+		}
+
 		@Bean
 		public IntegrationFlow enrichFlow() {
 			return IntegrationFlows.from("enrichChannel")