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

Switch from plain String to DataType for ScanOptions.

Browse Source 
Move the type method from KeyScanOptionsBuilder to the ScanOptionsBuilder to allow removal of the former.
Add a test for the reactive variant and allow SCAN tests with TYPE option to be executed starting with Redis 6.0.

Original Pull Request: #2109
This commit is contained in:
Christoph Strobl
2021-07-02 11:29:52 +02:00
parent 674401c986
commit 1b6737e9a5
4 changed files with 75 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
View File

@@ -2598,7 +2598,7 @@ public abstract class AbstractConnectionIntegrationTests {
@Test // GH-2089
@EnabledOnRedisDriver(RedisDriver.LETTUCE)
@EnabledOnRedisVersion("6.2")
@EnabledOnRedisVersion("6.0")
void scanWithType() {
assumeThat(connection.isPipelined() || connection.isQueueing())

26
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveKeyCommandsIntegrationTests.java
View File

@@ -35,8 +35,10 @@ import org.springframework.data.redis.connection.DataType;
import org.springframework.data.redis.connection.ReactiveRedisConnection.KeyCommand;
import org.springframework.data.redis.connection.ReactiveRedisConnection.NumericResponse;
import org.springframework.data.redis.connection.ValueEncoding.RedisValueEncoding;
import org.springframework.data.redis.core.KeyScanOptions;
import org.springframework.data.redis.core.ScanOptions;
import org.springframework.data.redis.test.condition.EnabledOnCommand;
import org.springframework.data.redis.test.condition.EnabledOnRedisVersion;
import org.springframework.data.redis.test.extension.parametrized.ParameterizedRedisTest;
/**
@@ -115,6 +117,30 @@ public class LettuceReactiveKeyCommandsIntegrationTests extends LettuceReactiveC
.verifyComplete();
}
@ParameterizedRedisTest // GH-2089
@EnabledOnRedisVersion("6.0")
void scanWithType() {
nativeCommands.set(KEY_1, VALUE_1);
nativeCommands.lpush(KEY_2, VALUE_2);
nativeCommands.sadd(KEY_3, VALUE_3);
connection.keyCommands().scan(KeyScanOptions.scanOptions(DataType.STRING).build()) //
.as(StepVerifier::create) //
.expectNext(KEY_1_BBUFFER) //
.verifyComplete();
connection.keyCommands().scan(KeyScanOptions.scanOptions(DataType.SET).build()) //
.as(StepVerifier::create) //
.expectNext(KEY_3_BBUFFER) //
.verifyComplete();
connection.keyCommands().scan(KeyScanOptions.scanOptions(DataType.NONE).build()) //
.as(StepVerifier::create) //
.expectNextCount(3) //
.verifyComplete();
}
@ParameterizedRedisTest // DATAREDIS-525
void randomKeyShouldReturnAnyKey() {