From 9b87d3f080bf638a85fc9281b1e1b5a097f30d81 Mon Sep 17 00:00:00 2001 From: kazhang Date: Fri, 28 Aug 2020 13:15:19 +0800 Subject: [PATCH] DATAREDIS-1210 - Fix loop in StreamReadOptions toString(). Original Pull Request: #557 --- .../data/redis/connection/stream/StreamReadOptions.java | 6 ++++-- .../connection/stream/StreamReadOptionsUnitTests.java | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/stream/StreamReadOptions.java b/src/main/java/org/springframework/data/redis/connection/stream/StreamReadOptions.java index 5a15c98e7..e57646bcd 100644 --- a/src/main/java/org/springframework/data/redis/connection/stream/StreamReadOptions.java +++ b/src/main/java/org/springframework/data/redis/connection/stream/StreamReadOptions.java @@ -26,6 +26,7 @@ import org.springframework.util.ObjectUtils; * * @author Mark Paluch * @author Christoph Strobl + * @author Kaizhou Zhang * @see 2.2 */ public class StreamReadOptions { @@ -124,8 +125,9 @@ public class StreamReadOptions { @Override public String toString() { - return "StreamReadOptions{" + "block=" + block + ", count=" + count + ", noack=" + noack + ", autoAcknowledge=" - + autoAcknowledge() + ", blocking=" + isBlocking() + '}'; + + return "StreamReadOptions{" + "block=" + block + ", count=" + count + ", noack=" + noack + ", blocking=" + + isBlocking() + '}'; } @Override diff --git a/src/test/java/org/springframework/data/redis/connection/stream/StreamReadOptionsUnitTests.java b/src/test/java/org/springframework/data/redis/connection/stream/StreamReadOptionsUnitTests.java index ca0cfc766..caa0f7e5f 100644 --- a/src/test/java/org/springframework/data/redis/connection/stream/StreamReadOptionsUnitTests.java +++ b/src/test/java/org/springframework/data/redis/connection/stream/StreamReadOptionsUnitTests.java @@ -25,6 +25,7 @@ import org.junit.Test; * Unit tests for {@link StreamReadOptions}. * * @author Mark Paluch + * @author Kaizhou Zhang */ public class StreamReadOptionsUnitTests { @@ -35,4 +36,11 @@ public class StreamReadOptionsUnitTests { assertThat(StreamReadOptions.empty().block(Duration.ofSeconds(1)).isBlocking()).isTrue(); assertThat(StreamReadOptions.empty().block(Duration.ZERO).isBlocking()).isTrue(); } + + @Test // DATAREDIS-1210 + public void testToString() { + + assertThat(StreamReadOptions.empty().toString()) + .isEqualTo("StreamReadOptions{block=null, count=null, noack=false, blocking=false}"); + } }