Remove XNackParams and related methods because params are internal

uglide · uglide · commit 8313bfb3ee22 · 2026-05-15T12:45:58.000+02:00
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -3119,11 +3119,6 @@ public RedisFuture<Long> xnack(K key, K group, XNackMode mode, String... message
         return dispatch(commandBuilder.xnack(key, group, mode, messageIds));
     }
 
-    @Override
-    public RedisFuture<Long> xnack(K key, K group, XNackMode mode, XNackArgs args, String... messageIds) {
-        return dispatch(commandBuilder.xnack(key, group, mode, args, messageIds));
-    }
-
     @Override
     public RedisFuture<String> xadd(K key, Map<K, V> body) {
         return dispatch(commandBuilder.xadd(key, null, body));
diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -3181,11 +3181,6 @@ public Mono<Long> xnack(K key, K group, XNackMode mode, String... messageIds) {
         return createMono(() -> commandBuilder.xnack(key, group, mode, messageIds));
     }
 
-    @Override
-    public Mono<Long> xnack(K key, K group, XNackMode mode, XNackArgs args, String... messageIds) {
-        return createMono(() -> commandBuilder.xnack(key, group, mode, args, messageIds));
-    }
-
     @Override
     public Mono<String> xadd(K key, Map<K, V> body) {
         return createMono(() -> commandBuilder.xadd(key, null, body));
diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -3270,10 +3270,6 @@ public Command<K, V, List<StreamEntryDeletionResult>> xackdel(K key, K group, St
     }
 
     public Command<K, V, Long> xnack(K key, K group, XNackMode mode, String[] messageIds) {
-        return xnack(key, group, mode, null, messageIds);
-    }
-
-    public Command<K, V, Long> xnack(K key, K group, XNackMode mode, XNackArgs xNackArgs, String[] messageIds) {
         notNullKey(key);
         LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_NULL);
         LettuceAssert.notNull(mode, "XNackMode " + MUST_NOT_BE_NULL);
@@ -3288,10 +3284,6 @@ public Command<K, V, Long> xnack(K key, K group, XNackMode mode, XNackArgs xNack
             args.add(messageId);
         }
 
-        if (xNackArgs != null) {
-            xNackArgs.build(args);
-        }
-
         return createCommand(XNACK, new IntegerOutput<>(codec), args);
     }
 
diff --git a/src/main/java/io/lettuce/core/XNackArgs.java b/src/main/java/io/lettuce/core/XNackArgs.java
diff --git a/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisStreamAsyncCommands.java
@@ -90,20 +90,6 @@ public interface RedisStreamAsyncCommands<K, V> {
      */
     RedisFuture<Long> xnack(K key, K group, XNackMode mode, String... messageIds);
 
-    /**
-     * Negatively acknowledge one or more pending messages in a consumer group with additional options. Depending on the
-     * {@link XNackMode}, the delivery counter is adjusted to reflect the reason for the NACK.
-     *
-     * @param key the stream key.
-     * @param group name of the consumer group.
-     * @param mode the nacking mode.
-     * @param args additional {@link XNackArgs}, must not be {@code null}.
-     * @param messageIds message Id's to negatively acknowledge.
-     * @return the number of messages successfully NACKed.
-     * @since 7.6
-     */
-    RedisFuture<Long> xnack(K key, K group, XNackMode mode, XNackArgs args, String... messageIds);
-
     /**
      * Append a message to the stream {@code key}.
      *
diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisStreamReactiveCommands.java
@@ -91,20 +91,6 @@ public interface RedisStreamReactiveCommands<K, V> {
      */
     Mono<Long> xnack(K key, K group, XNackMode mode, String... messageIds);
 
-    /**
-     * Negatively acknowledge one or more pending messages in a consumer group with additional options. Depending on the
-     * {@link XNackMode}, the delivery counter is adjusted to reflect the reason for the NACK.
-     *
-     * @param key the stream key.
-     * @param group name of the consumer group.
-     * @param mode the nacking mode.
-     * @param args additional {@link XNackArgs}, must not be {@code null}.
-     * @param messageIds message Id's to negatively acknowledge.
-     * @return the number of messages successfully NACKed.
-     * @since 7.6
-     */
-    Mono<Long> xnack(K key, K group, XNackMode mode, XNackArgs args, String... messageIds);
-
     /**
      * Append a message to the stream {@code key}.
      *
diff --git a/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisStreamCommands.java
@@ -90,20 +90,6 @@ public interface RedisStreamCommands<K, V> {
      */
     Long xnack(K key, K group, XNackMode mode, String... messageIds);
 
-    /**
-     * Negatively acknowledge one or more pending messages in a consumer group with additional options. Depending on the
-     * {@link XNackMode}, the delivery counter is adjusted to reflect the reason for the NACK.
-     *
-     * @param key the stream key.
-     * @param group name of the consumer group.
-     * @param mode the nacking mode.
-     * @param args additional {@link XNackArgs}, must not be {@code null}.
-     * @param messageIds message Id's to negatively acknowledge.
-     * @return the number of messages successfully NACKed.
-     * @since 7.6
-     */
-    Long xnack(K key, K group, XNackMode mode, XNackArgs args, String... messageIds);
-
     /**
      * Append a message to the stream {@code key}.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionStreamAsyncCommands.java
@@ -90,20 +90,6 @@ public interface NodeSelectionStreamAsyncCommands<K, V> {
      */
     AsyncExecutions<Long> xnack(K key, K group, XNackMode mode, String... messageIds);
 
-    /**
-     * Negatively acknowledge one or more pending messages in a consumer group with additional options. Depending on the
-     * {@link XNackMode}, the delivery counter is adjusted to reflect the reason for the NACK.
-     *
-     * @param key the stream key.
-     * @param group name of the consumer group.
-     * @param mode the nacking mode.
-     * @param args additional {@link XNackArgs}, must not be {@code null}.
-     * @param messageIds message Id's to negatively acknowledge.
-     * @return the number of messages successfully NACKed.
-     * @since 7.6
-     */
-    AsyncExecutions<Long> xnack(K key, K group, XNackMode mode, XNackArgs args, String... messageIds);
-
     /**
      * Append a message to the stream {@code key}.
      *
diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionStreamCommands.java
@@ -90,20 +90,6 @@ public interface NodeSelectionStreamCommands<K, V> {
      */
     Executions<Long> xnack(K key, K group, XNackMode mode, String... messageIds);
 
-    /**
-     * Negatively acknowledge one or more pending messages in a consumer group with additional options. Depending on the
-     * {@link XNackMode}, the delivery counter is adjusted to reflect the reason for the NACK.
-     *
-     * @param key the stream key.
-     * @param group name of the consumer group.
-     * @param mode the nacking mode.
-     * @param args additional {@link XNackArgs}, must not be {@code null}.
-     * @param messageIds message Id's to negatively acknowledge.
-     * @return the number of messages successfully NACKed.
-     * @since 7.6
-     */
-    Executions<Long> xnack(K key, K group, XNackMode mode, XNackArgs args, String... messageIds);
-
     /**
      * Append a message to the stream {@code key}.
      *
diff --git a/src/main/kotlin/io/lettuce/core/api/coroutines/RedisStreamCoroutinesCommands.kt b/src/main/kotlin/io/lettuce/core/api/coroutines/RedisStreamCoroutinesCommands.kt
@@ -63,20 +63,6 @@ interface RedisStreamCoroutinesCommands<K : Any, V : Any> {
      */
     suspend fun xnack(key: K, group: K, mode: XNackMode, vararg messageIds: String): Long?
 
-    /**
-     * Negatively acknowledge one or more pending messages in a consumer group with additional options. Depending on the
-     * [XNackMode], the delivery counter is adjusted to reflect the reason for the NACK.
-     *
-     * @param key the stream key.
-     * @param group name of the consumer group.
-     * @param mode the nacking mode.
-     * @param args additional [XNackArgs], must not be `null`.
-     * @param messageIds message Id's to negatively acknowledge.
-     * @return the number of messages successfully NACKed.
-     * @since 7.6
-     */
-    suspend fun xnack(key: K, group: K, mode: XNackMode, args: XNackArgs, vararg messageIds: String): Long?
-
     /**
      * Append a message to the stream `key`.
      *
diff --git a/src/main/kotlin/io/lettuce/core/api/coroutines/RedisStreamCoroutinesCommandsImpl.kt b/src/main/kotlin/io/lettuce/core/api/coroutines/RedisStreamCoroutinesCommandsImpl.kt
@@ -46,8 +46,6 @@ internal class RedisStreamCoroutinesCommandsImpl<K : Any, V : Any>(internal val
 
     override suspend fun xnack(key: K, group: K, mode: XNackMode, vararg messageIds: String): Long? = ops.xnack(key, group, mode, *messageIds).awaitFirstOrNull()
 
-    override suspend fun xnack(key: K, group: K, mode: XNackMode, args: XNackArgs, vararg messageIds: String): Long? = ops.xnack(key, group, mode, args, *messageIds).awaitFirstOrNull()
-
     override suspend fun xadd(key: K, body: Map<K, V>): String? = ops.xadd(key, body).awaitFirstOrNull()
 
     override suspend fun xadd(key: K, args: XAddArgs, body: Map<K, V>): String? = ops.xadd(key, args, body).awaitFirstOrNull()
diff --git a/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java b/src/main/templates/io/lettuce/core/api/RedisStreamCommands.java
@@ -89,20 +89,6 @@ public interface RedisStreamCommands<K, V> {
      */
     Long xnack(K key, K group, XNackMode mode, String... messageIds);
 
-    /**
-     * Negatively acknowledge one or more pending messages in a consumer group with additional options. Depending on the
-     * {@link XNackMode}, the delivery counter is adjusted to reflect the reason for the NACK.
-     *
-     * @param key the stream key.
-     * @param group name of the consumer group.
-     * @param mode the nacking mode.
-     * @param args additional {@link XNackArgs}, must not be {@code null}.
-     * @param messageIds message Id's to negatively acknowledge.
-     * @return the number of messages successfully NACKed.
-     * @since 7.6
-     */
-    Long xnack(K key, K group, XNackMode mode, XNackArgs args, String... messageIds);
-
     /**
      * Append a message to the stream {@code key}.
      *
diff --git a/src/test/java/io/lettuce/core/RedisCommandBuilderUnitTests.java b/src/test/java/io/lettuce/core/RedisCommandBuilderUnitTests.java
@@ -520,43 +520,6 @@ void shouldCorrectlyConstructXnackFatal() {
                         + "$5\r\n" + "FATAL\r\n" + "$3\r\n" + "IDS\r\n" + "$1\r\n" + "1\r\n" + "$12\r\n" + "1234567890-0\r\n");
     }
 
-    @Test
-    void shouldCorrectlyConstructXnackWithRetryCount() {
-        Command<String, String, Long> command = sut.xnack(STREAM_KEY, GROUP_NAME, XNackMode.FAIL,
-                XNackArgs.Builder.retryCount(5), new String[] { MESSAGE_ID1 });
-        ByteBuf buf = Unpooled.directBuffer();
-        command.encode(buf);
-
-        assertThat(buf.toString(StandardCharsets.UTF_8)).isEqualTo("*9\r\n" + "$5\r\n" + "XNACK\r\n" + "$11\r\n"
-                + "test-stream\r\n" + "$10\r\n" + "test-group\r\n" + "$4\r\n" + "FAIL\r\n" + "$3\r\n" + "IDS\r\n" + "$1\r\n"
-                + "1\r\n" + "$12\r\n" + "1234567890-0\r\n" + "$10\r\n" + "RETRYCOUNT\r\n" + "$1\r\n" + "5\r\n");
-    }
-
-    @Test
-    void shouldCorrectlyConstructXnackWithForce() {
-        Command<String, String, Long> command = sut.xnack(STREAM_KEY, GROUP_NAME, XNackMode.SILENT, XNackArgs.Builder.force(),
-                new String[] { MESSAGE_ID1 });
-        ByteBuf buf = Unpooled.directBuffer();
-        command.encode(buf);
-
-        assertThat(buf.toString(StandardCharsets.UTF_8)).isEqualTo("*8\r\n" + "$5\r\n" + "XNACK\r\n" + "$11\r\n"
-                + "test-stream\r\n" + "$10\r\n" + "test-group\r\n" + "$6\r\n" + "SILENT\r\n" + "$3\r\n" + "IDS\r\n" + "$1\r\n"
-                + "1\r\n" + "$12\r\n" + "1234567890-0\r\n" + "$5\r\n" + "FORCE\r\n");
-    }
-
-    @Test
-    void shouldCorrectlyConstructXnackWithRetryCountAndForce() {
-        Command<String, String, Long> command = sut.xnack(STREAM_KEY, GROUP_NAME, XNackMode.FATAL,
-                new XNackArgs().retryCount(10).force(), new String[] { MESSAGE_ID1, MESSAGE_ID2 });
-        ByteBuf buf = Unpooled.directBuffer();
-        command.encode(buf);
-
-        assertThat(buf.toString(StandardCharsets.UTF_8)).isEqualTo(
-                "*11\r\n" + "$5\r\n" + "XNACK\r\n" + "$11\r\n" + "test-stream\r\n" + "$10\r\n" + "test-group\r\n" + "$5\r\n"
-                        + "FATAL\r\n" + "$3\r\n" + "IDS\r\n" + "$1\r\n" + "2\r\n" + "$12\r\n" + "1234567890-0\r\n" + "$12\r\n"
-                        + "1234567891-0\r\n" + "$10\r\n" + "RETRYCOUNT\r\n" + "$2\r\n" + "10\r\n" + "$5\r\n" + "FORCE\r\n");
-    }
-
     @Test
     void xnackShouldRejectNullKey() {
         assertThatThrownBy(() -> sut.xnack(null, GROUP_NAME, XNackMode.FAIL, new String[] { MESSAGE_ID1 }))
@@ -595,12 +558,6 @@ void xnackShouldRejectNullElementsInMessageIds() {
                         .hasMessageContaining("MessageIds must not contain null elements");
     }
 
-    @Test
-    void xnackArgsShouldRejectNegativeRetryCount() {
-        assertThatThrownBy(() -> XNackArgs.Builder.retryCount(-1)).isInstanceOf(IllegalArgumentException.class)
-                .hasMessageContaining("RETRYCOUNT must be greater than or equal to 0");
-    }
-
     @Test
     void shouldCorrectlyConstructSetWithExAndIfeq() {
         Command<String, String, ?> command = sut.set("mykey", "myvalue",
diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java

Original file line number	Diff line number	Diff line change
`@@ -3270,10 +3270,6 @@ public Command<K, V, List<StreamEntryDeletionResult>> xackdel(K key, K group, St`
`3270`	`3270`	`}`
`3271`	`3271`
`3272`	`3272`	`public Command<K, V, Long> xnack(K key, K group, XNackMode mode, String[] messageIds) {`
`3273`		`- return xnack(key, group, mode, null, messageIds);`
`3274`		`- }`
`3275`		`-`
`3276`		`- public Command<K, V, Long> xnack(K key, K group, XNackMode mode, XNackArgs xNackArgs, String[] messageIds) {`
`3277`	`3273`	`notNullKey(key);`
`3278`	`3274`	`LettuceAssert.notNull(group, "Group " + MUST_NOT_BE_NULL);`
`3279`	`3275`	`LettuceAssert.notNull(mode, "XNackMode " + MUST_NOT_BE_NULL);`
`@@ -3288,10 +3284,6 @@ public Command<K, V, Long> xnack(K key, K group, XNackMode mode, XNackArgs xNack`
`3288`	`3284`	`args.add(messageId);`
`3289`	`3285`	`}`
`3290`	`3286`
`3291`		`- if (xNackArgs != null) {`
`3292`		`- xNackArgs.build(args);`
`3293`		`- }`
`3294`		`-`
`3295`	`3287`	`return createCommand(XNACK, new IntegerOutput<>(codec), args);`
`3296`	`3288`	`}`
`3297`	`3289`