Polishing

src/main/java/org/springframework/data/redis/connection/DefaultStringRedisConnection.java

@@ -23,7 +23,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.jetbrains.annotations.NotNull;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
@@ -1617,20 +1616,20 @@ public List<String> hVals(String key) {
 		return convertAndReturn(delegate.hVals(serialize(key)), byteListToStringList);
 	}
 
-    @Override
-    public List<String> hGetDel(String key, String... fields) {
-        return convertAndReturn(delegate.hGetDel(serialize(key), serializeMulti(fields)), byteListToStringList);
-    }
+	@Override
+	public List<String> hGetDel(String key, String... fields) {
+		return convertAndReturn(delegate.hGetDel(serialize(key), serializeMulti(fields)), byteListToStringList);
+	}
 
-    @Override
-    public List<String> hGetEx(String key, Expiration expiration, String... fields) {
-        return convertAndReturn(delegate.hGetEx(serialize(key), expiration, serializeMulti(fields)), byteListToStringList);
-    }
+	@Override
+	public List<String> hGetEx(String key, Expiration expiration, String... fields) {
+		return convertAndReturn(delegate.hGetEx(serialize(key), expiration, serializeMulti(fields)), byteListToStringList);
+	}
 
-    @Override
-    public Boolean hSetEx(@NonNull String key, @NonNull Map<@NonNull String, String> hashes, HashFieldSetOption condition, Expiration expiration) {
-        return convertAndReturn(delegate.hSetEx(serialize(key), serialize(hashes), condition, expiration), Converters.identityConverter());
-    }
+	@Override
+	public Boolean hSetEx(@NonNull String key, @NonNull Map<@NonNull String, String> hashes, HashFieldSetOption condition, Expiration expiration) {
+		return convertAndReturn(delegate.hSetEx(serialize(key), serialize(hashes), condition, expiration), Converters.identityConverter());
+	}
 
 	@Override
 	public Long incr(String key) {
@@ -2610,20 +2609,21 @@ public List<Long> hTtl(byte[] key, TimeUnit timeUnit, byte[]... fields) {
 		return this.delegate.hTtl(key, timeUnit, fields);
 	}
 
-    @Override
-    public List<byte[]> hGetDel(@NotNull byte[] key, @NotNull byte[]... fields) {
-        return convertAndReturn(delegate.hGetDel(key, fields), Converters.identityConverter());
-    }
+	@Override
+	public List<byte[]> hGetDel(@NonNull byte[] key, @NonNull byte[]... fields) {
+		return convertAndReturn(delegate.hGetDel(key, fields), Converters.identityConverter());
+	}
 
-    @Override
-    public List<byte[]> hGetEx(@NotNull byte[] key, Expiration expiration, @NotNull byte[]... fields) {
-        return convertAndReturn(delegate.hGetEx(key, expiration, fields), Converters.identityConverter());
-    }
+	@Override
+	public List<byte[]> hGetEx(@NonNull byte[] key, @Nullable Expiration expiration, @NonNull byte[]... fields) {
+		return convertAndReturn(delegate.hGetEx(key, expiration, fields), Converters.identityConverter());
+	}
 
-    @Override
-    public Boolean hSetEx(@NotNull byte[] key, @NonNull Map<byte[], byte[]> hashes, HashFieldSetOption condition, Expiration expiration) {
-        return convertAndReturn(delegate.hSetEx(key, hashes, condition, expiration), Converters.identityConverter());
-    }
+	@Override
+	public Boolean hSetEx(@NonNull byte[] key, @NonNull Map<byte[], byte[]> hashes, @NonNull HashFieldSetOption condition,
+			@Nullable Expiration expiration) {
+		return convertAndReturn(delegate.hSetEx(key, hashes, condition, expiration), Converters.identityConverter());
+	}
 
 	public @Nullable List<Long> applyExpiration(String key,
 			org.springframework.data.redis.core.types.Expiration expiration,

src/main/java/org/springframework/data/redis/connection/DefaultedRedisConnection.java

@@ -23,6 +23,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
 import org.springframework.data.geo.Circle;
@@ -1602,26 +1603,27 @@ default List<Long> hpTtl(byte[] key, byte[]... fields) {
 		return hashCommands().hpTtl(key, fields);
 	}
 
-    /** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
-    @Override
-    @Deprecated
-    default List<byte[]> hGetDel(byte[] key, byte[]... fields) {
-        return hashCommands().hGetDel(key, fields);
-    }
-
-    /** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
-    @Override
-    @Deprecated
-    default List<byte[]> hGetEx(byte[] key, Expiration expiration, byte[]... fields) {
-        return hashCommands().hGetEx(key, expiration, fields);
-    }
-
-    /** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
-    @Override
-    @Deprecated
-    default Boolean hSetEx(byte[] key, Map<byte[], byte[]> hashes, HashFieldSetOption condition, Expiration expiration) {
-        return hashCommands().hSetEx(key, hashes, condition, expiration);
-    }
+	/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
+	@Override
+	@Deprecated
+	default List<byte[]> hGetDel(byte[] key, byte[]... fields) {
+		return hashCommands().hGetDel(key, fields);
+	}
+
+	/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
+	@Override
+	@Deprecated
+	default List<byte[]> hGetEx(byte[] key, @Nullable Expiration expiration, byte[]... fields) {
+		return hashCommands().hGetEx(key, expiration, fields);
+	}
+
+	/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
+	@Override
+	@Deprecated
+	default Boolean hSetEx(byte[] key, Map<byte[], byte[]> hashes, @NonNull HashFieldSetOption condition,
+			@Nullable Expiration expiration) {
+		return hashCommands().hSetEx(key, hashes, condition, expiration);
+	}
 
 	/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
 	@Override