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

Fix incomplete polish of RedisSessionProperties 

Fix polish commit from 919913ae66 to correctly name the property
getter/setters.

See gh-17022
This commit is contained in:
Phillip Webb 2019-06-12 17:41:30 -07:00
parent b59dc5bce4
commit e0aa90cf32
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,14 +54,14 @@ class RedisSessionConfiguration {
@Bean
@ConditionalOnMissingBean
public ConfigureRedisAction configureRedisAction(RedisSessionProperties redisSessionProperties) {
switch (redisSessionProperties.getConfigurationStrategy()) {
switch (redisSessionProperties.getConfigureAction()) {
case NOTIFY_KEYSPACE_EVENTS:
return new ConfigureNotifyKeyspaceEventsAction();
case NONE:
return ConfigureRedisAction.NO_OP;
}
throw new IllegalStateException("Unsupported redis configuration strategy '"
+ redisSessionProperties.getConfigurationStrategy() + "'.");
throw new IllegalStateException(
"Unsupported redis configure action '" + redisSessionProperties.getConfigureAction() + "'.");
}
@Configuration

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

@ -75,12 +75,12 @@ public class RedisSessionProperties {
this.cleanupCron = cleanupCron;
}
public ConfigureAction getConfigurationStrategy() {
public ConfigureAction getConfigureAction() {
return this.configureAction;
}
public void setConfigurationStrategy(ConfigureAction configurationStrategy) {
this.configureAction = configurationStrategy;
public void setConfigureAction(ConfigureAction configureAction) {
this.configureAction = configureAction;
}
/**

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

@ -89,7 +89,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
}
@Test
void redisSessionConfigureNoStrategy() {
void redisSessionWithConfigureActionNone() {
this.contextRunner.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
.withPropertyValues("spring.session.store-type=redis", "spring.session.redis.configure-action=none",
"spring.redis.port=" + redis.getFirstMappedPort())
@ -97,7 +97,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
}
@Test
void redisSessionConfigureDefaultStrategy() {
void redisSessionWithDefaultConfigureActionNone() {
this.contextRunner.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
.withPropertyValues("spring.session.store-type=redis",
"spring.redis.port=" + redis.getFirstMappedPort())
@ -106,7 +106,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
}
@Test
void redisSessionConfigureCustomStrategy() {
void redisSessionWithCustomConfigureRedisActionBean() {
this.contextRunner.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
.withUserConfiguration(MaxEntriesRedisAction.class)
.withPropertyValues("spring.session.store-type=redis",