spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Decouple Session auto-configuration from ServerProperties

Browse Source 
Fixes gh-48493
This commit is contained in:
Andy Wilkinson
2025-12-11 15:34:22 +00:00
parent 2930849e77
commit 7b0abcbdb2
10 changed files with 198 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-session-data-redis/build.gradle
-1
View File
@@ -31,7 +31,6 @@ dependencies {
api("org.springframework.session:spring-session-data-redis")
implementation(project(":module:spring-boot-data-redis"))
implementation(project(":module:spring-boot-web-server"))
optional(project(":core:spring-boot-autoconfigure"))
optional(project(":module:spring-boot-webflux"))
module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfiguration.java
+10 -20
View File
@@ -31,7 +31,7 @@ import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfigurat
import org.springframework.boot.data.redis.autoconfigure.DataRedisReactiveAutoConfiguration;
import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
import org.springframework.boot.session.autoconfigure.SessionProperties;
import org.springframework.boot.web.server.autoconfigure.ServerProperties;
import org.springframework.boot.session.autoconfigure.SessionTimeout;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -74,7 +74,7 @@ import org.springframework.session.data.redis.config.annotation.web.server.Redis
after = { DataRedisAutoConfiguration.class, DataRedisReactiveAutoConfiguration.class },
afterName = "org.springframework.boot.webflux.autoconfigure.WebSessionIdResolverAutoConfiguration")
@ConditionalOnClass(Session.class)
@EnableConfigurationProperties({ SessionDataRedisProperties.class, ServerProperties.class, SessionProperties.class })
@EnableConfigurationProperties(SessionDataRedisProperties.class)
public final class SessionDataRedisAutoConfiguration {
@Configuration(proxyBeanMethods = false)
@@ -93,8 +93,7 @@ public final class SessionDataRedisAutoConfiguration {
@Bean
@Order(Ordered.HIGHEST_PRECEDENCE)
SessionRepositoryCustomizer<RedisSessionRepository> springBootSessionRepositoryCustomizer(
SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties,
ServerProperties serverProperties) {
SessionDataRedisProperties sessionDataRedisProperties, SessionTimeout sessionTimeout) {
String cleanupCron = sessionDataRedisProperties.getCleanupCron();
if (cleanupCron != null) {
throw new InvalidConfigurationPropertyValueException("spring.session.data.redis.cleanup-cron",
@@ -103,9 +102,7 @@ public final class SessionDataRedisAutoConfiguration {
}
return (sessionRepository) -> {
PropertyMapper map = PropertyMapper.get();
map.from(sessionProperties
.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
.to(sessionRepository::setDefaultMaxInactiveInterval);
map.from(sessionTimeout::getTimeout).to(sessionRepository::setDefaultMaxInactiveInterval);
map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
map.from(sessionDataRedisProperties::getFlushMode).to(sessionRepository::setFlushMode);
map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode);
@@ -132,12 +129,10 @@ public final class SessionDataRedisAutoConfiguration {
@Order(Ordered.HIGHEST_PRECEDENCE)
SessionRepositoryCustomizer<RedisIndexedSessionRepository> springBootSessionRepositoryCustomizer(
SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties,
ServerProperties serverProperties) {
SessionTimeout sessionTimeout) {
return (sessionRepository) -> {
PropertyMapper map = PropertyMapper.get();
map.from(sessionProperties
.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
.to(sessionRepository::setDefaultMaxInactiveInterval);
map.from(sessionTimeout::getTimeout).to(sessionRepository::setDefaultMaxInactiveInterval);
map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
map.from(sessionDataRedisProperties::getFlushMode).to(sessionRepository::setFlushMode);
map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode);
@@ -165,12 +160,10 @@ public final class SessionDataRedisAutoConfiguration {
@Bean
ReactiveSessionRepositoryCustomizer<ReactiveRedisSessionRepository> springBootSessionRepositoryCustomizer(
SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties,
ServerProperties serverProperties) {
SessionTimeout sessionTimeout) {
return (sessionRepository) -> {
PropertyMapper map = PropertyMapper.get();
map.from(sessionProperties
.determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout()))
.to(sessionRepository::setDefaultMaxInactiveInterval);
map.from(sessionTimeout::getTimeout).to(sessionRepository::setDefaultMaxInactiveInterval);
map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode);
};
@@ -195,13 +188,10 @@ public final class SessionDataRedisAutoConfiguration {
@Bean
ReactiveSessionRepositoryCustomizer<ReactiveRedisIndexedSessionRepository> springBootSessionRepositoryCustomizer(
SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties,
ServerProperties serverProperties) {
SessionDataRedisProperties sessionDataRedisProperties, SessionTimeout sessionTimeout) {
return (sessionRepository) -> {
PropertyMapper map = PropertyMapper.get();
map.from(sessionProperties
.determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout()))
.to(sessionRepository::setDefaultMaxInactiveInterval);
map.from(sessionTimeout::getTimeout).to(sessionRepository::setDefaultMaxInactiveInterval);
map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode);
};