Respect 'manifest' task def controller parameter

Do not execute SQL to load manifest when parameter is 'false'.

Author: onobc

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/TaskDefinitionController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2022 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.
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import org.springframework.cloud.dataflow.core.TaskDefinition;
 import org.springframework.cloud.dataflow.core.dsl.TaskNode;
@@ -62,6 +63,7 @@
  * @author Gunnar Hillert
  * @author Daniel Serleg
  * @author Ilayaperumal Gopinathan
+ * @author Chris Bono
  */
 @RestController
 @RequestMapping("/tasks/definitions")
@@ -176,20 +178,12 @@ public PagedModel<? extends TaskDefinitionResource> list(Pageable pageable, @Req
 			}
 		}
 
-		final java.util.HashMap<String, TaskDefinition> taskDefinitionMap = new java.util.HashMap<>();
-
-		for (TaskDefinition taskDefinition : taskDefinitions) {
-			taskDefinitionMap.put(taskDefinition.getName(), taskDefinition);
-		}
-
-		final List<TaskExecution> taskExecutions;
+		final Map<String, TaskDefinition> taskDefinitionMap = taskDefinitions.stream()
+				.collect(Collectors.toMap(TaskDefinition::getTaskName, Function.identity()));
 
+		List<TaskExecution> taskExecutions = null;
 		if (!taskDefinitionMap.isEmpty()) {
-			taskExecutions = this.explorer.getLatestTaskExecutionsByTaskNames(
-					taskDefinitionMap.keySet().toArray(new String[taskDefinitionMap.size()]));
-		}
-		else {
-			taskExecutions = null;
+			taskExecutions = this.explorer.getLatestTaskExecutionsByTaskNames(taskDefinitionMap.keySet().toArray(new String[0]));
 		}
 
 		final Page<TaskExecutionAwareTaskDefinition> taskExecutionAwareTaskDefinitions = taskDefinitions

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/assembler/DefaultTaskDefinitionAssembler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 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.
@@ -40,6 +40,11 @@
 /**
  * {@link org.springframework.hateoas.server.RepresentationModelAssembler} implementation that converts
  * {@link TaskDefinition}s to {@link TaskDefinitionResource}s.
+ *
+ * @author Ilayaperumal Gopinathan
+ * @author Evgeniy Bezdomnikov
+ * @author Glenn Renfro
+ * @author Chris Bono
  */
 public class DefaultTaskDefinitionAssembler<R extends TaskDefinitionResource> extends
 		RepresentationModelAssemblerSupport<TaskExecutionAwareTaskDefinition, R> {
@@ -73,10 +78,13 @@ TaskDefinitionResource updateTaskExecutionResource(
 
 		TaskExecution taskExecution = taskExecutionAwareTaskDefinition.getLatestTaskExecution();
 		taskExecution = this.taskSanitizer.sanitizeTaskExecutionArguments(taskExecution);
-		TaskManifest taskManifest = this.taskExecutionService.findTaskManifestById(taskExecution.getExecutionId());
-		taskManifest = this.taskSanitizer.sanitizeTaskManifest(taskManifest);
+		TaskManifest taskManifest = null;
+		if (manifest) {
+			taskManifest = this.taskExecutionService.findTaskManifestById(taskExecution.getExecutionId());
+			taskManifest = this.taskSanitizer.sanitizeTaskManifest(taskManifest);
+		}
 		TaskJobExecution composedTaskJobExecution = null;
-		if(taskExecution != null && taskDefinitionResource.isComposed()) {
+		if (taskExecution != null && taskDefinitionResource.isComposed()) {
 			Set<Long> jobExecutionIds = this.taskExplorer.getJobExecutionIdsByTaskExecutionId(taskExecution.getExecutionId());
 			if(jobExecutionIds != null && jobExecutionIds.size() > 0) {
 				try {