Add unit tests for the new converter methods

Signed-off-by: Chris Bono <chris.bono@broadcom.com>

Author: onobc

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

@@ -2609,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(@NonNull byte[] key, @NonNull byte[]... fields) {
-        return convertAndReturn(delegate.hGetDel(key, fields), Converters.identityConverter());
-    }
-
-    @Override
-    public List<byte[]> hGetEx(@NonNull byte[] key, Expiration expiration, @NonNull byte[]... fields) {
-        return convertAndReturn(delegate.hGetEx(key, expiration, fields), Converters.identityConverter());
-    }
-
-    @Override
-    public Boolean hSetEx(@NonNull byte[] key, @NonNull Map<byte[], byte[]> hashes, HashFieldSetOption condition, Expiration expiration) {
-        return convertAndReturn(delegate.hSetEx(key, hashes, condition, expiration), 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(@NonNull byte[] key, @Nullable Expiration expiration, @NonNull byte[]... fields) {
+		return convertAndReturn(delegate.hGetEx(key, expiration, fields), 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;
@@ -1612,14 +1613,15 @@ default List<byte[]> hGetDel(byte[] key, byte[]... fields) {
 	/** @deprecated in favor of {@link RedisConnection#hashCommands()}}. */
 	@Override
 	@Deprecated
-	default List<byte[]> hGetEx(byte[] key, Expiration expiration, byte[]... fields) {
+	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, HashFieldSetOption condition, Expiration expiration) {
+	default Boolean hSetEx(byte[] key, Map<byte[], byte[]> hashes, @NonNull HashFieldSetOption condition,
+			@Nullable Expiration expiration) {
 		return hashCommands().hSetEx(key, hashes, condition, expiration);
 	}
 

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

@@ -29,6 +29,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -1342,11 +1343,18 @@ default Mono<List<ByteBuffer>> hGetDel(ByteBuffer key, Collection<ByteBuffer> fi
 	 */
 	Flux<MultiValueResponse<HGetDelCommand, ByteBuffer>> hGetDel(Publisher<HGetDelCommand> commands);
 
+	/**
+	 * {@literal HGETEX} {@link Command}.
+	 *
+	 * @author Viktoriya Kutsarova
+	 * @see <a href="https://redis.io/commands/hgetex">Redis Documentation: HGETEX</a>
+	 * @since 4.0
+	 */
 	class HGetExCommand extends HashFieldsCommand {
 
-		private final Expiration expiration;
+		private final @Nullable Expiration expiration;
 
-		private HGetExCommand(@Nullable ByteBuffer key, List<ByteBuffer> fields, Expiration expiration) {
+		private HGetExCommand(@Nullable ByteBuffer key, List<ByteBuffer> fields, @Nullable Expiration expiration) {
 
 			super(key, fields);
 
@@ -1357,10 +1365,10 @@ private HGetExCommand(@Nullable ByteBuffer key, List<ByteBuffer> fields, Expirat
 		 * Creates a new {@link HGetExCommand}.
 		 *
 		 * @param fields the {@code fields} names to apply expiration to
-		 * @param expiration the {@link Expiration} to apply to the given {@literal fields}.
+		 * @param expiration the optional {@link Expiration} to apply to the given {@literal fields}.
 		 * @return new instance of {@link HGetExCommand}.
 		 */
-		public static HGetExCommand expire(List<ByteBuffer> fields, Expiration expiration) {
+		public static HGetExCommand expire(List<ByteBuffer> fields, @Nullable Expiration expiration) {
 			return new HGetExCommand(null, fields, expiration);
 		}
 
@@ -1382,7 +1390,7 @@ public HGetExCommand fields(Collection<ByteBuffer> fields) {
 			return new HGetExCommand(getKey(), new ArrayList<>(fields), expiration);
 		}
 
-		public Expiration getExpiration() {
+		public @Nullable Expiration getExpiration() {
 			return expiration;
 		}
 	}
@@ -1392,11 +1400,12 @@ public Expiration getExpiration() {
 	 * time-to-live (TTL) for given {@literal fields}.
 	 *
 	 * @param key must not be {@literal null}.
+	 * @param expiration the optional expiration to set.
 	 * @param fields must not be {@literal null}.
 	 * @return never {@literal null}.
 	 * @see <a href="https://redis.io/commands/hgetex">Redis Documentation: HGETEX</a>
 	 */
-	default Mono<List<ByteBuffer>> hGetEx(ByteBuffer key, Expiration expiration, List<ByteBuffer> fields) {
+	default Mono<List<ByteBuffer>> hGetEx(ByteBuffer key, @Nullable Expiration expiration, List<ByteBuffer> fields) {
 
 		Assert.notNull(key, "Key must not be null");
 		Assert.notNull(fields, "Fields must not be null");
@@ -1419,16 +1428,17 @@ default Mono<List<ByteBuffer>> hGetEx(ByteBuffer key, Expiration expiration, Lis
 	 * {@literal HSETEX} {@link Command}.
 	 *
 	 * @author Viktoriya Kutsarova
+	 * @since 4.0
 	 * @see <a href="https://redis.io/commands/hsetex">Redis Documentation: HSETEX</a>
 	 */
 	class HSetExCommand extends KeyCommand {
 
 		private final Map<ByteBuffer, ByteBuffer> fieldValueMap;
 		private final RedisHashCommands.HashFieldSetOption condition;
-		private final Expiration expiration;
+		private final @Nullable Expiration expiration;
 
 		private HSetExCommand(@Nullable ByteBuffer key, Map<ByteBuffer, ByteBuffer> fieldValueMap,
-				RedisHashCommands.HashFieldSetOption condition, Expiration expiration) {
+				RedisHashCommands.HashFieldSetOption condition, @Nullable Expiration expiration) {
 			super(key);
 			this.fieldValueMap = fieldValueMap;
 			this.condition = condition;
@@ -1440,11 +1450,11 @@ private HSetExCommand(@Nullable ByteBuffer key, Map<ByteBuffer, ByteBuffer> fiel
 		 *
 		 * @param fieldValueMap the field-value pairs to set; must not be {@literal null}.
 		 * @param condition the condition for setting fields; must not be {@literal null}.
-		 * @param expiration the expiration to apply; must not be {@literal null}.
+		 * @param expiration the optional expiration to apply.
 		 * @return new instance of {@link HSetExCommand}.
 		 */
 		public static HSetExCommand setWithConditionAndExpiration(Map<ByteBuffer, ByteBuffer> fieldValueMap,
-				RedisHashCommands.HashFieldSetOption condition, Expiration expiration) {
+				RedisHashCommands.HashFieldSetOption condition, @Nullable Expiration expiration) {
 			return new HSetExCommand(null, fieldValueMap, condition, expiration);
 		}
 
@@ -1476,7 +1486,7 @@ public RedisHashCommands.HashFieldSetOption getCondition() {
 		/**
 		 * @return the expiration to apply.
 		 */
-		public Expiration getExpiration() {
+		public @Nullable Expiration getExpiration() {
 			return expiration;
 		}
 	}
@@ -1487,17 +1497,16 @@ public Expiration getExpiration() {
 	 * @param key must not be {@literal null}.
 	 * @param fieldValueMap the field-value pairs to set; must not be {@literal null}.
 	 * @param condition the condition for setting fields; must not be {@literal null}.
-	 * @param expiration the expiration to apply; must not be {@literal null}.
+	 * @param expiration the optional expiration to apply
 	 * @return never {@literal null}.
 	 * @see <a href="https://redis.io/commands/hsetex">Redis Documentation: HSETEX</a>
 	 */
 	default Mono<Boolean> hSetEx(ByteBuffer key, Map<ByteBuffer, ByteBuffer> fieldValueMap,
-			RedisHashCommands.HashFieldSetOption condition, Expiration expiration) {
+			RedisHashCommands.@NonNull HashFieldSetOption condition, @Nullable Expiration expiration) {
 
 		Assert.notNull(key, "Key must not be null");
 		Assert.notNull(fieldValueMap, "Field-value map must not be null");
 		Assert.notNull(condition, "Condition must not be null");
-		Assert.notNull(expiration, "Expiration must not be null");
 
 		return hSetEx(Mono.just(HSetExCommand.setWithConditionAndExpiration(fieldValueMap, condition, expiration)
 				.from(key)))

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

@@ -23,6 +23,8 @@
 
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.data.redis.core.types.Expiration;
@@ -562,26 +564,27 @@ default List<Long> hExpireAt(byte @NonNull [] key, long unixTime, byte @NonNull
 	 * time-to-live (TTL) for given {@code fields}.
 	 *
 	 * @param key must not be {@literal null}.
+	 * @param expiration the optional expiration to apply.
 	 * @param fields must not be {@literal null}.
 	 * @return list of values for given {@code fields} or an empty {@link List} if key does not
 	 * exist or {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/hgetex">Redis Documentation: HGETEX</a>
 	 */
-	List<byte[]> hGetEx(byte @NonNull [] key, Expiration expiration,
+	List<byte[]> hGetEx(byte @NonNull [] key, @Nullable Expiration expiration,
 			byte @NonNull [] @NonNull ... fields);
 
 	/**
 	 * Set field-value pairs in hash at {@literal key} with optional condition and expiration.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param hashes the field-value pairs to set; must not be {@literal null}.
-	 * @param hashFieldSetOption the optional condition for setting fields.
+	 * @param hashFieldSetOption the condition for setting fields; must not be {@literal null}.
 	 * @param expiration the optional expiration to apply.
 	 * @return never {@literal null}.
 	 * @see <a href="https://redis.io/commands/hsetex">Redis Documentation: HSETEX</a>
 	 */
-	Boolean hSetEx(byte @NonNull [] key, @NonNull Map<byte[], byte[]> hashes, HashFieldSetOption hashFieldSetOption,
-			Expiration expiration);
+	Boolean hSetEx(byte @NonNull [] key, @NonNull Map<byte[], byte[]> hashes,
+			@NonNull HashFieldSetOption hashFieldSetOption, @Nullable Expiration expiration);
 
 	/**
 	 * {@code HSETEX} command arguments for {@code FNX}, {@code FXX}.

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

@@ -2599,8 +2599,8 @@ List<Long> hpExpireAt(@NonNull String key, long unixTimeInMillis, ExpirationOpti
 	 * @see <a href="https://redis.io/commands/hsetex">Redis Documentation: HSETEX</a>
 	 * @see RedisHashCommands#hSetEx(byte[], Map, HashFieldSetOption, Expiration)
 	 */
-	Boolean hSetEx(@NonNull String key, @NonNull Map<@NonNull String, String> hashes, HashFieldSetOption condition,
-			Expiration expiration);
+	Boolean hSetEx(@NonNull String key, @NonNull Map<@NonNull String, String> hashes,
+			@NonNull HashFieldSetOption condition, @Nullable Expiration expiration);
 
 	// -------------------------------------------------------------------------
 	// Methods dealing with HyperLogLog

src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterHashCommands.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.redis.connection.jedis;
 
-import org.springframework.data.redis.core.types.Expiration;
 import redis.clients.jedis.args.ExpiryOption;
 import redis.clients.jedis.params.ScanParams;
 import redis.clients.jedis.resps.ScanResult;
@@ -27,6 +26,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.redis.connection.ExpirationOptions;
@@ -35,6 +35,7 @@
 import org.springframework.data.redis.core.ScanCursor;
 import org.springframework.data.redis.core.ScanIteration;
 import org.springframework.data.redis.core.ScanOptions;
+import org.springframework.data.redis.core.types.Expiration;
 import org.springframework.util.Assert;
 
 /**
@@ -415,44 +416,47 @@ public List<Long> hpTtl(byte[] key, byte[]... fields) {
 		}
 	}
 
-    @Override
-    public List<byte[]> hGetDel(byte[] key, byte[]... fields) {
+	@Override
+	public List<byte[]> hGetDel(byte[] key, byte[]... fields) {
 
-        Assert.notNull(key, "Key must not be null");
-        Assert.notNull(fields, "Fields must not be null");
+		Assert.notNull(key, "Key must not be null");
+		Assert.notNull(fields, "Fields must not be null");
 
-        try {
-            return connection.getCluster().hgetdel(key, fields);
-        } catch (Exception ex) {
-            throw convertJedisAccessException(ex);
-        }
-    }
+		try {
+			return connection.getCluster().hgetdel(key, fields);
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
+	}
 
-    @Override
-    public List<byte[]> hGetEx(byte[] key, Expiration expiration, byte[]... fields) {
+	@Override
+	public List<byte[]> hGetEx(byte[] key, @Nullable Expiration expiration, byte[]... fields) {
 
-        Assert.notNull(key, "Key must not be null");
-        Assert.notNull(fields, "Fields must not be null");
+		Assert.notNull(key, "Key must not be null");
+		Assert.notNull(fields, "Fields must not be null");
 
-        try {
-            return connection.getCluster().hgetex(key, JedisConverters.toHGetExParams(expiration), fields);
-        } catch (Exception ex) {
-            throw convertJedisAccessException(ex);
-        }
-    }
+		try {
+			return connection.getCluster().hgetex(key, JedisConverters.toHGetExParams(expiration), fields);
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
+	}
 
-    @Override
-    public Boolean hSetEx(byte[] key, Map<byte[], byte[]> hashes, HashFieldSetOption condition, Expiration expiration) {
+	@Override
+	public Boolean hSetEx(byte[] key, Map<byte[], byte[]> hashes, @NonNull HashFieldSetOption condition,
+			@Nullable Expiration expiration) {
 
-        Assert.notNull(key, "Key must not be null");
-        Assert.notNull(hashes, "Fields must not be null");
+		Assert.notNull(key, "Key must not be null");
+		Assert.notNull(hashes, "Fields must not be null");
+		Assert.notNull(condition, "Condition must not be null");
 
-        try {
-            return JedisConverters.toBoolean(connection.getCluster().hsetex(key, JedisConverters.toHSetExParams(condition, expiration), hashes));
-        } catch (Exception ex) {
-            throw convertJedisAccessException(ex);
-        }
-    }
+		try {
+			return JedisConverters.toBoolean(
+					connection.getCluster().hsetex(key, JedisConverters.toHSetExParams(condition, expiration), hashes));
+		} catch (Exception ex) {
+			throw convertJedisAccessException(ex);
+		}
+	}
 
 	@Nullable
 	@Override