root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x 

Closes gh-37805
This commit is contained in:
Andy Wilkinson 2023-10-10 11:27:37 +01:00
parent 86216fb4e9 5fcdee6bb5
commit 1087827b9a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfiguration.java
View File

@ -28,8 +28,8 @@ import org.springframework.core.io.ResourceLoader;
import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory; import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
import org.springframework.data.redis.core.ReactiveRedisTemplate; import org.springframework.data.redis.core.ReactiveRedisTemplate;
import org.springframework.data.redis.core.ReactiveStringRedisTemplate; import org.springframework.data.redis.core.ReactiveStringRedisTemplate;
import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.RedisSerializer;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Data's reactive Redis * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's reactive Redis
@ -48,14 +48,13 @@ public class RedisReactiveAutoConfiguration {
@ConditionalOnBean(ReactiveRedisConnectionFactory.class) @ConditionalOnBean(ReactiveRedisConnectionFactory.class)
public ReactiveRedisTemplate<Object, Object> reactiveRedisTemplate( public ReactiveRedisTemplate<Object, Object> reactiveRedisTemplate(
ReactiveRedisConnectionFactory reactiveRedisConnectionFactory, ResourceLoader resourceLoader) { ReactiveRedisConnectionFactory reactiveRedisConnectionFactory, ResourceLoader resourceLoader) {
JdkSerializationRedisSerializer jdkSerializer = new JdkSerializationRedisSerializer( RedisSerializer<Object> javaSerializer = RedisSerializer.java(resourceLoader.getClassLoader());
resourceLoader.getClassLoader());
RedisSerializationContext<Object, Object> serializationContext = RedisSerializationContext RedisSerializationContext<Object, Object> serializationContext = RedisSerializationContext
.newSerializationContext() .newSerializationContext()
.key(jdkSerializer) .key(javaSerializer)
.value(jdkSerializer) .value(javaSerializer)
.hashKey(jdkSerializer) .hashKey(javaSerializer)
.hashValue(jdkSerializer) .hashValue(javaSerializer)
.build(); .build();
return new ReactiveRedisTemplate<>(reactiveRedisConnectionFactory, serializationContext); return new ReactiveRedisTemplate<>(reactiveRedisConnectionFactory, serializationContext);
} }