INT-928: added correlation history tracking to base classes for splitter and aggregator

spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests-context.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+			 xmlns="http://www.springframework.org/schema/integration"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xsi:schemaLocation="http://www.springframework.org/schema/beans
+            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+            http://www.springframework.org/schema/integration
+            http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+
+	<channel id="input"/>
+
+	<splitter id="upstream-splitter"
+			  input-channel="input"
+			  output-channel="upstream-splits"/>
+
+	<splitter id="downstream-splitter"
+			  input-channel="upstream-splits"
+			  output-channel="downstream-splits"/>
+
+	<aggregator id="first-aggregator"
+				timeout="1000"
+				input-channel="downstream-splits" output-channel="pre-output"/>
+
+	<aggregator id="second-aggregator"
+				input-channel="pre-output"/>
+
+</beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2002-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.aggregator.scenarios;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.Message;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.integration.core.GenericMessage;
+import org.springframework.integration.core.MessagingTemplate;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * 
+ * @author Dave Syer
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class NestedAggregationTests {
+
+	@Autowired
+	DirectChannel input;
+
+	@Test
+	public void testAggregatorWithNestedSplitter() throws Exception {
+		List<String> result = sendAndReceiveMessage(input, 2000);
+		assertNotNull("Expected result and got null", result);
+		assertEquals("[[foo, bar, spam], [bar, foo]]", result.toString());
+	}
+
+	private List<String> sendAndReceiveMessage(DirectChannel channel, int timeout) {
+
+		MessagingTemplate messagingTemplate = new MessagingTemplate();
+		messagingTemplate.setReceiveTimeout(timeout);
+
+		@SuppressWarnings("unchecked")
+		Message<List<String>> message = (Message<List<String>>) messagingTemplate.sendAndReceive(channel,
+				new GenericMessage<List<List<String>>>(Arrays.asList(Arrays.asList("foo", "bar", "spam"), Arrays.asList("bar",
+						"foo"))));
+
+		return message == null ? null : message.getPayload();
+
+	}
+
+}

spring-integration-core/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java

@@ -20,13 +20,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-
 import org.springframework.integration.Message;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.core.MessageBuilder;
 import org.springframework.integration.core.StringMessage;
 import org.springframework.integration.handler.ServiceActivatingHandler;
+import org.springframework.integration.splitter.AbstractMessageSplitter;
 import org.springframework.integration.splitter.MethodInvokingSplitter;
 
 /**
@@ -123,8 +123,10 @@ public class CorrelationIdTests {
 		splitter.handleMessage(message);
 		Message<?> reply1 = testChannel.receive(100);
 		Message<?> reply2 = testChannel.receive(100);
-		assertEquals(correlationIdForTest, reply1.getHeaders().getCorrelationId());
-		assertEquals(correlationIdForTest, reply2.getHeaders().getCorrelationId());		
+		assertEquals(message.getHeaders().getId(), reply1.getHeaders().getCorrelationId());
+		assertEquals(message.getHeaders().getId(), reply2.getHeaders().getCorrelationId());		
+		assertTrue("Sequence details missing", reply1.getHeaders().containsKey(AbstractMessageSplitter.SEQUENCE_DETAILS));
+		assertTrue("Sequence details missing", reply2.getHeaders().containsKey(AbstractMessageSplitter.SEQUENCE_DETAILS));
 	}
 
 	@SuppressWarnings("unused")