Initialize values with properties vs value

resolves #SCT-587

spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/SimpleTaskAutoConfiguration.java

@@ -53,7 +53,7 @@ import org.springframework.util.CollectionUtils;
  */
 @Configuration
 @EnableTransactionManagement
-@EnableConfigurationProperties(TaskProperties.class)
+@EnableConfigurationProperties({ TaskProperties.class })
 // @checkstyle:off
 @ConditionalOnProperty(prefix = "spring.cloud.task.autoconfiguration", name = "enabled",
 		havingValue = "true", matchIfMissing = true)
@@ -106,7 +106,8 @@ public class SimpleTaskAutoConfiguration {
 
 	@Bean
 	public TaskRepositoryInitializer taskRepositoryInitializer() {
-		TaskRepositoryInitializer taskRepositoryInitializer = new TaskRepositoryInitializer();
+		TaskRepositoryInitializer taskRepositoryInitializer = new TaskRepositoryInitializer(
+				this.taskProperties);
 		DataSource initializerDataSource = getDefaultConfigurer().getTaskDataSource();
 		if (initializerDataSource != null) {
 			taskRepositoryInitializer.setDataSource(initializerDataSource);

spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskProperties.java

@@ -88,6 +88,14 @@ public class TaskProperties {
 	 */
 	private int singleInstanceLockCheckInterval = DEFAULT_CHECK_INTERVAL;
 
+	/**
+	 * If set to true then tables are initialized. If set to false tables are not
+	 * initialized. Defaults to null. The requirement for it to be defaulted to null is so
+	 * that we can support the <code>spring.cloud.task.initialize.enable</code> until it
+	 * is removed.
+	 */
+	private Boolean initializeEnabled;
+
 	public String getExternalExecutionId() {
 		return this.externalExecutionId;
 	}
@@ -152,4 +160,12 @@ public class TaskProperties {
 		this.singleInstanceLockCheckInterval = singleInstanceLockCheckInterval;
 	}
 
+	public Boolean isInitializeEnabled() {
+		return initializeEnabled;
+	}
+
+	public void setInitializeEnabled(Boolean initializeEnabled) {
+		this.initializeEnabled = initializeEnabled;
+	}
+
 }

spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskRepositoryInitializer.java

@@ -24,12 +24,12 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.task.configuration.TaskProperties;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils;
 import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
 import org.springframework.jdbc.support.JdbcUtils;
 import org.springframework.jdbc.support.MetaDataAccessException;
-import org.springframework.util.StringUtils;
 
 /**
  * Utility for initializing the Task Repository's datasource. If a single
@@ -38,8 +38,9 @@ import org.springframework.util.StringUtils;
  * is available in the current context, custom configuration of this is required (if
  * desired).
  *
- * By default, initialization of the database can be disabled by configuring the property
- * <code>spring.cloud.task.initialize.enable</code> to false.
+ * Initialization of the database can be disabled by configuring the property
+ * <code>spring.cloud.task.initialize-enabled</code> to false.
+ * <code>spring.cloud.task.initialize.enable</code> has been deprecated.
  *
  * @author Glenn Renfro
  * @author Michael Minella
@@ -62,12 +63,12 @@ public final class TaskRepositoryInitializer implements InitializingBean {
 	private ResourceLoader resourceLoader;
 
 	@Value("${spring.cloud.task.initialize.enable:true}")
-	private boolean taskInitializationEnable;
+	private boolean taskInitializationEnabled;
 
-	@Value("${spring.cloud.task.tablePrefix:#{null}}")
-	private String tablePrefix;
+	private TaskProperties taskProperties;
 
-	public TaskRepositoryInitializer() {
+	public TaskRepositoryInitializer(TaskProperties taskProperties) {
+		this.taskProperties = taskProperties;
 	}
 
 	public void setDataSource(DataSource dataSource) {
@@ -92,8 +93,11 @@ public final class TaskRepositoryInitializer implements InitializingBean {
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		if (this.dataSource != null && this.taskInitializationEnable
-				&& !StringUtils.hasText(this.tablePrefix)) {
+		boolean isInitializeEnabled = (this.taskProperties.isInitializeEnabled() != null)
+				? this.taskProperties.isInitializeEnabled()
+				: this.taskInitializationEnabled;
+		if (this.dataSource != null && isInitializeEnabled && this.taskProperties
+				.getTablePrefix().equals(TaskProperties.DEFAULT_TABLE_PREFIX)) {
 			String platform = getDatabaseType(this.dataSource);
 			if ("hsql".equals(platform)) {
 				platform = "hsqldb";

spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/TaskPropertiesTests.java

@@ -43,13 +43,15 @@ public class TaskPropertiesTests {
 	@Test
 	public void test() {
 		assertThat(this.taskProperties.getClosecontextEnabled()).isFalse();
+		assertThat(this.taskProperties.isInitializeEnabled()).isFalse();
 	}
 
 	@RunWith(SpringRunner.class)
 	@SpringBootTest(
 			classes = { TaskPropertiesTests.Config.class,
 					SimpleTaskAutoConfiguration.class, SingleTaskConfiguration.class },
-			properties = { "spring.cloud.task.closecontextEnabled=false" })
+			properties = { "spring.cloud.task.closecontextEnabled=false",
+					"spring.cloud.task.initialize-enabled=false" })
 	@DirtiesContext
 	public static class CloseContextEnabledTest extends TaskPropertiesTests {
 

spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/TestConfiguration.java

@@ -50,7 +50,8 @@ public class TestConfiguration implements InitializingBean {
 
 	@Bean
 	public TaskRepositoryInitializer taskRepositoryInitializer() throws Exception {
-		TaskRepositoryInitializer taskRepositoryInitializer = new TaskRepositoryInitializer();
+		TaskRepositoryInitializer taskRepositoryInitializer = new TaskRepositoryInitializer(
+				new TaskProperties());
 		taskRepositoryInitializer.setDataSource(this.dataSource);
 		taskRepositoryInitializer.setResourceLoader(this.resourceLoader);
 		taskRepositoryInitializer.afterPropertiesSet();
@@ -59,7 +60,7 @@ public class TestConfiguration implements InitializingBean {
 	}
 
 	@Bean
-	public TaskExplorer taskExplorer() throws Exception {
+	public TaskExplorer taskExplorer() {
 		return new SimpleTaskExplorer(this.taskExecutionDaoFactoryBean);
 	}
 
@@ -79,7 +80,7 @@ public class TestConfiguration implements InitializingBean {
 	}
 
 	@Override
-	public void afterPropertiesSet() throws Exception {
+	public void afterPropertiesSet() {
 		if (this.dataSource != null) {
 			this.taskExecutionDaoFactoryBean = new TaskExecutionDaoFactoryBean(
 					this.dataSource);