Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 92d0067

Browse files
ericbottardilayaperumalg
authored andcommitted
task destroy calls TaskLauncher#destroy()
Fixes #1238
1 parent 1bbbab0 commit 92d0067

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,11 @@
1616

1717
package org.springframework.cloud.dataflow.server.controller;
1818

19-
import java.util.ArrayList;
20-
import java.util.List;
21-
import java.util.stream.Collectors;
22-
2319
import org.springframework.cloud.dataflow.core.ApplicationType;
2420
import org.springframework.cloud.dataflow.core.TaskDefinition;
25-
import org.springframework.cloud.dataflow.core.dsl.ComposedTaskNode;
26-
import org.springframework.cloud.dataflow.core.dsl.ComposedTaskParser;
27-
import org.springframework.cloud.dataflow.core.dsl.ComposedTaskValidationException;
28-
import org.springframework.cloud.dataflow.core.dsl.ComposedTaskValidationProblem;
29-
import org.springframework.cloud.dataflow.core.dsl.DSLMessage;
3021
import org.springframework.cloud.dataflow.registry.AppRegistry;
3122
import org.springframework.cloud.dataflow.rest.resource.TaskDefinitionResource;
3223
import org.springframework.cloud.dataflow.server.config.features.ComposedTaskProperties;
33-
import org.springframework.cloud.dataflow.server.controller.support.ComposedTaskValidator;
3424
import org.springframework.cloud.dataflow.server.repository.DeploymentIdRepository;
3525
import org.springframework.cloud.dataflow.server.repository.DeploymentKey;
3626
import org.springframework.cloud.dataflow.server.repository.NoSuchTaskDefinitionException;
@@ -144,6 +134,7 @@ public void destroyTask(@PathVariable("name") String name) {
144134
throw new NoSuchTaskDefinitionException(name);
145135
}
146136
repository.delete(name);
137+
taskLauncher.destroy(name);
147138
deploymentIdRepository.delete(DeploymentKey.forTaskDefinition(taskDefinition));
148139
}
149140

spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/TaskControllerTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import org.junit.Test;
4141
import org.junit.runner.RunWith;
4242
import org.mockito.ArgumentCaptor;
43+
import org.mockito.Mockito;
44+
4345
import org.springframework.beans.factory.annotation.Autowired;
4446
import org.springframework.boot.test.context.SpringBootTest;
4547
import org.springframework.cloud.dataflow.core.ApplicationType;
@@ -55,7 +57,6 @@
5557
import org.springframework.http.MediaType;
5658
import org.springframework.test.context.junit4.SpringRunner;
5759
import org.springframework.test.web.servlet.MockMvc;
58-
import org.springframework.test.web.servlet.MvcResult;
5960
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
6061
import org.springframework.web.context.WebApplicationContext;
6162

@@ -381,6 +382,7 @@ public void testDestroyTask() throws Exception {
381382
.andExpect(status().isOk());
382383

383384
assertEquals(0, repository.count());
385+
Mockito.verify(taskLauncher).destroy("myTask");
384386
}
385387

386388
@Test

0 commit comments

Comments
 (0)