diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskProperties.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskProperties.java index 41616ec5..b5dbfb5c 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskProperties.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskProperties.java @@ -16,17 +16,23 @@ package org.springframework.cloud.task.configuration; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.springframework.boot.context.properties.ConfigurationProperties; /** * Properties available to configure the task. * * @author Glenn Renfro + * @author David Turanski */ @ConfigurationProperties(prefix = "spring.cloud.task") public class TaskProperties { - + private static final Log logger = LogFactory.getLog(TaskProperties.class); + public static final String DEFAULT_TABLE_PREFIX = "TASK_"; /** @@ -54,7 +60,7 @@ public class TaskProperties { * When set to true the context is closed at the end of the task. Else * the context remains open. */ - private Boolean closecontextEnable = true; + private Boolean closecontextEnabled = true; public String getExternalExecutionId() { return externalExecutionId; @@ -72,12 +78,34 @@ public class TaskProperties { this.executionid = executionid; } + /** + * + * @deprecated use getClosecontextEnabled() + * @since 1.2.0 + */ + @Deprecated public Boolean getClosecontextEnable() { - return closecontextEnable; + return closecontextEnabled; } + + /** + * + * @deprecated use setClosecontextEnabled() + * @since 1.2.0 + */ + @Deprecated public void setClosecontextEnable(Boolean closecontextEnable) { - this.closecontextEnable = closecontextEnable; + logger.warn("'closecontextEnable' is deprecated. Use 'closeContextEnabled.'"); + this.closecontextEnabled = closecontextEnable; + } + + public Boolean getClosecontextEnabled() { + return closecontextEnabled; + } + + public void setClosecontextEnabled(Boolean closecontextEnabled) { + this.closecontextEnabled = closecontextEnabled; } public String getTablePrefix() { diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java index 26551926..a127afed 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java @@ -176,7 +176,7 @@ public class TaskLifecycleListener implements ApplicationListener org.springframework.boot spring-boot-starter-parent - 1.3.3.RELEASE + 1.5.2.RELEASE @@ -145,7 +145,7 @@ Spring Cloud Task itself: org.springframework.cloud spring-cloud-task-core - 1.0.0.RELEASE + 1.2.0.BUILD-SNAPSHOT [[getting-started-writing-the-code]] @@ -305,7 +305,7 @@ to your tests will keep the context open. For example: ``` @RunWith(SpringRunner.class) @SpringBootTest -@TestPropertySource(properties = {"spring.cloud.task.closecontext_enable=false"}) +@TestPropertySource(properties = {"spring.cloud.task.closecontext_enabled=false"}) public class DemoApplicationTests { @Test