From 9e468e520a58ad1b6408e258b029b355a78df840 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 30 Oct 2014 15:07:43 +0200
Subject: [PATCH] INT-3540: Add `<scatter-gather>` to the `<chain>`

JIRA: https://jira.spring.io/browse/INT-3540
---
 .../config/xml/spring-integration-4.1.xsd            |  1 +
 .../config/ScatterGatherTests-context.xml            |  5 +++++
 .../scattergather/config/ScatterGatherTests.java     | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd
index a7f00daa58..578cb85d84 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.1.xsd
@@ -1731,6 +1731,7 @@
 					<xsd:element name="claim-check-in" type="claimCheckInTypeChain"/>
 					<xsd:element name="claim-check-out" type="claimCheckOutTypeChain"/>
 					<xsd:element name="control-bus" type="control-bus-type"/>
+					<xsd:element name="scatter-gather" type="scatter-gather-type"/>
 					<xsd:element name="chain">
 						<xsd:complexType>
 							<xsd:sequence>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests-context.xml
index 94b70f9f48..8c6918c912 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests-context.xml
@@ -58,4 +58,9 @@
 		<gatherer release-strategy-expression="^[payload gt 5] != null or size() == 3"/>
 	</scatter-gather>
 
+	<chain input-channel="scatterGatherWithinChain" output-channel="output">
+		<scatter-gather scatter-channel="auctionChannel"/>
+		<splitter/>
+	</chain>
+
 </beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java
index 3190e0e257..75b4991660 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java
@@ -55,6 +55,9 @@ public class ScatterGatherTests {
 	@Autowired
 	private RequestReplyExchanger gateway;
 
+	@Autowired
+	private MessageChannel scatterGatherWithinChain;
+
 	@Test
 	public void testAuction() {
 		this.inputAuction.send(new GenericMessage<String>("foo"));
@@ -83,4 +86,13 @@ public class ScatterGatherTests {
 		assertThat(((List<?>) payload).size(), greaterThanOrEqualTo(1));
 	}
 
+	@Test
+	public void testWithinChain() {
+		this.scatterGatherWithinChain.send(new GenericMessage<String>("foo"));
+		for (int i = 0; i < 3; i++) {
+			Message<?> result = this.output.receive(10000);
+			assertNotNull(result);
+		}
+	}
+
 }