Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove limit(long) from Cursor and hint users to stream().limit(...)

Browse Source 
Original Pull Request: #2014
This commit is contained in:
Christoph Strobl
2021-03-24 14:35:59 +01:00
parent b0dd3cda6c
commit 3a1fbe1cf7
5 changed files with 17 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/test/java/org/springframework/data/redis/core/ScanCursorUnitTests.java
View File

@@ -24,9 +24,10 @@ import java.util.LinkedList;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Queue;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.springframework.dao.InvalidDataAccessApiUsageException;
/**
@@ -200,25 +201,21 @@ class ScanCursorUnitTests {
}
@Test // GH-1575
void limitShouldApplyLimitation() {
void streamLimitShouldApplyLimitation() {
LinkedList<ScanIteration<String>> values = new LinkedList<>();
values.add(createIteration(1, "spring"));
values.add(createIteration(2, "data"));
values.add(createIteration(3, "redis"));
values.add(createIteration(0));
Cursor<String> cursor = initCursor(values).limit(2);
List<String> result = new ArrayList<>();
while (cursor.hasNext()) {
result.add(cursor.next());
}
Cursor<String> cursor = initCursor(values);
assertThat(result).hasSize(2).contains("spring", "data");
assertThat(cursor.stream().limit(2).collect(Collectors.toList())).hasSize(2).contains("spring", "data");
}
@Test // GH-1575
void limitShouldNotLimitOriginalCursor() {
void streamingCursorShouldForwardClose() {
LinkedList<ScanIteration<String>> values = new LinkedList<>();
values.add(createIteration(1, "spring"));
@@ -226,34 +223,14 @@ class ScanCursorUnitTests {
values.add(createIteration(3, "redis"));
values.add(createIteration(0));
Cursor<String> cursor = initCursor(values);
cursor.limit(1);
List<String> result = new ArrayList<>();
while (cursor.hasNext()) {
result.add(cursor.next());
}
assertThat(result).hasSize(3);
}
@Test // GH-1575
void decoratedCursorShouldForwardClose() {
LinkedList<ScanIteration<String>> values = new LinkedList<>();
values.add(createIteration(1, "spring"));
values.add(createIteration(2, "data"));
values.add(createIteration(3, "redis"));
values.add(createIteration(0));
Cursor<String> cursor = initCursor(values);
Cursor<String> limited = cursor.limit(1);
assertThat(cursor.isClosed()).isFalse();
assertThat(limited.isClosed()).isFalse();
limited.close();
Stream<String> stream = cursor.stream();
stream.collect(Collectors.toList());
stream.close();
assertThat(cursor.isClosed()).isTrue();
assertThat(limited.isClosed()).isTrue();
}
private CapturingCursorDummy initCursor(Queue<ScanIteration<String>> values) {