From 947de99131dffc2cef074a855b0750ea0f6bbb78 Mon Sep 17 00:00:00 2001 From: minjund Date: Mon, 29 Sep 2025 23:57:57 +0900 Subject: [PATCH] fix: Rename Spring Session properties that depend on Spring Data change file to MongoSessionProperties -> SessionDataMongoProperties and RedisSessionProperties -> SessionDataRedisProperties.java Signed-off-by: minjund --- .../MongoSessionAutoConfiguration.java | 10 ++--- ...s.java => SessionDataMongoProperties.java} | 2 +- .../RedisSessionAutoConfiguration.java | 42 +++++++++---------- ...s.java => SessionDataRedisProperties.java} | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) rename module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/{MongoSessionProperties.java => SessionDataMongoProperties.java} (96%) rename module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/{RedisSessionProperties.java => SessionDataRedisProperties.java} (98%) diff --git a/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfiguration.java b/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfiguration.java index 09c3adaf93ba..f9b2b50a4838 100644 --- a/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfiguration.java +++ b/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfiguration.java @@ -61,7 +61,7 @@ after = { MongoDataAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class }, afterName = "org.springframework.boot.webflux.autoconfigure.WebSessionIdResolverAutoConfiguration") @ConditionalOnClass(Session.class) -@EnableConfigurationProperties(MongoSessionProperties.class) +@EnableConfigurationProperties(SessionDataMongoProperties.class) public final class MongoSessionAutoConfiguration { @Configuration(proxyBeanMethods = false) @@ -75,14 +75,14 @@ class ServletMongoSessionConfiguration { @Bean @Order(Ordered.HIGHEST_PRECEDENCE) SessionRepositoryCustomizer springBootSessionRepositoryCustomizer( - SessionProperties sessionProperties, MongoSessionProperties mongoSessionProperties, + SessionProperties sessionProperties, SessionDataMongoProperties sessionDataMongoProperties, ServerProperties serverProperties) { return (sessionRepository) -> { PropertyMapper map = PropertyMapper.get(); map.from(sessionProperties .determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout())) .to(sessionRepository::setDefaultMaxInactiveInterval); - map.from(mongoSessionProperties::getCollectionName).to(sessionRepository::setCollectionName); + map.from(sessionDataMongoProperties::getCollectionName).to(sessionRepository::setCollectionName); }; } @@ -97,14 +97,14 @@ class ReactiveMongoSessionConfiguration { @Bean ReactiveSessionRepositoryCustomizer springBootSessionRepositoryCustomizer( - SessionProperties sessionProperties, MongoSessionProperties mongoSessionProperties, + SessionProperties sessionProperties, SessionDataMongoProperties sessionDataMongoProperties, ServerProperties serverProperties) { return (sessionRepository) -> { PropertyMapper map = PropertyMapper.get(); map.from(sessionProperties .determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout())) .to(sessionRepository::setDefaultMaxInactiveInterval); - map.from(mongoSessionProperties::getCollectionName).to(sessionRepository::setCollectionName); + map.from(sessionDataMongoProperties::getCollectionName).to(sessionRepository::setCollectionName); }; } diff --git a/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionProperties.java b/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoProperties.java similarity index 96% rename from module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionProperties.java rename to module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoProperties.java index 2f3a69cb5eb3..95ab7c0448ab 100644 --- a/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionProperties.java +++ b/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoProperties.java @@ -25,7 +25,7 @@ * @since 4.0.0 */ @ConfigurationProperties("spring.session.mongodb") -public class MongoSessionProperties { +public class SessionDataMongoProperties { /** * Collection name used to store sessions. diff --git a/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfiguration.java b/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfiguration.java index f0c22824b368..ad1ced423cdf 100644 --- a/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfiguration.java +++ b/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfiguration.java @@ -74,7 +74,7 @@ after = { RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class }, afterName = "org.springframework.boot.webflux.autoconfigure.WebSessionIdResolverAutoConfiguration") @ConditionalOnClass(Session.class) -@EnableConfigurationProperties({ RedisSessionProperties.class, ServerProperties.class, SessionProperties.class }) +@EnableConfigurationProperties({ SessionDataRedisProperties.class, ServerProperties.class, SessionProperties.class }) public final class RedisSessionAutoConfiguration { @Configuration(proxyBeanMethods = false) @@ -93,9 +93,9 @@ static class DefaultRedisSessionConfiguration { @Bean @Order(Ordered.HIGHEST_PRECEDENCE) SessionRepositoryCustomizer springBootSessionRepositoryCustomizer( - SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties, + SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties, ServerProperties serverProperties) { - String cleanupCron = redisSessionProperties.getCleanupCron(); + String cleanupCron = sessionDataRedisProperties.getCleanupCron(); if (cleanupCron != null) { throw new InvalidConfigurationPropertyValueException("spring.session.redis.cleanup-cron", cleanupCron, "Cron-based cleanup is only supported when " @@ -106,9 +106,9 @@ SessionRepositoryCustomizer springBootSessionRepositoryC map.from(sessionProperties .determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout())) .to(sessionRepository::setDefaultMaxInactiveInterval); - map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace); - map.from(redisSessionProperties::getFlushMode).to(sessionRepository::setFlushMode); - map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode); + map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace); + map.from(sessionDataRedisProperties::getFlushMode).to(sessionRepository::setFlushMode); + map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode); }; } @@ -121,8 +121,8 @@ static class IndexedRedisSessionConfiguration { @Bean @ConditionalOnMissingBean - ConfigureRedisAction configureRedisAction(RedisSessionProperties redisSessionProperties) { - return switch (redisSessionProperties.getConfigureAction()) { + ConfigureRedisAction configureRedisAction(SessionDataRedisProperties sessionDataRedisProperties) { + return switch (sessionDataRedisProperties.getConfigureAction()) { case NOTIFY_KEYSPACE_EVENTS -> new ConfigureNotifyKeyspaceEventsAction(); case NONE -> ConfigureRedisAction.NO_OP; }; @@ -131,17 +131,17 @@ ConfigureRedisAction configureRedisAction(RedisSessionProperties redisSessionPro @Bean @Order(Ordered.HIGHEST_PRECEDENCE) SessionRepositoryCustomizer springBootSessionRepositoryCustomizer( - SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties, + SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties, ServerProperties serverProperties) { return (sessionRepository) -> { PropertyMapper map = PropertyMapper.get(); map.from(sessionProperties .determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout())) .to(sessionRepository::setDefaultMaxInactiveInterval); - map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace); - map.from(redisSessionProperties::getFlushMode).to(sessionRepository::setFlushMode); - map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode); - map.from(redisSessionProperties::getCleanupCron).to(sessionRepository::setCleanupCron); + map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace); + map.from(sessionDataRedisProperties::getFlushMode).to(sessionRepository::setFlushMode); + map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode); + map.from(sessionDataRedisProperties::getCleanupCron).to(sessionRepository::setCleanupCron); }; } @@ -164,15 +164,15 @@ static class DefaultRedisSessionConfiguration { @Bean ReactiveSessionRepositoryCustomizer springBootSessionRepositoryCustomizer( - SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties, + SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties, ServerProperties serverProperties) { return (sessionRepository) -> { PropertyMapper map = PropertyMapper.get(); map.from(sessionProperties .determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout())) .to(sessionRepository::setDefaultMaxInactiveInterval); - map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace); - map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode); + map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace); + map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode); }; } @@ -185,8 +185,8 @@ static class IndexedRedisSessionConfiguration { @Bean @ConditionalOnMissingBean - ConfigureReactiveRedisAction configureReactiveRedisAction(RedisSessionProperties redisSessionProperties) { - return switch (redisSessionProperties.getConfigureAction()) { + ConfigureReactiveRedisAction configureReactiveRedisAction(SessionDataRedisProperties sessionDataRedisProperties) { + return switch (sessionDataRedisProperties.getConfigureAction()) { case NOTIFY_KEYSPACE_EVENTS -> new ConfigureNotifyKeyspaceEventsReactiveAction(); case NONE -> ConfigureReactiveRedisAction.NO_OP; }; @@ -194,15 +194,15 @@ ConfigureReactiveRedisAction configureReactiveRedisAction(RedisSessionProperties @Bean ReactiveSessionRepositoryCustomizer springBootSessionRepositoryCustomizer( - SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties, + SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties, ServerProperties serverProperties) { return (sessionRepository) -> { PropertyMapper map = PropertyMapper.get(); map.from(sessionProperties .determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout())) .to(sessionRepository::setDefaultMaxInactiveInterval); - map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace); - map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode); + map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace); + map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode); }; } diff --git a/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionProperties.java b/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisProperties.java similarity index 98% rename from module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionProperties.java rename to module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisProperties.java index ed7594ed28c4..de9bad08ae1e 100644 --- a/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionProperties.java +++ b/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisProperties.java @@ -29,7 +29,7 @@ * @since 4.0.0 */ @ConfigurationProperties("spring.session.redis") -public class RedisSessionProperties { +public class SessionDataRedisProperties { /** * Namespace for keys used to store sessions.