Update Task Thin Executions list function for parity with 2.11.x

Updated task thin executions link handing and added extra test for parity with 2.11.x See spring-cloud#6062
corneil · Nov 12, 2024 · 364414b · 364414b
1 parent 54aca00
commit 364414b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/...t/java/org/springframework/cloud/dataflow/server/rest/documentation/ApiDocumentation.java b/...t/java/org/springframework/cloud/dataflow/server/rest/documentation/ApiDocumentation.java
@@ -222,7 +222,7 @@ void index() throws Exception {
 						fieldWithPath("_links.tasks/thinexecutions.href").description("Link to the tasks/thinexecutions"),
 
 						fieldWithPath("_links.tasks/thinexecutions/name.href").description("Link to the tasks/thinexecutions/name"),
-						fieldWithPath("_links.tasks/thinexecutions/name.templated").description("Link to the tasks/thinexecutions/name is templated"),
+						fieldWithPath("_links.tasks/thinexecutions/name.templated").type(JsonFieldType.BOOLEAN).optional().description("Link to the tasks/thinexecutions/name is templated"),
 
 						fieldWithPath("_links.tasks/info/executions.href").description("Link to the tasks/info/executions"),
 						fieldWithPath("_links.tasks/info/executions.templated").type(JsonFieldType.BOOLEAN).optional().description("Link tasks/info is templated"),

diff --git a/...est-client/src/main/java/org/springframework/cloud/dataflow/rest/client/TaskTemplate.java b/...est-client/src/main/java/org/springframework/cloud/dataflow/rest/client/TaskTemplate.java
@@ -146,35 +146,17 @@ public class TaskTemplate implements TaskOperations {
 		if (VersionUtils.isDataFlowServerVersionGreaterThanOrEqualToRequiredVersion(version, VALIDATION_RELATION_VERSION)) {
 			Assert.notNull(resources.getLink(VALIDATION_REL), ()-> VALIDATION_REL + " relation is required");
 		}
-		if (VersionUtils.isDataFlowServerVersionGreaterThanOrEqualToRequiredVersion(version, EXECUTIONS_CURRENT_RELATION_VERSION)) {
-			Assert.isTrue(resources.getLink(EXECUTIONS_CURRENT_RELATION).isPresent(), ()-> EXECUTIONS_CURRENT_RELATION + " relation is required");
-			this.executionsCurrentLink = resources.getLink(EXECUTIONS_CURRENT_RELATION).get();
-		} else {
-			this.executionsCurrentLink = null;
-		}
 
 		this.aboutLink = resources.getLink("about").get();
 
 		this.definitionsLink = resources.getLink(DEFINITIONS_RELATION).get();
 		this.definitionLink = resources.getLink(DEFINITION_RELATION).get();
 		this.executionsLink = resources.getLink(EXECUTIONS_RELATION).get();
 		this.executionLink = resources.getLink(EXECUTION_RELATION).get();
-		if(resources.getLink(THIN_EXECUTIONS_RELATION).isPresent()) {
-			this.thinExecutionsLink = resources.getLink(THIN_EXECUTIONS_RELATION).get();
-		} else {
-			this.thinExecutionsLink = null;
-		}
-		if(resources.getLink(THIN_EXECUTIONS_BY_NAME_RELATION).isPresent()) {
-			this.thinExecutionsByNameLink = resources.getLink(THIN_EXECUTIONS_BY_NAME_RELATION).get();
-		} else {
-			this.thinExecutionsByNameLink = null;
-		}
-
-		if(resources.getLink(EXECUTION_LAUNCH_RELATION).isPresent()) {
-			this.executionLaunchLink = resources.getLink(EXECUTION_LAUNCH_RELATION).get();
-		} else {
-			this.executionLaunchLink = null;
-		}
+		this.executionsCurrentLink = resources.getLink(EXECUTIONS_CURRENT_RELATION).orElse(null);
+		this.thinExecutionsLink = resources.getLink(THIN_EXECUTIONS_RELATION).orElse(null);
+		this.thinExecutionsByNameLink = resources.getLink(THIN_EXECUTIONS_BY_NAME_RELATION).orElse(null);
+		this.executionLaunchLink = resources.getLink(EXECUTION_LAUNCH_RELATION).orElse(null);
 		this.executionByNameLink = resources.getLink(EXECUTION_RELATION_BY_NAME).get();
 		if (resources.getLink(EXECUTIONS_INFO_RELATION).isPresent()) {
 			this.executionsInfoLink = resources.getLink(EXECUTIONS_INFO_RELATION).get();

diff --git a/...va/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java b/...va/org/springframework/cloud/dataflow/server/controller/TaskExecutionControllerTests.java
@@ -343,6 +343,12 @@ void getAllThinExecutions() throws Exception {
 	}
 	@Test
 	void getThinExecutionsByName() throws Exception {
+		mockMvc.perform(get("/tasks/thinexecutions").queryParam("name", TASK_NAME_ORIG).accept(MediaType.APPLICATION_JSON))
+				.andExpect(status().isOk())
+				.andExpect(jsonPath("$._embedded.taskExecutionThinResourceList[*].executionId", containsInAnyOrder(2, 1)))
+				.andExpect(jsonPath("$._embedded.taskExecutionThinResourceList[*].parentExecutionId", containsInAnyOrder(null, 1)))
+				.andExpect(jsonPath("$._embedded.taskExecutionThinResourceList[*].taskExecutionStatus", containsInAnyOrder("RUNNING", "RUNNING")))
+				.andExpect(jsonPath("$._embedded.taskExecutionThinResourceList", hasSize(2)));
 		mockMvc.perform(get("/tasks/thinexecutions").queryParam("name", "nope").accept(MediaType.APPLICATION_JSON))
 			.andExpect(jsonPath("$.page.totalElements", is(0)));
 		mockMvc.perform(get("/tasks/thinexecutions").queryParam("name", "none").accept(MediaType.APPLICATION_JSON))