Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9552 from Vedran Pavić

Browse Source 
* gh-9552:
  Improve Spring Session MongoDB support naming
This commit is contained in:
Andy Wilkinson
2017-09-25 11:03:21 +01:00
parent e87b14e863 0c036a69f2
commit a1e26eaeea
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionProperties.java
View File

@@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Andy Wilkinson
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.session.mongo")
@ConfigurationProperties(prefix = "spring.session.mongodb")
public class MongoSessionProperties {
/**

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java
View File

@@ -35,7 +35,7 @@ final class SessionStoreMappings {
static {
Map<StoreType, Class<?>> mappings = new HashMap<>();
mappings.put(StoreType.REDIS, RedisSessionConfiguration.class);
mappings.put(StoreType.MONGO, MongoSessionConfiguration.class);
mappings.put(StoreType.MONGODB, MongoSessionConfiguration.class);
mappings.put(StoreType.JDBC, JdbcSessionConfiguration.class);
mappings.put(StoreType.HAZELCAST, HazelcastSessionConfiguration.class);
mappings.put(StoreType.NONE, NoOpSessionConfiguration.class);

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/StoreType.java
View File

@@ -32,9 +32,9 @@ public enum StoreType {
REDIS,
/**
* Mongo backed sessions.
* MongoDB backed sessions.
*/
MONGO,
MONGODB,
/**
* JDBC backed sessions.

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

@@ -47,7 +47,7 @@ public class SessionAutoConfigurationMongoTests
@Test
public void defaultConfig() {
this.contextRunner.withPropertyValues("spring.session.store-type=mongo")
this.contextRunner.withPropertyValues("spring.session.store-type=mongodb")
.withConfiguration(AutoConfigurations.of(
EmbeddedMongoAutoConfiguration.class,
MongoAutoConfiguration.class, MongoDataAutoConfiguration.class))
@@ -73,8 +73,8 @@ public class SessionAutoConfigurationMongoTests
.withConfiguration(AutoConfigurations.of(
EmbeddedMongoAutoConfiguration.class,
MongoAutoConfiguration.class, MongoDataAutoConfiguration.class))
.withPropertyValues("spring.session.store-type=mongo",
"spring.session.mongo.collection-name=foo")
.withPropertyValues("spring.session.store-type=mongodb",
"spring.session.mongodb.collection-name=foo")
.run(validateSpringSessionUsesMongo("foo"));
}