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

Fix JSON serialization Redis test

Browse Source 
https://build.spring.io/browse/INT-SI43X-170/
This commit is contained in:
Artem Bilan
2017-06-14 14:48:50 -04:00
parent cac498cac7
commit 882f38633f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/main/java/org/springframework/integration/store/AbstractKeyValueMessageStore.java
View File

@@ -138,7 +138,7 @@ public abstract class AbstractKeyValueMessageStore extends AbstractMessageGroupS
for (Message<?> message : messages) {
// enrich Message with additional headers and add it to MS
Message<?> enrichedMessage = enrichMessage(message);
doAddMessage(message);
doAddMessage(enrichedMessage);
if (metadata != null) {
metadata.add(enrichedMessage.getHeaders().getId());
}

6
spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java
View File

@@ -473,7 +473,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests {
fail("SerializationException expected");
}
catch (Exception e) {
assertThat(e.getCause().getCause(), instanceOf(IllegalArgumentException.class));
assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));
assertThat(e.getMessage(),
containsString("The class with " +
"org.springframework.integration.redis.store.RedisMessageGroupStoreTests$Foo and name of " +
@@ -489,7 +489,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests {
store.removeMessageGroup(1);
messageGroup = store.addMessageToGroup(1, fooMessage);
assertEquals(1, messageGroup.size());
assertEquals(fooMessage, messageGroup.getMessages().iterator().next());
assertEquals(fooMessage.getPayload(), messageGroup.getMessages().iterator().next().getPayload());
mapper = JacksonJsonUtils.messagingAwareMapper("*");
@@ -499,7 +499,7 @@ public class RedisMessageGroupStoreTests extends RedisAvailableTests {
store.removeMessageGroup(1);
messageGroup = store.addMessageToGroup(1, fooMessage);
assertEquals(1, messageGroup.size());
assertEquals(fooMessage, messageGroup.getMessages().iterator().next());
assertEquals(fooMessage.getPayload(), messageGroup.getMessages().iterator().next().getPayload());
}
private static class Foo {