Terminate stream with error on null values returned by RedisElementReader for top-level elements.

We now emit InvalidDataAccessApiUsageException when a RedisElementReader returns null in the context of a top-level stream to indicate invalid API usage although RedisElementReader.read can generally return null values if these are being collected in a container or value wrapper or parent complex object.

Apply consistent wording to operations documentation.
This commit is contained in:
Mark Paluch
2023-08-14 11:26:59 +02:00
committed by John Blum
parent 66b00e286d
commit b5f124cfd8
22 changed files with 276 additions and 99 deletions

View File

@@ -20,9 +20,13 @@ import reactor.test.StepVerifier;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
import org.springframework.data.redis.connection.lettuce.extension.LettuceConnectionFactoryExtension;
import org.springframework.data.redis.serializer.RedisElementReader;
import org.springframework.data.redis.serializer.RedisElementWriter;
import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.StringRedisSerializer;
/**
* Integration tests for {@link ReactiveStringRedisTemplate}.
@@ -55,4 +59,30 @@ public class ReactiveStringRedisTemplateIntegrationTests {
template.opsForValue().set("key", "value").as(StepVerifier::create).expectNext(true).verifyComplete();
template.opsForValue().get("key").as(StepVerifier::create).expectNext("value").verifyComplete();
}
@Test // GH-2655
void keysFailsOnNullElements() {
template.opsForValue().set("a", "1").as(StepVerifier::create).expectNext(true).verifyComplete();
template.opsForValue().set("b", "1").as(StepVerifier::create).expectNext(true).verifyComplete();
RedisElementWriter<String> writer = RedisElementWriter.from(StringRedisSerializer.UTF_8);
RedisElementReader<String> reader = RedisElementReader.from(StringRedisSerializer.UTF_8);
RedisSerializationContext<String, String> nullReadingContext = RedisSerializationContext
.<String, String> newSerializationContext(StringRedisSerializer.UTF_8).key(buffer -> {
String read = reader.read(buffer);
if ("a".equals(read)) {
return null;
}
return read;
}, writer).build();
ReactiveRedisTemplate<String, String> customTemplate = new ReactiveRedisTemplate<>(template.getConnectionFactory(),
nullReadingContext);
customTemplate.keys("b").as(StepVerifier::create).expectNext("b").verifyComplete();
customTemplate.keys("a").as(StepVerifier::create).verifyError(InvalidDataAccessApiUsageException.class);
}
}