Validate Spring Batch database initializer configuration

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

Author: vpavic

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.autoconfigure.batch;
 
+import javax.annotation.PostConstruct;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
@@ -56,6 +57,7 @@
  *
  * @author Dave Syer
  * @author Eddú Meléndez
+ * @author Vedran Pavic
  */
 @Configuration
 @ConditionalOnClass({ JobLauncher.class, DataSource.class, JdbcOperations.class })
@@ -74,6 +76,18 @@ public BatchAutoConfiguration(BatchProperties properties,
 		this.jobParametersConverter = jobParametersConverterProvider.getIfAvailable();
 	}
 
+	@PostConstruct
+	public void checkInitializerConfig() {
+		if (this.properties.getInitializer().isEnabled()) {
+			if (BatchProperties.DEFAULT_SCHEMA_LOCATION.equals(
+					this.properties.getSchema()) &&
+					StringUtils.hasText(this.properties.getTablePrefix())) {
+				throw new IllegalStateException("Database initializer cannot be " +
+						"configured using custom table prefix and default schema");
+			}
+		}
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnBean(DataSource.class)

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 @ConfigurationProperties("spring.batch")
 public class BatchProperties {
 
-	private static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/"
+	static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/"
 			+ "batch/core/schema-@@platform@@.sql";
 
 	/**

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java

@@ -45,6 +45,7 @@
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
+import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
@@ -61,12 +62,14 @@
 import org.springframework.transaction.PlatformTransactionManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.containsString;
 
 /**
  * Tests for {@link BatchAutoConfiguration}.
  *
  * @author Dave Syer
  * @author Stephane Nicoll
+ * @author Vedran Pavic
  */
 public class BatchAutoConfigurationTests {
 
@@ -237,6 +240,22 @@ public void testRenamePrefix() throws Exception {
 				.isNull();
 	}
 
+	@Test
+	public void testCustomTablePrefixWithDefaultSchemaFails() throws Exception {
+		this.expected.expect(BeanCreationException.class);
+		this.expected.expectMessage(containsString(
+				"Database initializer cannot be configured"));
+		this.context = new AnnotationConfigApplicationContext();
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"spring.datasource.name:batchtest",
+				"spring.batch.tablePrefix:PREFIX_");
+		this.context.register(TestConfiguration.class,
+				EmbeddedDataSourceConfiguration.class,
+				HibernateJpaAutoConfiguration.class, BatchAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+	}
+
 	@Configuration
 	protected static class EmptyConfiguration {
 	}