Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-2980 / INT-2987 - Fix version number in doc (2.2.4)

Browse Source 
* Fix import in test MySqlJdbcMessageStoreTests
* Remove test JdbcMessageStoreTests#testSameMessageAndGroupToMultipleRegions() as it relies on a fix that was not backported to 2.2.x (INT-2912)
This commit is contained in:
Gunnar Hillert
2013-05-24 11:52:30 -04:00
parent 8db832cb33
commit 648e9f0c15
4 changed files with 4 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java
View File

@@ -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<String> message = MessageBuilder.withPayload("foo").build();
final MessageBuilder<String> builder1 = MessageBuilder.fromMessage(message);
final MessageBuilder<String> 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));
}
}

2
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java
View File

@@ -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;

2
src/reference/docbook/jdbc.xml
View File

@@ -343,7 +343,7 @@
the precise FIFO order when polling from such a MySQL Message Store.
</para>
<para>
Therefore, starting with <emphasis>Spring Integration 3.0</emphasis>,
Therefore, starting with <emphasis>Spring Integration 2.2.4</emphasis>,
we provide an additional set of DDL scripts for MySQL version
<emphasis>5.6.4</emphasis> or higher:
</para>

4
src/reference/docbook/whats-new.xml
View File

@@ -241,10 +241,10 @@
by simply having <code>Jackson</code> on the classpath.
</para>
</section>
<section id="3.0-jdbc-mysql-v5_6_4">
<section id="2_2_4-jdbc-mysql-v5_6_4">
<title>JDBC Message Store Improvements</title>
<para>
<emphasis>Spring Integration 3.0</emphasis> adds a new set of DDL
<emphasis>Spring Integration 2.2.4</emphasis> adds a new set of DDL
scripts for <emphasis>MySQL</emphasis> version 5.6.4 and higher.
Now <emphasis>MySQL</emphasis> supports <emphasis>fractional
seconds</emphasis> and is thus improving the FIFO ordering when