Merge branch 'main' into remove-not-read-only-command

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,7 +5,7 @@ Make sure that:
 
 - [ ] You have read the [contribution guidelines](https://github.com/lettuce-io/lettuce-core/blob/main/.github/CONTRIBUTING.md).
 - [ ] You have created a feature request first to discuss your contribution intent. Please reference the feature request ticket number in the pull request.
-- [ ] You use the code formatters provided [here](https://github.com/lettuce-io/lettuce-core/blob/main/formatting.xml) and have them applied to your changes. Don’t submit any formatting related changes.
+- [ ] You applied code formatting rules using the `mvn formatter:format` target. Don’t submit any formatting related changes.
 - [ ] You submit test cases (unit or integration tests) that back your changes.
 
  <!--

src/test/java/io/lettuce/core/commands/HashCommandIntegrationTests.java

@@ -560,8 +560,7 @@ void hexpire() {
         assertThat(redis.hexpire(MY_KEY, 0, MY_FIELD)).containsExactly(2L);
         assertThat(redis.hset(MY_KEY, MY_FIELD, MY_VALUE)).isTrue();
         assertThat(redis.hexpire(MY_KEY, 1, MY_FIELD, MY_SECOND_FIELD)).containsExactly(1L, -2L);
-        assertThat(redis.hexpire("invalidKey", 1, MY_FIELD)).isEmpty();
-
+        assertThat(redis.hexpire("invalidKey", 1, MY_FIELD)).containsExactly(-2L);
         await().until(() -> redis.hget(MY_KEY, MY_FIELD) == null);
     }
 
@@ -573,7 +572,6 @@ void hexpireExpireArgs() {
         assertThat(redis.hexpire(MY_KEY, Duration.ofSeconds(1), ExpireArgs.Builder.xx(), MY_FIELD)).containsExactly(1L);
         assertThat(redis.hexpire(MY_KEY, Duration.ofSeconds(10), ExpireArgs.Builder.gt(), MY_FIELD)).containsExactly(1L);
         assertThat(redis.hexpire(MY_KEY, Duration.ofSeconds(1), ExpireArgs.Builder.lt(), MY_FIELD)).containsExactly(1L);
-
         await().until(() -> redis.hget(MY_KEY, MY_FIELD) == null);
     }
 
@@ -584,8 +582,7 @@ void hexpireat() {
         assertThat(redis.hexpireat(MY_KEY, Instant.now().minusSeconds(1), MY_FIELD)).containsExactly(2L);
         assertThat(redis.hset(MY_KEY, MY_FIELD, MY_VALUE)).isTrue();
         assertThat(redis.hexpireat(MY_KEY, Instant.now().plusSeconds(1), MY_FIELD)).containsExactly(1L);
-        assertThat(redis.hexpireat("invalidKey", Instant.now().plusSeconds(1), MY_FIELD)).isEmpty();
-
+        assertThat(redis.hexpireat("invalidKey", Instant.now().plusSeconds(1), MY_FIELD)).containsExactly(-2L);
         await().until(() -> redis.hget(MY_KEY, MY_FIELD) == null);
     }
 
@@ -609,8 +606,7 @@ void hexpiretime() {
     @Test
     @EnabledOnCommand("HPERSIST")
     void hpersist() {
-        assertThat(redis.hpersist(MY_KEY, MY_FIELD)).isEmpty();
-
+        assertThat(redis.hpersist(MY_KEY, MY_FIELD)).containsExactly(-2L);
         assertThat(redis.hset(MY_KEY, MY_FIELD, MY_VALUE)).isTrue();
         assertThat(redis.hpersist(MY_KEY, MY_FIELD)).containsExactly(-1L);