Fix Redis tests according to the latest Spring Data Redis

Author: artembilan

spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests.java

@@ -27,7 +27,7 @@
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.Jackson3JsonRedisSerializer;
+import org.springframework.data.redis.serializer.GenericJacksonJsonRedisSerializer;
 import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.integration.mapping.InboundMessageMapper;
@@ -131,7 +131,8 @@ void testInt3015ExplicitSerializer() {
 
 		final RedisQueueOutboundChannelAdapter handler = new RedisQueueOutboundChannelAdapter(queueName,
 				this.connectionFactory);
-		handler.setSerializer(new Jackson3JsonRedisSerializer<Object>(Object.class));
+		handler.setSerializer(GenericJacksonJsonRedisSerializer.create(b -> {
+		}));
 
 		RedisTemplate<String, ?> redisTemplate = new StringRedisTemplate();
 		redisTemplate.setConnectionFactory(this.connectionFactory);

spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisChannelMessageStoreTests.java

@@ -26,7 +26,7 @@
 import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.serializer.GenericJackson3JsonRedisSerializer;
+import org.springframework.data.redis.serializer.GenericJacksonJsonRedisSerializer;
 import org.springframework.integration.IntegrationMessageHeaderAccessor;
 import org.springframework.integration.channel.NullChannel;
 import org.springframework.integration.history.MessageHistory;
@@ -183,7 +183,7 @@ void testPriority() {
 	void testJsonSerialization() {
 		RedisChannelMessageStore store = new RedisChannelMessageStore(RedisContainerTest.connectionFactory());
 		JsonMapper mapper = JacksonMessagingUtils.messagingAwareMapper();
-		GenericJackson3JsonRedisSerializer serializer = new GenericJackson3JsonRedisSerializer(mapper);
+		GenericJacksonJsonRedisSerializer serializer = new GenericJacksonJsonRedisSerializer(mapper);
 		store.setValueSerializer(serializer);
 
 		Message<?> genericMessage = new GenericMessage<>(new Date());

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

@@ -38,7 +38,7 @@
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.GenericJackson3JsonRedisSerializer;
+import org.springframework.data.redis.serializer.GenericJacksonJsonRedisSerializer;
 import org.springframework.data.redis.serializer.SerializationException;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.NullChannel;
@@ -393,7 +393,7 @@ void testAddAndRemoveMessagesFromMessageGroup() {
 	void testJsonSerialization() {
 		JsonMapper mapper = JacksonMessagingUtils.messagingAwareMapper();
 
-		GenericJackson3JsonRedisSerializer serializer = new GenericJackson3JsonRedisSerializer(mapper);
+		GenericJacksonJsonRedisSerializer serializer = new GenericJacksonJsonRedisSerializer(mapper);
 		store.setValueSerializer(serializer);
 
 		Message<?> genericMessage = new GenericMessage<>(new Date());
@@ -444,7 +444,7 @@ void testJsonSerialization() {
 
 		mapper = JacksonMessagingUtils.messagingAwareMapper(getClass().getPackage().getName());
 
-		serializer = new GenericJackson3JsonRedisSerializer(mapper);
+		serializer = new GenericJacksonJsonRedisSerializer(mapper);
 		store.setValueSerializer(serializer);
 
 		store.removeMessageGroup(this.groupId);
@@ -454,7 +454,7 @@ void testJsonSerialization() {
 
 		mapper = JacksonMessagingUtils.messagingAwareMapper("*");
 
-		serializer = new GenericJackson3JsonRedisSerializer(mapper);
+		serializer = new GenericJacksonJsonRedisSerializer(mapper);
 		store.setValueSerializer(serializer);
 
 		store.removeMessageGroup(this.groupId);