Skip to content

Commit e0aa90c

Browse files
committed
Fix incomplete polish of RedisSessionProperties
Fix polish commit from 919913a to correctly name the property getter/setters. See gh-17022
1 parent b59dc5b commit e0aa90c

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ class RedisSessionConfiguration {
5454
@Bean
5555
@ConditionalOnMissingBean
5656
public ConfigureRedisAction configureRedisAction(RedisSessionProperties redisSessionProperties) {
57-
switch (redisSessionProperties.getConfigurationStrategy()) {
57+
switch (redisSessionProperties.getConfigureAction()) {
5858
case NOTIFY_KEYSPACE_EVENTS:
5959
return new ConfigureNotifyKeyspaceEventsAction();
6060
case NONE:
6161
return ConfigureRedisAction.NO_OP;
6262
}
63-
throw new IllegalStateException("Unsupported redis configuration strategy '"
64-
+ redisSessionProperties.getConfigurationStrategy() + "'.");
63+
throw new IllegalStateException(
64+
"Unsupported redis configure action '" + redisSessionProperties.getConfigureAction() + "'.");
6565
}
6666

6767
@Configuration

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionProperties.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ public void setCleanupCron(String cleanupCron) {
7575
this.cleanupCron = cleanupCron;
7676
}
7777

78-
public ConfigureAction getConfigurationStrategy() {
78+
public ConfigureAction getConfigureAction() {
7979
return this.configureAction;
8080
}
8181

82-
public void setConfigurationStrategy(ConfigureAction configurationStrategy) {
83-
this.configureAction = configurationStrategy;
82+
public void setConfigureAction(ConfigureAction configureAction) {
83+
this.configureAction = configureAction;
8484
}
8585

8686
/**

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ void redisSessionStoreWithCustomizations() {
8989
}
9090

9191
@Test
92-
void redisSessionConfigureNoStrategy() {
92+
void redisSessionWithConfigureActionNone() {
9393
this.contextRunner.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
9494
.withPropertyValues("spring.session.store-type=redis", "spring.session.redis.configure-action=none",
9595
"spring.redis.port=" + redis.getFirstMappedPort())
9696
.run(validateStrategy(ConfigureRedisAction.NO_OP.getClass()));
9797
}
9898

9999
@Test
100-
void redisSessionConfigureDefaultStrategy() {
100+
void redisSessionWithDefaultConfigureActionNone() {
101101
this.contextRunner.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
102102
.withPropertyValues("spring.session.store-type=redis",
103103
"spring.redis.port=" + redis.getFirstMappedPort())
@@ -106,7 +106,7 @@ void redisSessionConfigureDefaultStrategy() {
106106
}
107107

108108
@Test
109-
void redisSessionConfigureCustomStrategy() {
109+
void redisSessionWithCustomConfigureRedisActionBean() {
110110
this.contextRunner.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
111111
.withUserConfiguration(MaxEntriesRedisAction.class)
112112
.withPropertyValues("spring.session.store-type=redis",

0 commit comments

Comments
 (0)