Skip to content

Commit bd1ee9d

Browse files
minjundminjund
committed
fix: Rename Spring Session properties that depend on Spring Data
change file to MongoSessionProperties -> SessionDataMongoProperties and RedisSessionProperties -> SessionDataRedisProperties.java
1 parent cbdd7cf commit bd1ee9d

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfiguration.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
after = { MongoDataAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class },
6262
afterName = "org.springframework.boot.webflux.autoconfigure.WebSessionIdResolverAutoConfiguration")
6363
@ConditionalOnClass(Session.class)
64-
@EnableConfigurationProperties(MongoSessionProperties.class)
64+
@EnableConfigurationProperties(SessionDataMongoProperties.class)
6565
public final class MongoSessionAutoConfiguration {
6666

6767
@Configuration(proxyBeanMethods = false)
@@ -75,14 +75,14 @@ class ServletMongoSessionConfiguration {
7575
@Bean
7676
@Order(Ordered.HIGHEST_PRECEDENCE)
7777
SessionRepositoryCustomizer<MongoIndexedSessionRepository> springBootSessionRepositoryCustomizer(
78-
SessionProperties sessionProperties, MongoSessionProperties mongoSessionProperties,
78+
SessionProperties sessionProperties, SessionDataMongoProperties sessionDataMongoProperties,
7979
ServerProperties serverProperties) {
8080
return (sessionRepository) -> {
8181
PropertyMapper map = PropertyMapper.get();
8282
map.from(sessionProperties
8383
.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
8484
.to(sessionRepository::setDefaultMaxInactiveInterval);
85-
map.from(mongoSessionProperties::getCollectionName).to(sessionRepository::setCollectionName);
85+
map.from(sessionDataMongoProperties::getCollectionName).to(sessionRepository::setCollectionName);
8686
};
8787
}
8888

@@ -97,14 +97,14 @@ class ReactiveMongoSessionConfiguration {
9797

9898
@Bean
9999
ReactiveSessionRepositoryCustomizer<ReactiveMongoSessionRepository> springBootSessionRepositoryCustomizer(
100-
SessionProperties sessionProperties, MongoSessionProperties mongoSessionProperties,
100+
SessionProperties sessionProperties, SessionDataMongoProperties sessionDataMongoProperties,
101101
ServerProperties serverProperties) {
102102
return (sessionRepository) -> {
103103
PropertyMapper map = PropertyMapper.get();
104104
map.from(sessionProperties
105105
.determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout()))
106106
.to(sessionRepository::setDefaultMaxInactiveInterval);
107-
map.from(mongoSessionProperties::getCollectionName).to(sessionRepository::setCollectionName);
107+
map.from(sessionDataMongoProperties::getCollectionName).to(sessionRepository::setCollectionName);
108108
};
109109
}
110110

‎module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionProperties.java‎ renamed to ‎module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoProperties.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @since 4.0.0
2626
*/
2727
@ConfigurationProperties("spring.session.mongodb")
28-
public class MongoSessionProperties {
28+
public class SessionDataMongoProperties {
2929

3030
/**
3131
* Collection name used to store sessions.

‎module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfiguration.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
after = { RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class },
7575
afterName = "org.springframework.boot.webflux.autoconfigure.WebSessionIdResolverAutoConfiguration")
7676
@ConditionalOnClass(Session.class)
77-
@EnableConfigurationProperties({ RedisSessionProperties.class, ServerProperties.class, SessionProperties.class })
77+
@EnableConfigurationProperties({ SessionDataRedisProperties.class, ServerProperties.class, SessionProperties.class })
7878
public final class RedisSessionAutoConfiguration {
7979

8080
@Configuration(proxyBeanMethods = false)
@@ -93,9 +93,9 @@ static class DefaultRedisSessionConfiguration {
9393
@Bean
9494
@Order(Ordered.HIGHEST_PRECEDENCE)
9595
SessionRepositoryCustomizer<RedisSessionRepository> springBootSessionRepositoryCustomizer(
96-
SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties,
96+
SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties,
9797
ServerProperties serverProperties) {
98-
String cleanupCron = redisSessionProperties.getCleanupCron();
98+
String cleanupCron = sessionDataRedisProperties.getCleanupCron();
9999
if (cleanupCron != null) {
100100
throw new InvalidConfigurationPropertyValueException("spring.session.redis.cleanup-cron",
101101
cleanupCron, "Cron-based cleanup is only supported when "
@@ -106,9 +106,9 @@ SessionRepositoryCustomizer<RedisSessionRepository> springBootSessionRepositoryC
106106
map.from(sessionProperties
107107
.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
108108
.to(sessionRepository::setDefaultMaxInactiveInterval);
109-
map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
110-
map.from(redisSessionProperties::getFlushMode).to(sessionRepository::setFlushMode);
111-
map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode);
109+
map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
110+
map.from(sessionDataRedisProperties::getFlushMode).to(sessionRepository::setFlushMode);
111+
map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode);
112112
};
113113
}
114114

@@ -121,8 +121,8 @@ static class IndexedRedisSessionConfiguration {
121121

122122
@Bean
123123
@ConditionalOnMissingBean
124-
ConfigureRedisAction configureRedisAction(RedisSessionProperties redisSessionProperties) {
125-
return switch (redisSessionProperties.getConfigureAction()) {
124+
ConfigureRedisAction configureRedisAction(SessionDataRedisProperties sessionDataRedisProperties) {
125+
return switch (sessionDataRedisProperties.getConfigureAction()) {
126126
case NOTIFY_KEYSPACE_EVENTS -> new ConfigureNotifyKeyspaceEventsAction();
127127
case NONE -> ConfigureRedisAction.NO_OP;
128128
};
@@ -131,17 +131,17 @@ ConfigureRedisAction configureRedisAction(RedisSessionProperties redisSessionPro
131131
@Bean
132132
@Order(Ordered.HIGHEST_PRECEDENCE)
133133
SessionRepositoryCustomizer<RedisIndexedSessionRepository> springBootSessionRepositoryCustomizer(
134-
SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties,
134+
SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties,
135135
ServerProperties serverProperties) {
136136
return (sessionRepository) -> {
137137
PropertyMapper map = PropertyMapper.get();
138138
map.from(sessionProperties
139139
.determineTimeout(() -> serverProperties.getServlet().getSession().getTimeout()))
140140
.to(sessionRepository::setDefaultMaxInactiveInterval);
141-
map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
142-
map.from(redisSessionProperties::getFlushMode).to(sessionRepository::setFlushMode);
143-
map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode);
144-
map.from(redisSessionProperties::getCleanupCron).to(sessionRepository::setCleanupCron);
141+
map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
142+
map.from(sessionDataRedisProperties::getFlushMode).to(sessionRepository::setFlushMode);
143+
map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode);
144+
map.from(sessionDataRedisProperties::getCleanupCron).to(sessionRepository::setCleanupCron);
145145
};
146146
}
147147

@@ -164,15 +164,15 @@ static class DefaultRedisSessionConfiguration {
164164

165165
@Bean
166166
ReactiveSessionRepositoryCustomizer<ReactiveRedisSessionRepository> springBootSessionRepositoryCustomizer(
167-
SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties,
167+
SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties,
168168
ServerProperties serverProperties) {
169169
return (sessionRepository) -> {
170170
PropertyMapper map = PropertyMapper.get();
171171
map.from(sessionProperties
172172
.determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout()))
173173
.to(sessionRepository::setDefaultMaxInactiveInterval);
174-
map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
175-
map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode);
174+
map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
175+
map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode);
176176
};
177177
}
178178

@@ -185,24 +185,24 @@ static class IndexedRedisSessionConfiguration {
185185

186186
@Bean
187187
@ConditionalOnMissingBean
188-
ConfigureReactiveRedisAction configureReactiveRedisAction(RedisSessionProperties redisSessionProperties) {
189-
return switch (redisSessionProperties.getConfigureAction()) {
188+
ConfigureReactiveRedisAction configureReactiveRedisAction(SessionDataRedisProperties sessionDataRedisProperties) {
189+
return switch (sessionDataRedisProperties.getConfigureAction()) {
190190
case NOTIFY_KEYSPACE_EVENTS -> new ConfigureNotifyKeyspaceEventsReactiveAction();
191191
case NONE -> ConfigureReactiveRedisAction.NO_OP;
192192
};
193193
}
194194

195195
@Bean
196196
ReactiveSessionRepositoryCustomizer<ReactiveRedisIndexedSessionRepository> springBootSessionRepositoryCustomizer(
197-
SessionProperties sessionProperties, RedisSessionProperties redisSessionProperties,
197+
SessionProperties sessionProperties, SessionDataRedisProperties sessionDataRedisProperties,
198198
ServerProperties serverProperties) {
199199
return (sessionRepository) -> {
200200
PropertyMapper map = PropertyMapper.get();
201201
map.from(sessionProperties
202202
.determineTimeout(() -> serverProperties.getReactive().getSession().getTimeout()))
203203
.to(sessionRepository::setDefaultMaxInactiveInterval);
204-
map.from(redisSessionProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
205-
map.from(redisSessionProperties::getSaveMode).to(sessionRepository::setSaveMode);
204+
map.from(sessionDataRedisProperties::getNamespace).to(sessionRepository::setRedisKeyNamespace);
205+
map.from(sessionDataRedisProperties::getSaveMode).to(sessionRepository::setSaveMode);
206206
};
207207
}
208208

‎module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionProperties.java‎ renamed to ‎module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisProperties.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @since 4.0.0
3030
*/
3131
@ConfigurationProperties("spring.session.redis")
32-
public class RedisSessionProperties {
32+
public class SessionDataRedisProperties {
3333

3434
/**
3535
* Namespace for keys used to store sessions.

0 commit comments

Comments
 (0)