Return Jackson3 serializer for RedisSerializer.json()

Updated test to cover Jackson3 based serializer variants.

See: #3219

Author: christophstrobl

src/main/java/org/springframework/data/redis/serializer/GenericJacksonJsonRedisSerializer.java

@@ -479,7 +479,7 @@ protected JavaType resolveType(byte[] source, Class<?> type) throws IOException
 			JsonNode root = readTree(source);
 			JsonNode jsonNode = root.get(hintName.get());
 
-			if (jsonNode.isString() && jsonNode.asString() != null) {
+			if (jsonNode != null && jsonNode.isString() && jsonNode.asString() != null) {
 				return typeFactory.get().constructFromCanonical(jsonNode.asString());
 			}
 

src/main/java/org/springframework/data/redis/serializer/RedisSerializer.java

@@ -55,13 +55,14 @@ static RedisSerializer<Object> java(@Nullable ClassLoader classLoader) {
 
 	/**
 	 * Obtain a {@link RedisSerializer} that can read and write JSON using
-	 * <a href="https://github.com/FasterXML/jackson-core">Jackson</a>.
+	 * <a href="https://github.com/FasterXML/jackson-core">Jackson</a> with default typing enabled.
 	 *
 	 * @return never {@literal null}.
 	 * @since 2.1
 	 */
 	static RedisSerializer<Object> json() {
-		return new GenericJackson2JsonRedisSerializer();
+        return GenericJacksonJsonRedisSerializer
+            .create(it -> it.enableSpringCacheNullValueSupport().enableUnsafeDefaultTyping());
 	}
 
 	/**

src/test/java/org/springframework/data/redis/cache/CacheTestParams.java

@@ -30,6 +30,7 @@
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.connection.lettuce.extension.LettuceConnectionFactoryExtension;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.GenericJacksonJsonRedisSerializer;
 import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.OxmSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
@@ -89,10 +90,13 @@ static Collection<Object[]> connectionFactoriesAndSerializers() {
 
 		OxmSerializer oxmSerializer = XstreamOxmSerializerSingleton.getInstance();
 		GenericJackson2JsonRedisSerializer jackson2Serializer = new GenericJackson2JsonRedisSerializer();
+		GenericJacksonJsonRedisSerializer jacksonSerializer = GenericJacksonJsonRedisSerializer
+            .create(it -> it.enableSpringCacheNullValueSupport().enableUnsafeDefaultTyping());
 		JdkSerializationRedisSerializer jdkSerializer = new JdkSerializationRedisSerializer();
 
 		return connectionFactories().stream().flatMap(factory -> Arrays.asList( //
 				new Object[] { factory, new FixDamnedJunitParameterizedNameForRedisSerializer(jdkSerializer) }, //
+				new Object[] { factory, new FixDamnedJunitParameterizedNameForRedisSerializer(jacksonSerializer) }, //
 				new Object[] { factory, new FixDamnedJunitParameterizedNameForRedisSerializer(jackson2Serializer) }, //
 				new Object[] { factory, new FixDamnedJunitParameterizedNameForRedisSerializer(oxmSerializer) }).stream())
 				.collect(Collectors.toList());

src/test/java/org/springframework/data/redis/core/DefaultReactiveStreamOperationsIntegrationTests.java

@@ -48,6 +48,7 @@
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.core.ReactiveOperationsTestParams.Fixture;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.GenericJacksonJsonRedisSerializer;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.OxmSerializer;
@@ -143,6 +144,7 @@ void addShouldAddReadSimpleMessage() {
 
 		assumeTrue(!(serializer instanceof Jackson2JsonRedisSerializer)
 				&& !(serializer instanceof GenericJackson2JsonRedisSerializer)
+				&& !(serializer instanceof GenericJacksonJsonRedisSerializer)
 				&& !(serializer instanceof JdkSerializationRedisSerializer) && !(serializer instanceof OxmSerializer));
 
 		K key = keyFactory.instance();
@@ -165,7 +167,8 @@ void addShouldAddReadSimpleMessage() {
 	void addShouldAddReadSimpleMessageWithRawSerializer() {
 
 		assumeTrue(!(serializer instanceof Jackson2JsonRedisSerializer)
-				&& !(serializer instanceof GenericJackson2JsonRedisSerializer));
+				&& !(serializer instanceof GenericJackson2JsonRedisSerializer)
+				&& !(serializer instanceof GenericJacksonJsonRedisSerializer));
 
 		SerializationPair<K> keySerializer = redisTemplate.getSerializationContext().getKeySerializationPair();
 
@@ -223,6 +226,7 @@ void addMaxLenShouldLimitSimpleMessagesSize() {
 
 		assumeTrue(!(serializer instanceof Jackson2JsonRedisSerializer)
 				&& !(serializer instanceof GenericJackson2JsonRedisSerializer)
+				&& !(serializer instanceof GenericJacksonJsonRedisSerializer)
 				&& !(serializer instanceof JdkSerializationRedisSerializer) && !(serializer instanceof OxmSerializer));
 
 		K key = keyFactory.instance();
@@ -249,7 +253,8 @@ void addMaxLenShouldLimitSimpleMessagesSize() {
 	void addMaxLenShouldLimitSimpleMessageWithRawSerializerSize() {
 
 		assumeTrue(!(serializer instanceof Jackson2JsonRedisSerializer)
-				&& !(serializer instanceof GenericJackson2JsonRedisSerializer));
+				&& !(serializer instanceof GenericJackson2JsonRedisSerializer)
+				&& !(serializer instanceof GenericJacksonJsonRedisSerializer));
 
 		SerializationPair<K> keySerializer = redisTemplate.getSerializationContext().getKeySerializationPair();
 
@@ -378,8 +383,9 @@ void reverseRangeShouldReportMessages() {
 	@Test // DATAREDIS-864
 	void reverseRangeShouldConvertSimpleMessages() {
 
-		assumeTrue(!(serializer instanceof Jackson2JsonRedisSerializer)
-				&& !(serializer instanceof GenericJackson2JsonRedisSerializer));
+        assumeTrue(!(serializer instanceof Jackson2JsonRedisSerializer)
+            && !(serializer instanceof GenericJackson2JsonRedisSerializer)
+            && !(serializer instanceof GenericJacksonJsonRedisSerializer));
 
 		K key = keyFactory.instance();
 		HK hashKey = hashKeyFactory.instance();

src/test/java/org/springframework/data/redis/core/ReactiveOperationsTestParams.java

@@ -33,6 +33,7 @@
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.connection.lettuce.extension.LettuceConnectionFactoryExtension;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.GenericJacksonJsonRedisSerializer;
 import org.springframework.data.redis.serializer.GenericToStringSerializer;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.JacksonJsonRedisSerializer;
@@ -109,6 +110,11 @@ RedisSerializationContext.<String, Double> newSerializationContext(jdkSerializat
 		ReactiveRedisTemplate<String, Person> genericJackson2JsonPersonTemplate = new ReactiveRedisTemplate(
 				lettuceConnectionFactory, RedisSerializationContext.fromSerializer(genericJackson2JsonSerializer));
 
+		GenericJacksonJsonRedisSerializer genericJacksonJsonSerializer = GenericJacksonJsonRedisSerializer
+            .create(it -> it.enableSpringCacheNullValueSupport().enableUnsafeDefaultTyping());
+		ReactiveRedisTemplate<String, Person> genericJacksonJsonPersonTemplate = new ReactiveRedisTemplate(
+				lettuceConnectionFactory, RedisSerializationContext.fromSerializer(genericJacksonJsonSerializer));
+
 		List<Fixture<?, ?>> list = Arrays.asList( //
 				new Fixture<>(stringTemplate, stringFactory, stringFactory, stringRedisSerializer, "String"), //
 				new Fixture<>(objectTemplate, personFactory, personFactory, jdkSerializationRedisSerializer, "Person/JDK"), //
@@ -122,7 +128,9 @@ RedisSerializationContext.<String, Double> newSerializationContext(jdkSerializat
 				new Fixture<>(jackson2JsonPersonTemplate, stringFactory, personFactory, jackson2JsonSerializer, "Jackson2"), //
 				new Fixture<>(jackson3JsonPersonTemplate, stringFactory, personFactory, jackson2JsonSerializer, "Jackson3"), //
 				new Fixture<>(genericJackson2JsonPersonTemplate, stringFactory, personFactory, genericJackson2JsonSerializer,
-						"Generic Jackson 2"));
+						"Generic Jackson 2"),
+				new Fixture<>(genericJacksonJsonPersonTemplate, stringFactory, personFactory, genericJacksonJsonSerializer,
+						"Generic Jackson 3"));
 
 		if (clusterAvailable()) {