From ce2c7caee7e918ae45f7e4b7ee7eae65b54003b5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Wed, 15 Jan 2025 14:10:09 +0100
Subject: [PATCH] Polishing.

Add missing Nullable annotations to serializers.

See #3053
Original pull request: #3058
---
 .../redis/serializer/GenericJackson2JsonRedisSerializer.java | 5 +----
 .../data/redis/serializer/GenericToStringSerializer.java     | 1 +
 .../data/redis/serializer/Jackson2JsonRedisSerializer.java   | 1 +
 .../redis/serializer/JdkSerializationRedisSerializer.java    | 2 ++
 .../springframework/data/redis/serializer/OxmSerializer.java | 1 +
 .../data/redis/serializer/StringRedisSerializer.java         | 2 ++
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java
index 1d947c950..a2f2fe258 100644
--- a/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java
+++ b/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java
@@ -277,6 +277,7 @@ public class GenericJackson2JsonRedisSerializer implements RedisSerializer<Objec
 	}
 
 	@Override
+	@Nullable
 	public Object deserialize(@Nullable byte[] source) throws SerializationException {
 		return deserialize(source, Object.class);
 	}
@@ -375,10 +376,6 @@ public class GenericJackson2JsonRedisSerializer implements RedisSerializer<Objec
 
 		/**
 		 * Lenient variant of ObjectMapper._readTreeAndClose using a strict {@link JsonNodeDeserializer}.
-		 *
-		 * @param source
-		 * @return
-		 * @throws IOException
 		 */
 		private JsonNode readTree(byte[] source) throws IOException {
 
diff --git a/src/main/java/org/springframework/data/redis/serializer/GenericToStringSerializer.java b/src/main/java/org/springframework/data/redis/serializer/GenericToStringSerializer.java
index a85d9d8e3..8159347b8 100644
--- a/src/main/java/org/springframework/data/redis/serializer/GenericToStringSerializer.java
+++ b/src/main/java/org/springframework/data/redis/serializer/GenericToStringSerializer.java
@@ -92,6 +92,7 @@ public class GenericToStringSerializer<T> implements RedisSerializer<T>, BeanFac
 	}
 
 	@Override
+	@Nullable
 	public T deserialize(@Nullable byte[] bytes) {
 
 		if (bytes == null) {
diff --git a/src/main/java/org/springframework/data/redis/serializer/Jackson2JsonRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/Jackson2JsonRedisSerializer.java
index daa55032a..32d626bdd 100644
--- a/src/main/java/org/springframework/data/redis/serializer/Jackson2JsonRedisSerializer.java
+++ b/src/main/java/org/springframework/data/redis/serializer/Jackson2JsonRedisSerializer.java
@@ -158,6 +158,7 @@ public class Jackson2JsonRedisSerializer<T> implements RedisSerializer<T> {
 		}
 	}
 
+	@Nullable
 	@Override
 	@SuppressWarnings("unchecked")
 	public T deserialize(@Nullable byte[] bytes) throws SerializationException {
diff --git a/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java
index 9ed493346..db67928a9 100644
--- a/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java
+++ b/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java
@@ -84,6 +84,7 @@ public class JdkSerializationRedisSerializer implements RedisSerializer<Object>
 		this.deserializer = deserializer;
 	}
 
+	@Nullable
 	@Override
 	public byte[] serialize(@Nullable Object value) {
 
@@ -98,6 +99,7 @@ public class JdkSerializationRedisSerializer implements RedisSerializer<Object>
 		}
 	}
 
+	@Nullable
 	@Override
 	public Object deserialize(@Nullable byte[] bytes) {
 
diff --git a/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java b/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java
index 7d98db1b6..18ceace01 100644
--- a/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java
+++ b/src/main/java/org/springframework/data/redis/serializer/OxmSerializer.java
@@ -102,6 +102,7 @@ public class OxmSerializer implements InitializingBean, RedisSerializer<Object>
 		return stream.toByteArray();
 	}
 
+	@Nullable
 	@Override
 	public Object deserialize(@Nullable byte[] bytes) throws SerializationException {
 
diff --git a/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java
index e8e5cd220..b9fea3cb2 100644
--- a/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java
+++ b/src/main/java/org/springframework/data/redis/serializer/StringRedisSerializer.java
@@ -80,11 +80,13 @@ public class StringRedisSerializer implements RedisSerializer<String> {
 		this.charset = charset;
 	}
 
+	@Nullable
 	@Override
 	public byte[] serialize(@Nullable String value) {
 		return (value == null ? null : value.getBytes(charset));
 	}
 
+	@Nullable
 	@Override
 	public String deserialize(@Nullable byte[] bytes) {
 		return (bytes == null ? null : new String(bytes, charset));