Improve Spring Session MongoDB support naming

Author: vpavic

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionConfiguration.java renamed to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoDbSessionConfiguration.java

@@ -27,7 +27,7 @@
 import org.springframework.session.data.mongo.config.annotation.web.http.MongoHttpSessionConfiguration;
 
 /**
- * Mongo-backed session configuration.
+ * MongoDB-backed session configuration.
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
@@ -36,21 +36,21 @@
 @ConditionalOnMissingBean(SessionRepository.class)
 @ConditionalOnBean(MongoOperations.class)
 @Conditional(SessionCondition.class)
-@EnableConfigurationProperties(MongoSessionProperties.class)
-class MongoSessionConfiguration {
+@EnableConfigurationProperties(MongoDbSessionProperties.class)
+class MongoDbSessionConfiguration {
 
 	@Configuration
-	public static class SpringBootMongoHttpSessionConfiguration
+	public static class SpringBootMongoDbHttpSessionConfiguration
 			extends MongoHttpSessionConfiguration {
 
 		@Autowired
 		public void customize(SessionProperties sessionProperties,
-				MongoSessionProperties mongoSessionProperties) {
+				MongoDbSessionProperties mongoDbSessionProperties) {
 			Integer timeout = sessionProperties.getTimeout();
 			if (timeout != null) {
 				setMaxInactiveIntervalInSeconds(timeout);
 			}
-			setCollectionName(mongoSessionProperties.getCollectionName());
+			setCollectionName(mongoDbSessionProperties.getCollectionName());
 		}
 
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoSessionProperties.java renamed to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/MongoDbSessionProperties.java

@@ -19,13 +19,13 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * Configuration properties for Mongo-backed Spring Session.
+ * Configuration properties for MongoDB-backed Spring Session.
  *
  * @author Andy Wilkinson
  * @since 2.0.0
  */
-@ConfigurationProperties(prefix = "spring.session.mongo")
-public class MongoSessionProperties {
+@ConfigurationProperties(prefix = "spring.session.mongodb")
+public class MongoDbSessionProperties {
 
 	/**
 	 * Collection name used to store sessions.

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

@@ -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, MongoDbSessionConfiguration.class);
 		mappings.put(StoreType.JDBC, JdbcSessionConfiguration.class);
 		mappings.put(StoreType.HAZELCAST, HazelcastSessionConfiguration.class);
 		mappings.put(StoreType.NONE, NoOpSessionConfiguration.class);

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

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

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoTests.java renamed to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationMongoDbTests.java

@@ -35,19 +35,19 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Mongo-specific tests for {@link SessionAutoConfiguration}.
+ * MongoDB-specific tests for {@link SessionAutoConfiguration}.
  *
  * @author Andy Wilkinson
  */
-public class SessionAutoConfigurationMongoTests
+public class SessionAutoConfigurationMongoDbTests
 		extends AbstractSessionAutoConfigurationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(SessionAutoConfiguration.class));
 
 	@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))
@@ -68,13 +68,13 @@ public void defaultConfigWithUniqueStoreImplementation() {
 	}
 
 	@Test
-	public void mongoSessionStoreWithCustomizations() {
+	public void mongoDbSessionStoreWithCustomizations() {
 		this.contextRunner
 				.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"));
 	}
 

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -427,8 +427,8 @@ content into your application; rather pick only the properties that you need.
 	spring.session.jdbc.schema=classpath:org/springframework/session/jdbc/schema-@@platform@@.sql # Path to the SQL file to use to initialize the database schema.
 	spring.session.jdbc.table-name=SPRING_SESSION # Name of database table used to store sessions.
 
-	# SPRING SESSION MONGO ({sc-spring-boot-autoconfigure}/session/MonogoSessionProperties.{sc-ext}[MongoSessionProperties])
-	spring.session.mongo.collection-name=sessions # Collection name used to store sessions.
+	# SPRING SESSION MONGODB ({sc-spring-boot-autoconfigure}/session/MongoDbSessionProperties.{sc-ext}[MongoDbSessionProperties])
+	spring.session.mongodb.collection-name=sessions # Collection name used to store sessions.
 
 	# SPRING SESSION REDIS ({sc-spring-boot-autoconfigure}/session/RedisSessionProperties.{sc-ext}[RedisSessionProperties])
 	spring.session.redis.flush-mode=on-save # Sessions flush mode.