From d57f2009d8eb1ca051f6f7f34a946e0e0a8bc511 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Sat, 7 Oct 2023 09:04:22 +0300
Subject: [PATCH] Fixed - RStream.trim() and trimNonStrict() methods don't work
 with Redis 6.2+ #5353

---
 redisson/src/main/java/org/redisson/RedissonStream.java       | 2 +-
 .../main/java/org/redisson/api/stream/StreamTrimParams.java   | 4 ++--
 redisson/src/test/java/org/redisson/RedissonStreamTest.java   | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonStream.java b/redisson/src/main/java/org/redisson/RedissonStream.java
index fad793c1e..23a4f586e 100644
--- a/redisson/src/main/java/org/redisson/RedissonStream.java
+++ b/redisson/src/main/java/org/redisson/RedissonStream.java
@@ -1406,7 +1406,7 @@ public class RedissonStream<K, V> extends RedissonExpirable implements RStream<K
         List<Object> params = new LinkedList<>();
         params.add(getRawName());
 
-        if (pps.getMaxLen() > 0) {
+        if (pps.getMaxLen() != null) {
             params.add("MAXLEN");
             if (!trimStrict) {
                 params.add("~");
diff --git a/redisson/src/main/java/org/redisson/api/stream/StreamTrimParams.java b/redisson/src/main/java/org/redisson/api/stream/StreamTrimParams.java
index c4d6a49c8..07cd3ee47 100644
--- a/redisson/src/main/java/org/redisson/api/stream/StreamTrimParams.java
+++ b/redisson/src/main/java/org/redisson/api/stream/StreamTrimParams.java
@@ -26,7 +26,7 @@ public final class StreamTrimParams implements StreamTrimStrategyArgs<StreamTrim
                                          StreamTrimArgs,
                                          StreamTrimLimitArgs<StreamTrimArgs> {
 
-    int maxLen;
+    Integer maxLen;
     StreamMessageId minId;
     int limit;
 
@@ -62,7 +62,7 @@ public final class StreamTrimParams implements StreamTrimStrategyArgs<StreamTrim
         return this;
     }
 
-    public int getMaxLen() {
+    public Integer getMaxLen() {
         return maxLen;
     }
 
diff --git a/redisson/src/test/java/org/redisson/RedissonStreamTest.java b/redisson/src/test/java/org/redisson/RedissonStreamTest.java
index f9fb60568..c319ec683 100644
--- a/redisson/src/test/java/org/redisson/RedissonStreamTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonStreamTest.java
@@ -106,6 +106,10 @@ public class RedissonStreamTest extends BaseTest {
         stream.add(StreamAddArgs.entry("2", "2"));
 
         assertThat(stream.trim(StreamTrimArgs.maxLen(2).noLimit())).isEqualTo(1);
+
+        RStream<String, String> stream2 = redisson.getStream("myStream");
+        StreamTrimArgs trimArgs = StreamTrimArgs.maxLen(0).noLimit();
+        assertThat(stream2.trim(trimArgs)).isZero();
     }
 
     @Test