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

Merge branch 'work'

Browse Source
This commit is contained in:
David Syer
2010-05-03 08:58:21 +00:00
parent 9850551ddd
commit 8c2c2ca416
35 changed files with 290 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
org.springframework.integration.jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java
View File

@@ -21,7 +21,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.sql.Types;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
@@ -29,7 +28,6 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.core.Message;
import org.springframework.integration.jdbc.util.SerializationUtils;
import org.springframework.integration.message.MessageBuilder;
@@ -174,8 +172,8 @@ public class JdbcMessageStore implements MessageStore {
Assert.state(jdbcTemplate != null, "A DataSource or JdbcTemplate must be provided");
}
public Message<?> delete(UUID id) {
Message<?> message = get(id);
public Message<?> removeMessage(UUID id) {
Message<?> message = getMessage(id);
if (message == null) {
return null;
}
@@ -187,7 +185,7 @@ public class JdbcMessageStore implements MessageStore {
return null;
}
public Message<?> get(UUID id) {
public Message<?> getMessage(UUID id) {
List<Message<?>> list = jdbcTemplate.query(getQuery(GET_MESSAGE), new Object[] { getKey(id) }, mapper);
if (list.isEmpty()) {
return null;
@@ -200,10 +198,10 @@ public class JdbcMessageStore implements MessageStore {
new Object[] { getKey(correlationId) }, mapper);
}
public <T> Message<T> put(final Message<T> message) {
public <T> Message<T> addMessage(final Message<T> message) {
if (message.getHeaders().containsKey(SAVED_KEY)) {
@SuppressWarnings("unchecked")
Message<T> saved = (Message<T>) get(message.getHeaders().getId());
Message<T> saved = (Message<T>) getMessage(message.getHeaders().getId());
if (saved != null) {
if (saved.equals(message)) {
return message;
@@ -230,23 +228,6 @@ public class JdbcMessageStore implements MessageStore {
return result;
}
public void put(Object correlationId, Message<?> message) {
// TODO Auto-generated method stub
}
public void put(Object correlationId, Collection<Message<?>> messages) {
// TODO Auto-generated method stub
}
public Message<?> mark(Object correlationId, UUID messageId) {
// TODO Auto-generated method stub
return null;
}
public void deleteAll(Object correlationId) {
// TODO Auto-generated method stub
}
private String getKey(Object input) {
return input == null ? null : UUIDConverter.getUUID(input).toString();
}

30
org.springframework.integration.jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java
View File

@@ -38,7 +38,7 @@ public class JdbcMessageStoreTests {
@Test
@Transactional
public void testGetNonExistent() throws Exception {
Message<?> result = messageStore.get(UUID.randomUUID());
Message<?> result = messageStore.getMessage(UUID.randomUUID());
assertNull(result);
}
@@ -46,9 +46,9 @@ public class JdbcMessageStoreTests {
@Transactional
public void testAddAndGet() throws Exception {
Message<String> message = MessageBuilder.withPayload("foo").build();
Message<String> saved = messageStore.put(message);
assertNull(messageStore.get(message.getHeaders().getId()));
Message<?> result = messageStore.get(saved.getHeaders().getId());
Message<String> saved = messageStore.addMessage(message);
assertNull(messageStore.getMessage(message.getHeaders().getId()));
Message<?> result = messageStore.getMessage(saved.getHeaders().getId());
assertNotNull(result);
assertThat(saved, sameExceptIgnorableHeaders(result));
assertNotNull(result.getHeaders().get(JdbcMessageStore.SAVED_KEY));
@@ -60,18 +60,18 @@ public class JdbcMessageStoreTests {
public void testAddAndUpdate() throws Exception {
Message<String> message = MessageBuilder.withPayload("foo").setCorrelationId(
"X").build();
message = messageStore.put(message);
message = messageStore.addMessage(message);
message = MessageBuilder.fromMessage(message).setCorrelationId("Y").build();
message = messageStore.put(message);
assertEquals("Y", messageStore.get(message.getHeaders().getId()).getHeaders().getCorrelationId());
message = messageStore.addMessage(message);
assertEquals("Y", messageStore.getMessage(message.getHeaders().getId()).getHeaders().getCorrelationId());
}
@Test
@Transactional
public void testAddAndUpdateAlreadySaved() throws Exception {
Message<String> message = MessageBuilder.withPayload("foo").build();
message = messageStore.put(message);
Message<String> result = messageStore.put(message);
message = messageStore.addMessage(message);
Message<String> result = messageStore.addMessage(message);
assertEquals(message, result);
}
@@ -79,12 +79,12 @@ public class JdbcMessageStoreTests {
@Transactional
public void testAddAndUpdateAlreadySavedAndCopied() throws Exception {
Message<String> message = MessageBuilder.withPayload("foo").build();
Message<String> saved = messageStore.put(message);
Message<String> saved = messageStore.addMessage(message);
Message<String> copy = MessageBuilder.fromMessage(saved).build();
Message<String> result = messageStore.put(copy);
Message<String> result = messageStore.addMessage(copy);
assertNotSame(copy, result);
assertThat(saved, sameExceptIgnorableHeaders(result, JdbcMessageStore.CREATED_DATE_KEY));
assertNotNull(messageStore.get(saved.getHeaders().getId()));
assertNotNull(messageStore.getMessage(saved.getHeaders().getId()));
}
@Test
@@ -92,7 +92,7 @@ public class JdbcMessageStoreTests {
public void testAddAndListByCorrelationId() throws Exception {
String correlationId = "X";
Message<String> message = MessageBuilder.withPayload("foo").setCorrelationId(correlationId).build();
messageStore.put(message);
messageStore.addMessage(message);
assertEquals(1, messageStore.list(correlationId).size());
}
@@ -100,8 +100,8 @@ public class JdbcMessageStoreTests {
@Transactional
public void testAddAndDelete() throws Exception {
Message<String> message = MessageBuilder.withPayload("foo").build();
message = messageStore.put(message);
assertNotNull(messageStore.delete(message.getHeaders().getId()));
message = messageStore.addMessage(message);
assertNotNull(messageStore.removeMessage(message.getHeaders().getId()));
}
}