INT-3512: Add <advice-chain> to the Aggregator

JIRA: https://jira.spring.io/browse/INT-3512

INT-3512: Fix typos

INT-3512: add `expire-` prefix to the advice sub-elements

INT-3512: Mark `AggregatorWithCustomReleaseStrategyTests` as `LONG_RUNNING_TEST`

Doc Polishing

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java

@@ -308,7 +308,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
 	@Override
 	@ManagedAttribute
 	public long getMessageCount() {
-		return jdbcTemplate.queryForObject(getQuery(Query.GET_MESSAGE_COUNT), Integer.class, region);
+		return jdbcTemplate.queryForObject(getQuery(Query.GET_MESSAGE_COUNT), Long.class, region);
 	}
 
 	@Override
@@ -334,7 +334,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
 
 		final long createdDate = System.currentTimeMillis();
 		Message<T> result = this.getMessageBuilderFactory().fromMessage(message).setHeader(SAVED_KEY, Boolean.TRUE)
-				.setHeader(CREATED_DATE_KEY, new Long(createdDate)).build();
+				.setHeader(CREATED_DATE_KEY, createdDate).build();
 
 		Map innerMap = (Map) new DirectFieldAccessor(result.getHeaders()).getPropertyValue("headers");
 		// using reflection to set ID since it is immutable through MessageHeaders
@@ -452,7 +452,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
 		}
 
 		long timestamp = createDate.get().getTime();
-		boolean complete = completeFlag.get().booleanValue();
+		boolean complete = completeFlag.get();
 
 		SimpleMessageGroup messageGroup = new SimpleMessageGroup(messages, groupId, timestamp, complete);
 		messageGroup.setLastModified(updateDate.get().getTime());
@@ -710,8 +710,9 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa
 
 		@Override
 		public Message<?> mapRow(ResultSet rs, int rowNum) throws SQLException {
-			Message<?> message = (Message<?>) deserializer.convert(lobHandler.getBlobAsBytes(rs, "MESSAGE_BYTES"));
-			return message;
+			return (Message<?>) deserializer.convert(lobHandler.getBlobAsBytes(rs, "MESSAGE_BYTES"));
 		}
+
 	}
+
 }

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/AggregatorIntegrationTests-context.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xmlns="http://www.springframework.org/schema/integration"
+			 xmlns:int-jdbc="http://www.springframework.org/schema/integration/jdbc"
+			 xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+			 xmlns:context="http://www.springframework.org/schema/context"
+			 xsi:schemaLocation="http://www.springframework.org/schema/beans
+			 http://www.springframework.org/schema/beans/spring-beans.xsd
+			 http://www.springframework.org/schema/integration
+			 http://www.springframework.org/schema/integration/spring-integration.xsd
+			 http://www.springframework.org/schema/jdbc
+			 http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+			 http://www.springframework.org/schema/integration/jdbc
+			 http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
+			 http://www.springframework.org/schema/context
+			 http://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:property-placeholder location="int-derby.properties"/>
+
+	<jdbc:embedded-database id="dataSource" type="DERBY"/>
+
+	<jdbc:initialize-database data-source="dataSource"
+							  ignore-failures="DROPS">
+		<jdbc:script location="${int.drop.script}"/>
+		<jdbc:script location="${int.schema.script}"/>
+	</jdbc:initialize-database>
+
+	<int-jdbc:message-store id="messageStore" data-source="dataSource"/>
+
+	<beans:bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+		<beans:property name="dataSource" ref="dataSource"/>
+	</beans:bean>
+
+	<aggregator input-channel="transactionalAggregatorInput" output-channel="transactionalAggregatorOutput"
+				message-store="messageStore"
+				send-partial-result-on-expiry="true"
+				group-timeout="100">
+		<expire-transactional/>
+	</aggregator>
+
+	<service-activator input-channel="transactionalAggregatorOutput" ref="exceptionHandler"/>
+
+	<beans:bean id="exceptionHandler"
+				class="org.springframework.integration.jdbc.AggregatorIntegrationTests$ExceptionMessageHandler"/>
+
+</beans:beans>

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/AggregatorIntegrationTests.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2014 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.jdbc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.IntegrationMessageHeaderAccessor;
+import org.springframework.integration.store.MessageGroupStore;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHandler;
+import org.springframework.messaging.MessagingException;
+import org.springframework.messaging.support.GenericMessage;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationAdapter;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+/**
+ * @author Artem Bilan
+ * @since 4.1
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+@DirtiesContext
+public class AggregatorIntegrationTests {
+
+	@Autowired
+	private MessageChannel transactionalAggregatorInput;
+
+	@Autowired
+	private MessageGroupStore messageGroupStore;
+
+	@Test
+	public void testTransactionalAggregatorGroupTimeout() throws InterruptedException {
+		this.transactionalAggregatorInput.send(new GenericMessage<Integer>(1, stubHeaders(1, 2, 1)));
+
+		assertTrue(RollbackTxSync.latch.await(20, TimeUnit.SECONDS));
+
+		//As far as we have been within TX, the message group should still be in the MessageStore
+		assertEquals(1, this.messageGroupStore.messageGroupSize(1));
+	}
+
+	private Map<String, Object> stubHeaders(int sequenceNumber, int sequenceSize, int correlationId) {
+		Map<String, Object> headers = new HashMap<String, Object>();
+		headers.put(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, sequenceNumber);
+		headers.put(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, sequenceSize);
+		headers.put(IntegrationMessageHeaderAccessor.CORRELATION_ID, correlationId);
+		return headers;
+	}
+
+	@SuppressWarnings("unused")
+	private static class ExceptionMessageHandler implements MessageHandler {
+
+		public void handleMessage(Message<?> message) throws MessagingException {
+			TransactionSynchronizationManager.registerSynchronization(new RollbackTxSync());
+			throw new RuntimeException("intentional");
+		}
+
+	}
+
+	private static class RollbackTxSync extends TransactionSynchronizationAdapter {
+
+		public static CountDownLatch latch = new CountDownLatch(1);
+
+		@Override
+		public void afterCompletion(int status) {
+			if (TransactionSynchronization.STATUS_ROLLED_BACK == status) {
+				latch.countDown();
+			}
+		}
+
+	}
+
+}