Task Status uses Job Exit Status for CTR launches

 - TaskExecution view and lists now will check if entry is CTR, if so use, use the new logic.
 - Add taskExecutionStatus to TaskExecutionResource. Adjust DataFlowIT task tests

 Resolves #4457

Author: cppwfs

spring-cloud-dataflow-rest-resource/src/main/java/org/springframework/cloud/dataflow/rest/job/TaskJobExecutionRel.java

@@ -38,27 +38,19 @@ public class TaskJobExecutionRel {
 
 	private final TaskManifest taskManifest;
 
-	/**
-	 * Constructor that establishes the relationship between a {@link TaskExecution} and
-	 * the Job Execution Ids of the jobs that were executed within it.
-	 *
-	 * @param taskExecution to be associated with the job execution ids.
-	 * @param jobExecutionIds to be associated with the task execution.
-	 */
-	public TaskJobExecutionRel(TaskExecution taskExecution, List<Long> jobExecutionIds) {
-		this(taskExecution, jobExecutionIds, null);
-	}
+	private final TaskJobExecution composedTaskJobExecution;
 
 	/**
 	 * Constructor that establishes the relationship between a {@link TaskExecution} and
 	 * the Job Execution Ids of the jobs that were executed within it.
 	 *
 	 * @param taskExecution to be associated with the job execution ids.
 	 * @param jobExecutionIds to be associated with the task execution.
-	 * @param taskManifest to be associated with the task execution
+	 * @param taskManifest to be associated with the task execution.
+	 * @param composedTaskJobExecution to be associated with the task execution.
 	 */
-	public TaskJobExecutionRel(TaskExecution taskExecution, List<Long> jobExecutionIds, TaskManifest taskManifest) {
-		Assert.notNull(taskExecution, "taskExecution must not be null");;
+	public TaskJobExecutionRel(TaskExecution taskExecution, List<Long> jobExecutionIds, TaskManifest taskManifest, TaskJobExecution composedTaskJobExecution) {
+		Assert.notNull(taskExecution, "taskExecution must not be null");
 		this.taskExecution = taskExecution;
 		this.taskManifest = taskManifest;
 		if (jobExecutionIds == null) {
@@ -67,8 +59,10 @@ public TaskJobExecutionRel(TaskExecution taskExecution, List<Long> jobExecutionI
 		else {
 			this.jobExecutionIds = Collections.unmodifiableList(new ArrayList<>(jobExecutionIds));
 		}
+		this.composedTaskJobExecution = composedTaskJobExecution;
 	}
 
+
 	/**
 	 * @return the taskExecution for this relationship.
 	 */
@@ -90,4 +84,8 @@ public List<Long> getJobExecutionIds() {
 	public TaskManifest getTaskManifest() {
 		return taskManifest;
 	}
+
+	public TaskJobExecution getComposedTaskJobExecution() {
+		return composedTaskJobExecution;
+	}
 }

spring-cloud-dataflow-rest-resource/src/main/java/org/springframework/cloud/dataflow/rest/resource/TaskExecutionResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,13 @@
 
 import org.springframework.batch.core.JobExecution;
 import org.springframework.cloud.dataflow.core.TaskManifest;
+import org.springframework.cloud.dataflow.rest.job.TaskJobExecution;
 import org.springframework.cloud.dataflow.rest.job.TaskJobExecutionRel;
 import org.springframework.cloud.task.repository.TaskExecution;
 import org.springframework.hateoas.PagedModel;
 import org.springframework.hateoas.RepresentationModel;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * A HATEOAS representation of a TaskExecution.
@@ -113,6 +115,10 @@ public class TaskExecutionResource extends RepresentationModel<TaskExecutionReso
 	 */
 	private String platformName;
 
+	private String taskExecutionStatus;
+
+	private String composedTaskJobExecutionStatus;
+
 	public TaskExecutionResource() {
 		arguments = new ArrayList<>();
 	}
@@ -151,6 +157,9 @@ public TaskExecutionResource(TaskJobExecutionRel taskJobExecutionRel) {
 		if(taskJobExecutionRel.getTaskManifest() != null) {
 			this.platformName = taskJobExecutionRel.getTaskManifest().getPlatformName();
 		}
+		this.composedTaskJobExecutionStatus = (taskJobExecutionRel.getComposedTaskJobExecution() != null) ?
+				taskJobExecutionRel.getComposedTaskJobExecution().getJobExecution().getExitStatus().getExitCode() :
+				null;
 	}
 
 	/**
@@ -159,7 +168,7 @@ public TaskExecutionResource(TaskJobExecutionRel taskJobExecutionRel) {
 	 *
 	 * @param taskExecution contains the {@link TaskExecution}
 	 */
-	public TaskExecutionResource(TaskExecution taskExecution) {
+	public TaskExecutionResource(TaskExecution taskExecution, TaskJobExecution composedTaskJobExecution) {
 		Assert.notNull(taskExecution, "taskExecution must not be null");
 		this.executionId = taskExecution.getExecutionId();
 		this.exitCode = taskExecution.getExitCode();
@@ -170,6 +179,9 @@ public TaskExecutionResource(TaskExecution taskExecution) {
 		this.endTime = taskExecution.getEndTime();
 		this.errorMessage = taskExecution.getErrorMessage();
 		this.externalExecutionId = taskExecution.getExternalExecutionId();
+		this.composedTaskJobExecutionStatus = (composedTaskJobExecution != null) ?
+				composedTaskJobExecution.getJobExecution().getExitStatus().getExitCode() :
+				null;
 	}
 
 	/**
@@ -179,7 +191,7 @@ public TaskExecutionResource(TaskExecution taskExecution) {
 	 * @param taskExecution contains the {@link TaskExecution}
 	 * @param taskManifest contains the (@link TaskManifest}
 	 */
-	public TaskExecutionResource(TaskExecution taskExecution, TaskManifest taskManifest) {
+	public TaskExecutionResource(TaskExecution taskExecution, TaskManifest taskManifest, TaskJobExecution composedTaskJobExecution) {
 		Assert.notNull(taskExecution, "taskExecution must not be null");
 		Assert.notNull(taskManifest, "taskManifest must not be null");
 		this.executionId = taskExecution.getExecutionId();
@@ -194,6 +206,9 @@ public TaskExecutionResource(TaskExecution taskExecution, TaskManifest taskManif
 		this.resourceUrl = taskManifest.getTaskDeploymentRequest().getResource().toString();
 		this.appProperties = taskManifest.getTaskDeploymentRequest().getDefinition().getProperties();
 		this.deploymentProperties = taskManifest.getTaskDeploymentRequest().getDeploymentProperties();
+		this.composedTaskJobExecutionStatus = (composedTaskJobExecution != null) ?
+				composedTaskJobExecution.getJobExecution().getExitStatus().getExitCode() :
+				null;
 	}
 
 	public long getExecutionId() {
@@ -264,6 +279,10 @@ public void setPlatformName(String platformName) {
 		this.platformName = platformName;
 	}
 
+	public void setTaskExecutionStatus(String taskExecutionStatus) {
+		this.taskExecutionStatus = taskExecutionStatus;
+	}
+
 	/**
 	 * Returns the calculated status of this {@link TaskExecution}.
 	 *
@@ -279,13 +298,23 @@ public void setPlatformName(String platformName) {
 	 * @return TaskExecutionStatus, never null
 	 */
 	public TaskExecutionStatus getTaskExecutionStatus() {
+		if (StringUtils.hasText(this.taskExecutionStatus)) {
+			return TaskExecutionStatus.valueOf(this.taskExecutionStatus);
+		}
 		if (this.startTime == null) {
 			return TaskExecutionStatus.UNKNOWN;
 		}
 		if (this.endTime == null) {
 			return TaskExecutionStatus.RUNNING;
 		}
 		else {
+			if (this.composedTaskJobExecutionStatus != null) {
+				return (this.composedTaskJobExecutionStatus.equals("ABANDONED") ||
+						this.composedTaskJobExecutionStatus.equals("FAILED") ||
+						this.composedTaskJobExecutionStatus.equals("STOPPED")) ?
+						TaskExecutionStatus.ERROR : TaskExecutionStatus.COMPLETE;
+			}
+
 			return (this.exitCode == null) ? TaskExecutionStatus.RUNNING :
 					((this.exitCode == 0) ? TaskExecutionStatus.COMPLETE : TaskExecutionStatus.ERROR);
 		}

spring-cloud-dataflow-rest-resource/src/test/java/org/springframework/cloud/dataflow/rest/resource/TaskExecutionResourceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,10 @@
 
 import org.junit.Test;
 
+import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.JobExecution;
 import org.springframework.cloud.dataflow.core.TaskManifest;
+import org.springframework.cloud.dataflow.rest.job.TaskJobExecution;
 import org.springframework.cloud.dataflow.rest.job.TaskJobExecutionRel;
 import org.springframework.cloud.deployer.spi.core.AppDefinition;
 import org.springframework.cloud.deployer.spi.core.AppDeploymentRequest;
@@ -50,27 +53,47 @@ public void testTaskExecutionStatusWithNoTaskExecutionSet()  {
 	@Test
 	public void testTaskExecutionStatusWithNoStartTime()  {
 		final TaskExecution taskExecution = new TaskExecution();
-		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution);
+		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution, null);
 		assertEquals(TaskExecutionStatus.UNKNOWN, taskExecutionResource.getTaskExecutionStatus());
 	}
 
 	@Test
 	public void testTaskExecutionStatusWithRunningTaskExecution()  {
 		final TaskExecution taskExecution = new TaskExecution();
 		taskExecution.setStartTime(new Date());
-		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution);
+		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution, null);
 		assertEquals(TaskExecutionStatus.RUNNING, taskExecutionResource.getTaskExecutionStatus());
 		assertNull(taskExecutionResource.getExitCode());
 	}
 
 	@Test
 	public void testTaskExecutionStatusWithSuccessfulTaskExecution()  {
+		final TaskExecution taskExecution = getDefaultTaskExecution();
+		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution, null);
+		assertEquals(TaskExecutionStatus.COMPLETE, taskExecutionResource.getTaskExecutionStatus());
+	}
+
+	@Test
+	public void testCTRExecutionStatusWithSuccessfulJobExecution()  {
+		final TaskExecution taskExecution = getDefaultTaskExecution();
+		JobExecution jobExecution = new JobExecution(1L);
+		jobExecution.setExitStatus(ExitStatus.COMPLETED);
+		TaskJobExecution taskJobExecution = new TaskJobExecution(taskExecution.getExecutionId(), jobExecution, true);
+		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution, taskJobExecution);
+		assertEquals(TaskExecutionStatus.COMPLETE, taskExecutionResource.getTaskExecutionStatus());
+	}
+
+	@Test
+	public void testCTRExecutionStatusWithFailedJobExecution()  {
 		final TaskExecution taskExecution = new TaskExecution();
 		taskExecution.setStartTime(new Date());
 		taskExecution.setEndTime(new Date());
 		taskExecution.setExitCode(0);
-		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution);
-		assertEquals(TaskExecutionStatus.COMPLETE, taskExecutionResource.getTaskExecutionStatus());
+		JobExecution jobExecution = new JobExecution(1L);
+		jobExecution.setExitStatus(ExitStatus.FAILED);
+		TaskJobExecution taskJobExecution = new TaskJobExecution(taskExecution.getExecutionId(), jobExecution, true);
+		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution, taskJobExecution);
+		assertEquals(TaskExecutionStatus.ERROR, taskExecutionResource.getTaskExecutionStatus());
 	}
 
 	@Test
@@ -79,28 +102,46 @@ public void testTaskExecutionStatusWithFailedTaskExecution()  {
 		taskExecution.setStartTime(new Date());
 		taskExecution.setEndTime(new Date());
 		taskExecution.setExitCode(123);
-		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution);
+		final TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskExecution, null);
 		assertEquals(TaskExecutionStatus.ERROR, taskExecutionResource.getTaskExecutionStatus());
 	}
 
 	@Test
 	public void testTaskExecutionForTaskExecutionRel() throws Exception{
-		final TaskExecution taskExecution = new TaskExecution();
-		taskExecution.setStartTime(new Date());
-		taskExecution.setEndTime(new Date());
-		taskExecution.setExitCode(0);
+		final TaskExecution taskExecution = getDefaultTaskExecution();
 		TaskManifest taskManifest = new TaskManifest();
 		taskManifest.setPlatformName("testplatform");
 		taskManifest.setTaskDeploymentRequest(new AppDeploymentRequest(new AppDefinition("testapp", Collections.emptyMap()), new UrlResource("http://foo")));
-		TaskJobExecutionRel taskJobExecutionRel = new TaskJobExecutionRel(taskExecution, new ArrayList<>(), taskManifest);
+		TaskJobExecutionRel taskJobExecutionRel = new TaskJobExecutionRel(taskExecution, new ArrayList<>(), taskManifest, null);
 		TaskExecutionResource taskExecutionResource = new TaskExecutionResource(taskJobExecutionRel);
 		assertEquals("testplatform", taskExecutionResource.getPlatformName());
 		assertEquals(TaskExecutionStatus.COMPLETE, taskExecutionResource.getTaskExecutionStatus());
-		taskJobExecutionRel = new TaskJobExecutionRel(taskExecution, new ArrayList<>());
+		taskJobExecutionRel = new TaskJobExecutionRel(taskExecution, new ArrayList<>(), null, null);
+		taskExecutionResource = new TaskExecutionResource(taskJobExecutionRel);
+		assertNull(taskExecutionResource.getPlatformName());
+		assertEquals(TaskExecutionStatus.COMPLETE, taskExecutionResource.getTaskExecutionStatus());
+		JobExecution jobExecution = new JobExecution(1L, null, "foo");
+		jobExecution.setExitStatus(ExitStatus.FAILED);
+
+		TaskJobExecution ctrTaskJobExecution = new TaskJobExecution(1, jobExecution, true);
+		taskJobExecutionRel = new TaskJobExecutionRel(taskExecution, new ArrayList<>(), null, ctrTaskJobExecution);
+		taskExecutionResource = new TaskExecutionResource(taskJobExecutionRel);
+		assertNull(taskExecutionResource.getPlatformName());
+		assertEquals(TaskExecutionStatus.ERROR, taskExecutionResource.getTaskExecutionStatus());
+		jobExecution.setExitStatus(ExitStatus.COMPLETED);
+		ctrTaskJobExecution = new TaskJobExecution(1, jobExecution, true);
+		taskJobExecutionRel = new TaskJobExecutionRel(taskExecution, new ArrayList<>(), null, ctrTaskJobExecution);
 		taskExecutionResource = new TaskExecutionResource(taskJobExecutionRel);
 		assertNull(taskExecutionResource.getPlatformName());
 		assertEquals(TaskExecutionStatus.COMPLETE, taskExecutionResource.getTaskExecutionStatus());
 	}
 
+	private TaskExecution getDefaultTaskExecution() {
+		final TaskExecution taskExecution = new TaskExecution();
+		taskExecution.setStartTime(new Date());
+		taskExecution.setEndTime(new Date());
+		taskExecution.setExitCode(0);
+		return taskExecution;
+	}
 
 }

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/config/DataFlowControllerAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -263,10 +263,10 @@ public static class TaskEnabledConfiguration {
 		public TaskExecutionController taskExecutionController(TaskExplorer explorer,
 				TaskExecutionService taskExecutionService,
 				TaskDefinitionRepository taskDefinitionRepository, TaskExecutionInfoService taskExecutionInfoService,
-				TaskDeleteService taskDeleteService) {
+				TaskDeleteService taskDeleteService, TaskJobService taskJobService) {
 			return new TaskExecutionController(explorer, taskExecutionService, taskDefinitionRepository,
 					taskExecutionInfoService,
-					taskDeleteService);
+					taskDeleteService, taskJobService);
 		}
 
 		@Bean
@@ -276,8 +276,9 @@ public TaskPlatformController taskLauncherController(LauncherService launcherSer
 
 		@Bean
 		@ConditionalOnMissingBean
-		public TaskDefinitionAssemblerProvider taskDefinitionAssemblerProvider(TaskExecutionService taskExecutionService) {
-			return new DefaultTaskDefinitionAssemblerProvider(taskExecutionService);
+		public TaskDefinitionAssemblerProvider taskDefinitionAssemblerProvider(
+				TaskExecutionService taskExecutionService, TaskJobService taskJobService, TaskExplorer taskExplorer) {
+			return new DefaultTaskDefinitionAssemblerProvider(taskExecutionService, taskJobService, taskExplorer);
 		}
 
 		@Bean