From 76309b89ffc8ad7bb7f0035c235a23c73a8672ad Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Fri, 5 Jan 2018 14:44:53 -0500 Subject: [PATCH] Removed code that was marked as deprecated. Also updated test that tested deprecated code. resolves #366 --- .../listener/support/JdbcTaskBatchDao.java | 13 +---------- .../partition/DeployerPartitionHandler.java | 6 +++-- .../SimpleCommandLineArgsProvider.java | 5 ++--- .../SimpleCommandLineArgsProviderTests.java | 14 +++--------- .../task/configuration/TaskProperties.java | 22 ------------------- .../repository/dao/JdbcTaskExecutionDao.java | 12 ---------- .../support/TaskExecutionDaoFactoryBean.java | 12 ---------- .../configuration/TaskPropertiesTests.java | 7 ------ .../listener/TaskLifecycleListenerTests.java | 2 +- .../cloud/task/listener/TaskEventTests.java | 2 +- .../listener/JobExecutionEventTests.java | 4 ++-- .../cloud/task/listener/TaskEventTests.java | 2 +- 12 files changed, 15 insertions(+), 86 deletions(-) diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/JdbcTaskBatchDao.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/JdbcTaskBatchDao.java index 4a9bf169..685572a2 100644 --- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/JdbcTaskBatchDao.java +++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/listener/support/JdbcTaskBatchDao.java @@ -32,6 +32,7 @@ import org.springframework.util.StringUtils; * {@link org.springframework.cloud.task.repository.TaskRepository} * * @author Michael Minella + * @author Glenn Renfro */ public class JdbcTaskBatchDao implements TaskBatchDao { @@ -70,18 +71,6 @@ public class JdbcTaskBatchDao implements TaskBatchDao { jdbcTemplate.update(getQuery(INSERT_STATEMENT), taskExecution.getExecutionId(), jobExecution.getId()); } - /** - * The table prefix for the task batch table. - * - * @param tablePrefix defaults to {@link TaskProperties#DEFAULT_TABLE_PREFIX}. - * @deprecated Use the constructor to inject this value - */ - @Deprecated - public void setTablePrefix(String tablePrefix) { - Assert.notNull(tablePrefix, "Null is not allowed as a tablePrefix (use an empty string if you don't want a prefix at all)."); - this.tablePrefix = tablePrefix; - } - private String getQuery(String base) { return StringUtils.replace(base, "%PREFIX%", tablePrefix); } diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/DeployerPartitionHandler.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/DeployerPartitionHandler.java index 0759429c..ed765787 100644 --- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/DeployerPartitionHandler.java +++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/DeployerPartitionHandler.java @@ -221,8 +221,10 @@ public class DeployerPartitionHandler implements PartitionHandler, EnvironmentAw this.taskExecution = taskExecution; if(this.commandLineArgsProvider == null) { - this.commandLineArgsProvider = - new SimpleCommandLineArgsProvider(this.taskExecution); + SimpleCommandLineArgsProvider provider = new + SimpleCommandLineArgsProvider(taskExecution); + this.commandLineArgsProvider = provider; + } } diff --git a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/SimpleCommandLineArgsProvider.java b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/SimpleCommandLineArgsProvider.java index 82a8711c..a8e62619 100644 --- a/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/SimpleCommandLineArgsProvider.java +++ b/spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/SimpleCommandLineArgsProvider.java @@ -21,6 +21,7 @@ import java.util.List; import org.springframework.batch.item.ExecutionContext; import org.springframework.cloud.task.listener.TaskExecutionListenerSupport; import org.springframework.cloud.task.repository.TaskExecution; +import org.springframework.core.env.SimpleCommandLinePropertySource; import org.springframework.util.Assert; /** @@ -28,6 +29,7 @@ import org.springframework.util.Assert; * appended with any additional arguments configured. * * @author Michael Minella + * @author Glenn Renfro * @since 1.1.0 */ public class SimpleCommandLineArgsProvider extends TaskExecutionListenerSupport implements CommandLineArgsProvider { @@ -41,10 +43,7 @@ public class SimpleCommandLineArgsProvider extends TaskExecutionListenerSupport /** * @param taskExecution task execution - * @deprecated use the {@link org.springframework.cloud.task.listener.TaskExecutionListener} - * functionality to obtain the {@link TaskExecution} */ - @Deprecated public SimpleCommandLineArgsProvider(TaskExecution taskExecution) { Assert.notNull(taskExecution, "A taskExecution is required"); diff --git a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/partition/SimpleCommandLineArgsProviderTests.java b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/partition/SimpleCommandLineArgsProviderTests.java index c7d290ef..4bb51319 100644 --- a/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/partition/SimpleCommandLineArgsProviderTests.java +++ b/spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/partition/SimpleCommandLineArgsProviderTests.java @@ -30,18 +30,12 @@ import static org.junit.Assert.assertEquals; */ public class SimpleCommandLineArgsProviderTests { - @Test(expected = IllegalArgumentException.class) - public void testNullConstructorArg() { - new SimpleCommandLineArgsProvider(null); - } - @Test public void test() { TaskExecution taskExecution = new TaskExecution(); taskExecution.setArguments(Arrays.asList("foo", "bar", "baz")); - SimpleCommandLineArgsProvider provider = new SimpleCommandLineArgsProvider(); - provider.onTaskStartup(taskExecution); + SimpleCommandLineArgsProvider provider = new SimpleCommandLineArgsProvider(taskExecution); List commandLineArgs = provider.getCommandLineArgs(null); @@ -60,8 +54,7 @@ public class SimpleCommandLineArgsProviderTests { TaskExecution taskExecution = new TaskExecution(); taskExecution.setArguments(Arrays.asList("foo", "bar", "baz")); - SimpleCommandLineArgsProvider provider = new SimpleCommandLineArgsProvider(); - provider.onTaskStartup(taskExecution); + SimpleCommandLineArgsProvider provider = new SimpleCommandLineArgsProvider(taskExecution); provider.setAppendedArgs(appendedValues); List commandLineArgs = provider.getCommandLineArgs(null); @@ -80,8 +73,7 @@ public class SimpleCommandLineArgsProviderTests { TaskExecution taskExecution = new TaskExecution(); taskExecution.setArguments(Arrays.asList("foo", "bar", "baz")); - SimpleCommandLineArgsProvider provider = new SimpleCommandLineArgsProvider(); - provider.onTaskStartup(taskExecution); + SimpleCommandLineArgsProvider provider = new SimpleCommandLineArgsProvider(taskExecution); provider.setAppendedArgs(null); List commandLineArgs = provider.getCommandLineArgs(null); 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 37c116e3..53ec488e 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 @@ -100,28 +100,6 @@ public class TaskProperties { this.executionid = executionid; } - /** - * - * @deprecated use getClosecontextEnabled() - * @since 1.2.0 - */ - @Deprecated - public Boolean getClosecontextEnable() { - return closecontextEnabled; - } - - - /** - * - * @deprecated use setClosecontextEnabled() - * @since 1.2.0 - */ - @Deprecated - public void setClosecontextEnable(Boolean closecontextEnable) { - logger.warn("'closecontextEnable' is deprecated. Use 'closeContextEnabled.'"); - this.closecontextEnabled = closecontextEnable; - } - public Boolean getClosecontextEnabled() { return closecontextEnabled; } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java index a1226d05..8a8de2e8 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java @@ -244,18 +244,6 @@ public class JdbcTaskExecutionDao implements TaskExecutionDao { completeTaskExecution(taskExecutionId, exitCode, endTime, exitMessage, null); } - /** - * Public setter for the table prefix property. This will be prefixed to all - * the table names before queries are executed. Defaults to - * {@link TaskProperties#DEFAULT_TABLE_PREFIX}. - * - * @param tablePrefix the tablePrefix to set - */ - @Deprecated - public void setTablePrefix(String tablePrefix) { - this.tablePrefix = tablePrefix; - } - @Override public TaskExecution getTaskExecution(long executionId) { try { diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java index 66c7f9dc..cb72f20c 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/TaskExecutionDaoFactoryBean.java @@ -96,18 +96,6 @@ public class TaskExecutionDaoFactoryBean implements FactoryBean