Validate Spring Session database initializer configuration

This commit adds Spring Session JDBC configuration validation that disables database initializer in case custom table name is configured with default schema.

Author: vpavic

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

@@ -16,12 +16,14 @@
 
 package org.springframework.boot.autoconfigure.session;
 
+import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.session.SessionProperties.Jdbc;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
@@ -56,13 +58,28 @@ public JdbcSessionDatabaseInitializer jdbcSessionDatabaseInitializer(
 	public static class SpringBootJdbcHttpSessionConfiguration
 			extends JdbcHttpSessionConfiguration {
 
+		private SessionProperties sessionProperties;
+
 		@Autowired
 		public void customize(SessionProperties sessionProperties) {
-			Integer timeout = sessionProperties.getTimeout();
+			this.sessionProperties = sessionProperties;
+			Integer timeout = this.sessionProperties.getTimeout();
 			if (timeout != null) {
 				setMaxInactiveIntervalInSeconds(timeout);
 			}
-			setTableName(sessionProperties.getJdbc().getTableName());
+			setTableName(this.sessionProperties.getJdbc().getTableName());
+		}
+
+		@PostConstruct
+		public void checkInitializerConfig() {
+			Jdbc jdbcProperties = this.sessionProperties.getJdbc();
+			if (jdbcProperties.getInitializer().isEnabled()) {
+				if (Jdbc.DEFAULT_SCHEMA_LOCATION.equals(jdbcProperties.getSchema()) &&
+						!Jdbc.DEFAULT_TABLE_NAME.equals(jdbcProperties.getTableName())) {
+					throw new IllegalStateException("Database initializer cannot be " +
+							"configured using custom table name and default schema");
+				}
+			}
 		}
 
 	}

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

@@ -104,9 +104,11 @@ public void setMapName(String mapName) {
 
 	public static class Jdbc {
 
-		private static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/"
+		static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/"
 				+ "session/jdbc/schema-@@platform@@.sql";
 
+		static final String DEFAULT_TABLE_NAME = "SPRING_SESSION";
+
 		/**
 		 * Path to the SQL file to use to initialize the database schema.
 		 */
@@ -115,7 +117,7 @@ public static class Jdbc {
 		/**
 		 * Name of database table used to store sessions.
 		 */
-		private String tableName = "SPRING_SESSION";
+		private String tableName = DEFAULT_TABLE_NAME;
 
 		private final Initializer initializer = new Initializer();
 

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

@@ -23,13 +23,15 @@
 import org.junit.rules.ExpectedException;
 
 import org.springframework.beans.DirectFieldAccessor;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.containsString;
 
 /**
  * JDBC specific tests for {@link SessionAutoConfiguration}.
@@ -86,4 +88,15 @@ public void customTableName() {
 				.queryForList("select * from FOO_BAR")).isEmpty();
 	}
 
+	@Test
+	public void customTableNameWithDefaultSchemaFails() {
+		this.thrown.expect(BeanCreationException.class);
+		this.thrown.expectMessage(containsString(
+				"Database initializer cannot be configured"));
+		load(Arrays.asList(EmbeddedDataSourceConfiguration.class,
+				DataSourceTransactionManagerAutoConfiguration.class),
+				"spring.session.store-type=jdbc",
+				"spring.session.jdbc.table-name=FOO_BAR");
+	}
+
 }