Updated based on code review

* term millis removed from class attributes and moved to docs
* timeout attributes removed from TaskJobLauncherCommandLinerRunnerFactory Bean and TaskJobLauncherCommandLineRunner
* TaskBatchTest moved to configuration package
* Documentation updated
* pom.xml reset
* rebased conflicts resolved

Author: cppwfs

spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchProperties.java

@@ -37,26 +37,26 @@ public class TaskBatchProperties {
 	private String jobNames = "";
 
 	/**
-	 * The order for the {@coce CommandLineRunner} used to run batch jobs when
+	 * The order for the {@code CommandLineRunner} used to run batch jobs when
 	 * {@code spring.cloud.task.batch.fail-on-job-failure=true}.  Defaults to 0 (same as the
 	 * {@link org.springframework.boot.autoconfigure.batch.JobLauncherCommandLineRunner}).
 	 */
 	private int commandLineRunnerOrder = 0;
 
 	/**
-	 * Maximum wait time that Spring Cloud task will wait for tasks to complete
+	 * Maximum wait time in milliseconds that Spring Cloud Task will wait for tasks to complete
 	 * when spring.cloud.task.batch.failOnJobFailure is set to true.  Defaults
 	 * to 0.  0 indicates no wait time is enforced.
 	 */
-	private long failOnJobFailurewaitTimeInMillis = 0;
+	private long failOnJobFailurewaitTime = 0;
 
 	/**
-	 * Fixed delay that Spring Cloud Task will wait when checking if
+	 * Fixed delay in milliseconds that Spring Cloud Task will wait when checking if
 	 * {@link org.springframework.batch.core.JobExecution}s have completed,
 	 * when spring.cloud.task.batch.failOnJobFailure is set to true.  Defaults
 	 * to 5000.
 	 */
-	private long failOnJobFailurePollIntervalInMillis = 5000l;
+	private long failOnJobFailurePollInterval = 5000l;
 
 	public String getJobNames() {
 		return this.jobNames;
@@ -74,19 +74,19 @@ public void setCommandLineRunnerOrder(int commandLineRunnerOrder) {
 		this.commandLineRunnerOrder = commandLineRunnerOrder;
 	}
 
-	public long getFailOnJobFailurewaitTimeInMillis() {
-		return failOnJobFailurewaitTimeInMillis;
+	public long getFailOnJobFailurewaitTime() {
+		return failOnJobFailurewaitTime;
 	}
 
-	public void setFailOnJobFailurewaitTimeInMillis(long failOnJobFailurewaitTimeInMillis) {
-		this.failOnJobFailurewaitTimeInMillis = failOnJobFailurewaitTimeInMillis;
+	public void setFailOnJobFailurewaitTime(long failOnJobFailurewaitTime) {
+		this.failOnJobFailurewaitTime = failOnJobFailurewaitTime;
 	}
 
-	public long getFailOnJobFailurePollIntervalInMillis() {
-		return failOnJobFailurePollIntervalInMillis;
+	public long getFailOnJobFailurePollInterval() {
+		return failOnJobFailurePollInterval;
 	}
 
-	public void setFailOnJobFailurePollIntervalInMillis(long failOnJobFailurePollIntervalInMillis) {
-		this.failOnJobFailurePollIntervalInMillis = failOnJobFailurePollIntervalInMillis;
+	public void setFailOnJobFailurePollInterval(long failOnJobFailurePollInterval) {
+		this.failOnJobFailurePollInterval = failOnJobFailurePollInterval;
 	}
 }

spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskJobLauncherCommandLineRunnerFactoryBean.java

@@ -46,55 +46,30 @@ public class TaskJobLauncherCommandLineRunnerFactoryBean implements FactoryBean<
 
 	private Integer order = 0;
 
-	/**
-	 * Maximum wait time that Spring Cloud task will wait for tasks to complete
-	 * when spring.cloud.task.batch.failOnJobFailure is set to true.  Defaults
-	 * to 0.  0 indicates no wait time is enforced.
-	 */
-	private long failOnJobFailurewaitTimeInMillis = 0;
-
-	/**
-	 * Fixed delay that Spring Cloud Task will wait when checking if
-	 * {@link org.springframework.batch.core.JobExecution}s have completed,
-	 * when spring.cloud.task.batch.failOnJobFailure is set to true.  Defaults
-	 * to 5000.
-	 */
-	private long failOnJobFailurePollIntervalInMillis = 5000l;
+	private TaskBatchProperties taskBatchProperties;
 
 	public TaskJobLauncherCommandLineRunnerFactoryBean(JobLauncher jobLauncher,
-			JobExplorer jobExplorer, List<Job> jobs, String jobNames,
+			JobExplorer jobExplorer, List<Job> jobs, TaskBatchProperties taskBatchProperties,
 			JobRegistry jobRegistry) {
+		Assert.notNull(taskBatchProperties, "properties must not be null");
 		this.jobLauncher = jobLauncher;
 		this.jobExplorer = jobExplorer;
 		Assert.notEmpty(jobs, "jobs must not be null nor empty");
 		this.jobs = jobs;
-		this.jobNames = jobNames;
+		this.jobNames = taskBatchProperties.getJobNames();
 		this.jobRegistry = jobRegistry;
-	}
-
-	public TaskJobLauncherCommandLineRunnerFactoryBean(JobLauncher jobLauncher,
-			JobExplorer jobExplorer, List<Job> jobs, TaskBatchProperties properties,
-			JobRegistry jobRegistry) {
-		Assert.notNull(properties, "properties must not be null");
-		this.jobLauncher = jobLauncher;
-		this.jobExplorer = jobExplorer;
-		Assert.notEmpty(jobs, "jobs must not be null nor empty");
-		this.jobs = jobs;
-		this.jobNames = properties.getJobNames();
-		this.jobRegistry = jobRegistry;
-		this.failOnJobFailurePollIntervalInMillis = properties.getFailOnJobFailurePollIntervalInMillis();
-		this.failOnJobFailurewaitTimeInMillis = properties.getFailOnJobFailurewaitTimeInMillis();
-		this.order = properties.getCommandLineRunnerOrder();
+		this.taskBatchProperties = taskBatchProperties;
+		this.order = taskBatchProperties.getCommandLineRunnerOrder();
 	}
 
 	public void setOrder(int order) {
 		this.order = order;
 	}
 
 	@Override
-	public TaskJobLauncherCommandLineRunner getObject() throws Exception {
+	public TaskJobLauncherCommandLineRunner getObject() {
 		TaskJobLauncherCommandLineRunner  taskJobLauncherCommandLineRunner =
-				new TaskJobLauncherCommandLineRunner(this.jobLauncher, this.jobExplorer);
+				new TaskJobLauncherCommandLineRunner(this.jobLauncher, this.jobExplorer, this.taskBatchProperties);
 		taskJobLauncherCommandLineRunner.setJobs(this.jobs);
 		if(StringUtils.hasText(this.jobNames)) {
 			taskJobLauncherCommandLineRunner.setJobNames(this.jobNames);
@@ -104,8 +79,6 @@ public TaskJobLauncherCommandLineRunner getObject() throws Exception {
 		if(this.order != null) {
 			taskJobLauncherCommandLineRunner.setOrder(this.order);
 		}
-		taskJobLauncherCommandLineRunner.setFailOnJobFailurePollIntervalInMillis(this.failOnJobFailurePollIntervalInMillis);
-		taskJobLauncherCommandLineRunner.setFailOnJobFailurewaitTimeInMillis(this.failOnJobFailurewaitTimeInMillis);
 		return taskJobLauncherCommandLineRunner;
 	}
 
@@ -114,19 +87,4 @@ public Class<?> getObjectType() {
 		return TaskJobLauncherCommandLineRunner.class;
 	}
 
-	public long getFailOnJobFailurewaitTimeInMillis() {
-		return failOnJobFailurewaitTimeInMillis;
-	}
-
-	public void setFailOnJobFailurewaitTimeInMillis(long failOnJobFailurewaitTimeInMillis) {
-		this.failOnJobFailurewaitTimeInMillis = failOnJobFailurewaitTimeInMillis;
-	}
-
-	public long getFailOnJobFailurePollIntervalInMillis() {
-		return failOnJobFailurePollIntervalInMillis;
-	}
-
-	public void setFailOnJobFailurePollIntervalInMillis(long failOnJobFailurePollIntervalInMillis) {
-		this.failOnJobFailurePollIntervalInMillis = failOnJobFailurePollIntervalInMillis;
-	}
 }

spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunner.java

@@ -44,6 +44,7 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.autoconfigure.batch.JobExecutionEvent;
 import org.springframework.boot.autoconfigure.batch.JobLauncherCommandLineRunner;
+import org.springframework.cloud.task.batch.configuration.TaskBatchProperties;
 import org.springframework.cloud.task.listener.TaskException;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.core.task.TaskExecutor;
@@ -52,11 +53,12 @@
 /**
  * {@link CommandLineRunner} to {@link JobLauncher launch} Spring Batch jobs. Runs all
  * jobs in the surrounding context by default and throw an exception upon the first job
- * that returns an {@link ExitStatus} of FAILED if a {@link TaskExecutor} is not
- * specified. If a {@link TaskExecutor} is specified then all Jobs are launched and an
- * exception is thrown if one or more of the jobs has an {@link ExitStatus} of failed. Can
- * also be used to launch a specific job by providing a jobName. The
- * TaskJobLaunchercommandLineRunner takes the place of the
+ * that returns an {@link ExitStatus} of FAILED if a {@link TaskExecutor} in the
+ * {@link JobLauncher} is not specified. If a {@link TaskExecutor} is specified
+ * in the {@link JobLauncher} then all Jobs are launched and an
+ * exception is thrown if one or more of the jobs has an {@link ExitStatus} of failed.
+ * TaskJobLauncherCommandLineRunner can also be used to launch a specific job by
+ * providing a jobName. The TaskJobLaunchercommandLineRunner takes the place of the
  * {@link org.springframework.boot.autoconfigure.batch.JobLauncherCommandLineRunner} when
  * it is in use.
  *
@@ -76,25 +78,14 @@ public class TaskJobLauncherCommandLineRunner extends JobLauncherCommandLineRunn
 
 	private ApplicationEventPublisher taskApplicationEventPublisher;
 
-	/**
-	 * Maximum wait time that Spring Cloud task will wait for tasks to complete when
-	 * spring.cloud.task.batch.failOnJobFailure is set to true. Defaults to 0. 0 indicates no
-	 * wait time is enforced.
-	 */
-	private long failOnJobFailurewaitTimeInMillis = 0;
-
-	/**
-	 * Fixed delay that Spring Cloud Task will wait when checking if
-	 * {@link org.springframework.batch.core.JobExecution}s have completed, when
-	 * spring.cloud.task.batch.failOnJobFailure is set to true. Defaults to 5000.
-	 */
-	private long failOnJobFailurePollIntervalInMillis = 5000l;
+	private TaskBatchProperties taskBatchProperties;
 
 	public TaskJobLauncherCommandLineRunner(JobLauncher jobLauncher,
-			JobExplorer jobExplorer) {
+			JobExplorer jobExplorer, TaskBatchProperties taskBatchProperties) {
 		super(jobLauncher, jobExplorer);
 		this.taskJobLauncher = jobLauncher;
 		this.taskJobExplorer = jobExplorer;
+		this.taskBatchProperties = taskBatchProperties;
 	}
 
 	public void setApplicationEventPublisher(ApplicationEventPublisher publisher) {
@@ -146,16 +137,16 @@ public RepeatStatus doInIteration(RepeatContext context) throws InterruptedExcep
 						failedJobExecutions.add(jobExecution);
 					}
 				}
-				Thread.sleep(failOnJobFailurePollIntervalInMillis);
+				Thread.sleep(taskBatchProperties.getFailOnJobFailurePollInterval());
 
 				if (repeatStatus.equals(RepeatStatus.FINISHED) && failedJobExecutions.size() > 0) {
 					throwJobFailedException(failedJobExecutions);
 				}
-				if (repeatStatus.isContinuable() && failOnJobFailurewaitTimeInMillis != 0
-						&& (new Date()).getTime() - startDate.getTime() > failOnJobFailurewaitTimeInMillis) {
+				if (repeatStatus.isContinuable() && taskBatchProperties.getFailOnJobFailurewaitTime() != 0
+						&& (new Date()).getTime() - startDate.getTime() > taskBatchProperties.getFailOnJobFailurewaitTime()) {
 					throw new IllegalStateException("Not all jobs were completed " +
 							"within the time specified by spring.cloud.task.batch." +
-							"failOnJobFailurewaitTimeInMillis.");
+							"failOnJobFailurewaitTime.");
 				}
 				return repeatStatus;
 			}
@@ -176,19 +167,4 @@ public void throwJobFailedException(List<JobExecution> failedJobExecutions) {
 
 	}
 
-	public long getFailOnJobFailurewaitTimeInMillis() {
-		return this.failOnJobFailurewaitTimeInMillis;
-	}
-
-	public void setFailOnJobFailurewaitTimeInMillis(long failOnJobFailurewaitTimeInMillis) {
-		this.failOnJobFailurewaitTimeInMillis = failOnJobFailurewaitTimeInMillis;
-	}
-
-	public long getFailOnJobFailurePollIntervalInMillis() {
-		return this.failOnJobFailurePollIntervalInMillis;
-	}
-
-	public void setFailOnJobFailurePollIntervalInMillis(long failOnJobFailurePollIntervalInMillis) {
-		this.failOnJobFailurePollIntervalInMillis = failOnJobFailurePollIntervalInMillis;
-	}
 }

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchTest.java renamed to spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/configuration/TaskBatchTest.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package org.springframework.cloud.task.batch.listener;
+package org.springframework.cloud.task.batch.configuration;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunnerCoreTests.java

@@ -38,6 +38,7 @@
 import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.task.batch.configuration.TaskBatchProperties;
 import org.springframework.cloud.task.listener.TaskException;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.task.SyncTaskExecutor;
@@ -84,7 +85,7 @@ public void init() {
 		Tasklet tasklet = (contribution, chunkContext) -> null;
 		this.step = this.steps.get("step").tasklet(tasklet).build();
 		this.job = this.jobs.get("job").start(this.step).build();
-		this.runner = new TaskJobLauncherCommandLineRunner(this.jobLauncher, this.jobExplorer);
+		this.runner = new TaskJobLauncherCommandLineRunner(this.jobLauncher, this.jobExplorer, new TaskBatchProperties());
 	}
 
 

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherCommandLineRunnerTests.java

@@ -46,7 +46,7 @@
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration;
 import org.springframework.cloud.task.batch.configuration.TaskJobLauncherAutoConfiguration;
-import org.springframework.cloud.task.batch.listener.TaskBatchTest;
+import org.springframework.cloud.task.batch.configuration.TaskBatchTest;
 import org.springframework.cloud.task.configuration.EnableTask;
 import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration;
 import org.springframework.cloud.task.configuration.SingleTaskConfiguration;
@@ -103,7 +103,7 @@ public void testTaskJobLauncherCLRSuccessFailWithAnnotation() {
 	public void testTaskJobLauncherCLRSuccessFailWithTaskExecutor() {
 		String[] enabledArgs = new String[] {
 				"--spring.cloud.task.batch.failOnJobFailure=true",
-				"--spring.cloud.task.batch.failOnJobFailurePollIntervalInMillis=500"};
+				"--spring.cloud.task.batch.failOnJobFailurePollInterval=500"};
 		validateForFail(DEFAULT_ERROR_MESSAGE, TaskJobLauncherCommandLineRunnerTests.JobWithFailureTaskExecutorConfiguration.class,
 				enabledArgs);
 	}
@@ -113,10 +113,10 @@ public void testTaskJobLauncherCLRSuccessFailWithTaskExecutor() {
 	public void testTaskJobLauncherCLRSuccessWithLongWaitTaskExecutor() {
 		String[] enabledArgs = new String[] {
 				"--spring.cloud.task.batch.failOnJobFailure=true",
-				"--spring.cloud.task.batch.failOnJobFailurePollIntervalInMillis=500",
-				"--spring.cloud.task.batch.failOnJobFailurewaitTimeInMillis=1000"
+				"--spring.cloud.task.batch.failOnJobFailurePollInterval=500",
+				"--spring.cloud.task.batch.failOnJobFailurewaitTime=1000"
 		};
-		validateForFail("Not all jobs were completed within the time specified by spring.cloud.task.batch.failOnJobFailurewaitTimeInMillis.",
+		validateForFail("Not all jobs were completed within the time specified by spring.cloud.task.batch.failOnJobFailurewaitTime.",
 				TaskJobLauncherCommandLineRunnerTests.JobWithFailureTaskExecutorLongWaitConfiguration.class,
 				enabledArgs);
 	}
@@ -170,7 +170,7 @@ private void validateContext() {
 	private void validateForFail(String errorMessage, Class clazz, String [] enabledArgs) {
 		Executable executable = () -> {
 			this.applicationContext = SpringApplication
-					.run(new Class[] { clazz}, enabledArgs);};
+					.run(new Class[] { clazz,PropertyPlaceholderAutoConfiguration.class}, enabledArgs);};
 		Throwable exception = assertThrows(IllegalStateException.class, executable);
 		assertThat(exception.getCause().getMessage()).isEqualTo(errorMessage);
 	}

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/PrefixTests.java

@@ -29,12 +29,7 @@
 import org.springframework.batch.repeat.RepeatStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration;
-import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration;
-import org.springframework.cloud.task.configuration.SingleTaskConfiguration;
+import org.springframework.cloud.task.batch.configuration.TaskBatchTest;
 import org.springframework.cloud.task.repository.TaskExplorer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;

spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java

@@ -44,6 +44,7 @@
 import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
 import org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration;
 import org.springframework.cloud.task.batch.configuration.TaskBatchExecutionListenerBeanPostProcessor;
+import org.springframework.cloud.task.batch.configuration.TaskBatchTest;
 import org.springframework.cloud.task.configuration.DefaultTaskConfigurer;
 import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration;
 import org.springframework.cloud.task.configuration.SingleTaskConfiguration;

spring-cloud-task-batch/src/test/resources/META-INF/spring.factories

@@ -1,4 +1,4 @@
-org.springframework.cloud.task.batch.listener.TaskBatchTest=\
+org.springframework.cloud.task.batch.configuration.TaskBatchTest=\
 org.springframework.cloud.task.batch.configuration.TaskBatchAutoConfiguration,\
 org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration,\
 org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration,\

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

@@ -55,7 +55,7 @@
  * @author Glenn Renfro
  *
  * @deprecated The EnableTask annotation is no longer be required to initialize
- * Spring Cloud Task.  This will be handled by Spring Boot AutoConfiguration.
+ * Spring Cloud Task.  This will be handled by AutoConfiguration provided by Spring Cloud Task.
  */
 @Deprecated
 @Target(ElementType.TYPE)

spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskListenerExecutorObjectFactory.java

@@ -71,9 +71,9 @@ public TaskListenerExecutorObjectFactory(ConfigurableApplicationContext context)
 
 	@Override
 	public TaskListenerExecutor getObject() {
-		beforeTaskInstances = new HashMap<>();
-		afterTaskInstances = new HashMap<>();
-		failedTaskInstances = new HashMap<>();
+		this.beforeTaskInstances = new HashMap<>();
+		this.afterTaskInstances = new HashMap<>();
+		this.failedTaskInstances = new HashMap<>();
 		initializeExecutor();
 		return new TaskListenerExecutor(beforeTaskInstances, afterTaskInstances, failedTaskInstances);
 	}

spring-cloud-task-integration-tests/pom.xml

@@ -126,7 +126,7 @@
 		<profile>
 			<id>skipIntegrationTests</id>
 			<activation>
-				<activeByDefault>false</activeByDefault>
+				<activeByDefault>true</activeByDefault>
 			</activation>
 			<build>
 				<plugins>