Add Hash Field Expiration commands to TypeHints for Lettuce.

Author: mp911de

src/main/antora/modules/ROOT/pages/appendix.adoc

@@ -67,6 +67,13 @@ link:https://www.springframework.org/schema/redis/spring-redis-1.0.xsd[Spring Da
 |GETSET |X
 |HDEL |X
 |HEXISTS |X
+|HEXPIRE |X
+|HEXPIREAT |X
+|HPEXPIRE |X
+|HPEXPIREAT |X
+|HPERSIST |X
+|HTTL |X
+|HPTTL |X
 |HGET |X
 |HGETALL |X
 |HINCRBY |X

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnection.java

@@ -1160,6 +1160,14 @@ static class TypeHints {
 			COMMAND_OUTPUT_TYPE_MAPPING.put(PFMERGE, IntegerOutput.class);
 			COMMAND_OUTPUT_TYPE_MAPPING.put(PFADD, IntegerOutput.class);
 
+			COMMAND_OUTPUT_TYPE_MAPPING.put(HEXPIRE, IntegerListOutput.class);
+			COMMAND_OUTPUT_TYPE_MAPPING.put(HEXPIREAT, IntegerListOutput.class);
+			COMMAND_OUTPUT_TYPE_MAPPING.put(HPEXPIRE, IntegerListOutput.class);
+			COMMAND_OUTPUT_TYPE_MAPPING.put(HPEXPIREAT, IntegerListOutput.class);
+			COMMAND_OUTPUT_TYPE_MAPPING.put(HPERSIST, IntegerListOutput.class);
+			COMMAND_OUTPUT_TYPE_MAPPING.put(HTTL, IntegerListOutput.class);
+			COMMAND_OUTPUT_TYPE_MAPPING.put(HPTTL, IntegerListOutput.class);
+
 			// DOUBLE
 			COMMAND_OUTPUT_TYPE_MAPPING.put(HINCRBYFLOAT, DoubleOutput.class);
 			COMMAND_OUTPUT_TYPE_MAPPING.put(INCRBYFLOAT, DoubleOutput.class);

src/main/java/org/springframework/data/redis/core/RedisCommand.java

@@ -107,6 +107,13 @@ public enum RedisCommand {
 	HSET("w", 3, 3), //
 	HSETNX("w", 3, 3), //
 	HVALS("r", 1, 1), //
+	HEXPIRE("w", 5), //
+	HEXPIREAT("w", 5), //
+	HPEXPIRE("w", 5), //
+	HPEXPIREAT("w", 5), //
+	HPERSIST("w", 4), //
+	HTTL("r", 4), //
+	HPTTL("r", 4), //
 	// -- I
 	INCR("rw", 1), //
 	INCRBYFLOAT("rw", 2, 2), //

src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java

@@ -98,6 +98,7 @@
 import org.springframework.data.redis.test.condition.RedisDriver;
 import org.springframework.data.redis.test.util.HexStringUtils;
 import org.springframework.data.util.Streamable;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Base test class for AbstractConnection integration tests
@@ -752,6 +753,45 @@ void testExecute() {
 		assertThat(stringSerializer.deserialize((byte[]) getResults().get(1))).isEqualTo("bar");
 	}
 
+	@Test
+	@EnabledOnCommand("HEXPIRE")
+	void testExecuteHashFieldExpiration() {
+
+		actual.add(connection.hSet("foo", "bar", "field"));
+		actual.add(connection.execute("HTTL", "foo", "FIELDS", "1", "bar"));
+		actual.add(connection.execute("HEXPIRE", "foo", "100", "NX", "FIELDS", "1", "bar"));
+		actual.add(connection.execute("HPERSIST", "foo", "FIELDS", "1", "bar"));
+		actual.add(connection.execute("HTTL", "foo", "FIELDS", "1", "bar"));
+
+		List<Object> results = getResults();
+
+		assertThat(deserializeList(results, 1, stringSerializer)).containsOnly(-1L);
+		assertThat(deserializeList(results, 2, stringSerializer)).containsOnly(1L);
+		assertThat(deserializeList(results, 3, stringSerializer)).containsOnly(1L);
+		assertThat(deserializeList(results, 4, stringSerializer)).containsOnly(-1L);
+	}
+
+	List<Object> deserializeList(List<Object> objects, int index, RedisSerializer<?> serializer) {
+
+		List<Object> result = new ArrayList<>();
+		Object o = objects.get(index);
+		if (o instanceof List<?> ls) {
+			for (Object obj : ls) {
+
+				if (obj instanceof byte[]) {
+					result.add(serializer.deserialize((byte[]) obj));
+				} else {
+					result.add(obj);
+				}
+			}
+
+			return result;
+		}
+
+		throw new IllegalArgumentException(
+				"Object at index " + index + " is not a list but " + ObjectUtils.nullSafeToString(o));
+	}
+
 	@Test
 	void testExecuteNoArgs() {
 
@@ -3436,7 +3476,7 @@ void hStrLenReturnsZeroWhenKeyDoesNotExist() {
 	@Test
 	@EnabledOnCommand("HEXPIRE")
 	public void hExpireReturnsSuccessAndSetsTTL() {
-		
+
 		actual.add(connection.hSet("hash-hexpire", "key-2", "value-2"));
 		actual.add(connection.hExpire("hash-hexpire", 5L, "key-2"));
 		actual.add(connection.hTtl("hash-hexpire", "key-2"));