Removed code that was marked as deprecated.

Also updated test that tested deprecated code.

resolves #366
This commit is contained in:
Glenn Renfro
2018-01-05 14:44:53 -05:00
committed by Michael Minella
parent 1ae7930d09
commit 76309b89ff
12 changed files with 15 additions and 86 deletions

View File

@@ -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);
}

View File

@@ -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;
}
}

View File

@@ -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");

View File

@@ -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<String> 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<String> 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<String> commandLineArgs = provider.getCommandLineArgs(null);