diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java index 881421529c..2fd4473c71 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java @@ -429,45 +429,4 @@ public class JdbcMessageStoreTests { } - @Test - @Transactional - public void testSameMessageAndGroupToMultipleRegions() throws Exception { - - final String groupId = "myGroup"; - final String region1 = "region1"; - final String region2 = "region2"; - - final JdbcMessageStore messageStore1 = new JdbcMessageStore(dataSource); - messageStore1.setRegion(region1); - - final JdbcMessageStore messageStore2 = new JdbcMessageStore(dataSource); - messageStore1.setRegion(region2); - - final Message message = MessageBuilder.withPayload("foo").build(); - - final MessageBuilder builder1 = MessageBuilder.fromMessage(message); - final MessageBuilder builder2 = MessageBuilder.fromMessage(message); - - builder1.setSequenceNumber(1); - builder2.setSequenceNumber(2); - - final Message message1 = builder1.build(); - final Message message2 = builder2.build(); - - messageStore1.addMessageToGroup(groupId, message1); - messageStore2.addMessageToGroup(groupId, message2); - - final Message messageFromRegion1 = messageStore1.pollMessageFromGroup(groupId); - final Message messageFromRegion2 = messageStore2.pollMessageFromGroup(groupId); - - assertNotNull(messageFromRegion1); - assertNotNull(messageFromRegion2); - - LOG.info("messageFromRegion1: " + messageFromRegion1.getHeaders().getId() + "; Sequence #: " + messageFromRegion1.getHeaders().getSequenceNumber()); - LOG.info("messageFromRegion2: " + messageFromRegion2.getHeaders().getId() + "; Sequence #: " + messageFromRegion2.getHeaders().getSequenceNumber()); - - assertEquals(Integer.valueOf(1), (Integer) messageFromRegion1.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); - assertEquals(Integer.valueOf(2), (Integer) messageFromRegion2.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); - - } } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java index 091bffba17..900ede5763 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java @@ -53,7 +53,7 @@ import org.springframework.integration.jdbc.JdbcMessageStore; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; -import org.springframework.integration.store.MessageGroupStore.MessageGroupCallback; +import org.springframework.integration.store.MessageGroupCallback; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.util.UUIDConverter; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/reference/docbook/jdbc.xml b/src/reference/docbook/jdbc.xml index 86d714f64f..24ef76b940 100644 --- a/src/reference/docbook/jdbc.xml +++ b/src/reference/docbook/jdbc.xml @@ -343,7 +343,7 @@ the precise FIFO order when polling from such a MySQL Message Store. - Therefore, starting with Spring Integration 3.0, + Therefore, starting with Spring Integration 2.2.4, we provide an additional set of DDL scripts for MySQL version 5.6.4 or higher: diff --git a/src/reference/docbook/whats-new.xml b/src/reference/docbook/whats-new.xml index a86a7aac5c..4e780d00c9 100644 --- a/src/reference/docbook/whats-new.xml +++ b/src/reference/docbook/whats-new.xml @@ -241,10 +241,10 @@ by simply having Jackson on the classpath. -
+
JDBC Message Store Improvements - Spring Integration 3.0 adds a new set of DDL + Spring Integration 2.2.4 adds a new set of DDL scripts for MySQL version 5.6.4 and higher. Now MySQL supports fractional seconds and is thus improving the FIFO ordering when