TaskJobLauncherCommandLineRunner now inherits from JobLauncherCommandLineRunner

Used to be a copy of.  No just inherits.

Added feature check for completed/failed jobs before throwing exception

Currently in Task if the user sets failOnJobFailure and they are using a TaskExecutor it will not throw an exception when task fails.
This because at evaluation time the job has not started.
With the latest change Task waits for all jobs to complete before deciding whether an exception needs to be thrown or not.

Author: cppwfs

spring-cloud-task-batch/pom.xml

@@ -79,5 +79,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-test</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 </project>

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

@@ -43,6 +43,21 @@ public class TaskBatchProperties {
 	 */
 	private int commandLineRunnerOrder = 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;
+
 	public String getJobNames() {
 		return this.jobNames;
 	}
@@ -58,4 +73,20 @@ public int getCommandLineRunnerOrder() {
 	public void setCommandLineRunnerOrder(int commandLineRunnerOrder) {
 		this.commandLineRunnerOrder = commandLineRunnerOrder;
 	}
+
+	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/configuration/TaskJobLauncherAutoConfiguration.java

@@ -23,6 +23,8 @@
 import org.springframework.batch.core.explore.JobExplorer;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -37,6 +39,7 @@
 @Configuration
 @ConditionalOnProperty(name = "spring.cloud.task.batch.failOnJobFailure", havingValue = "true", matchIfMissing = false)
 @EnableConfigurationProperties(TaskBatchProperties.class)
+@AutoConfigureBefore(BatchAutoConfiguration.class)
 public class TaskJobLauncherAutoConfiguration {
 
 	@Autowired
@@ -49,11 +52,9 @@ public TaskJobLauncherCommandLineRunnerFactoryBean jobLauncherCommandLineRunner(
 				new TaskJobLauncherCommandLineRunnerFactoryBean(jobLauncher,
 						jobExplorer,
 						jobs,
-						this.properties.getJobNames(),
+						this.properties,
 						jobRegistry);
 
-		taskJobLauncherCommandLineRunnerFactoryBean.setOrder(this.properties.getCommandLineRunnerOrder());
-
 		return taskJobLauncherCommandLineRunnerFactoryBean;
 	}
 }

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

@@ -46,6 +46,21 @@ 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;
+
 	public TaskJobLauncherCommandLineRunnerFactoryBean(JobLauncher jobLauncher,
 			JobExplorer jobExplorer, List<Job> jobs, String jobNames,
 			JobRegistry jobRegistry) {
@@ -57,6 +72,21 @@ public TaskJobLauncherCommandLineRunnerFactoryBean(JobLauncher jobLauncher,
 		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();
+	}
+
 	public void setOrder(int order) {
 		this.order = order;
 	}
@@ -74,12 +104,29 @@ public TaskJobLauncherCommandLineRunner getObject() throws Exception {
 		if(this.order != null) {
 			taskJobLauncherCommandLineRunner.setOrder(this.order);
 		}
-
+		taskJobLauncherCommandLineRunner.setFailOnJobFailurePollIntervalInMillis(this.failOnJobFailurePollIntervalInMillis);
+		taskJobLauncherCommandLineRunner.setFailOnJobFailurewaitTimeInMillis(this.failOnJobFailurewaitTimeInMillis);
 		return taskJobLauncherCommandLineRunner;
 	}
 
 	@Override
 	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;
+	}
 }