This repository was archived by the owner on May 14, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +4
-11
lines changed
spring-cloud-dataflow-server-core/src
main/java/org/springframework/cloud/dataflow/server/controller
test/java/org/springframework/cloud/dataflow/server/controller Expand file tree Collapse file tree 2 files changed +4
-11
lines changed Original file line number Diff line number Diff line change 1616
1717package org .springframework .cloud .dataflow .server .controller ;
1818
19- import java .util .ArrayList ;
20- import java .util .List ;
21- import java .util .stream .Collectors ;
22-
2319import org .springframework .cloud .dataflow .core .ApplicationType ;
2420import 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 ;
3021import org .springframework .cloud .dataflow .registry .AppRegistry ;
3122import org .springframework .cloud .dataflow .rest .resource .TaskDefinitionResource ;
3223import org .springframework .cloud .dataflow .server .config .features .ComposedTaskProperties ;
33- import org .springframework .cloud .dataflow .server .controller .support .ComposedTaskValidator ;
3424import org .springframework .cloud .dataflow .server .repository .DeploymentIdRepository ;
3525import org .springframework .cloud .dataflow .server .repository .DeploymentKey ;
3626import 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
Original file line number Diff line number Diff line change 4040import org .junit .Test ;
4141import org .junit .runner .RunWith ;
4242import org .mockito .ArgumentCaptor ;
43+ import org .mockito .Mockito ;
44+
4345import org .springframework .beans .factory .annotation .Autowired ;
4446import org .springframework .boot .test .context .SpringBootTest ;
4547import org .springframework .cloud .dataflow .core .ApplicationType ;
5557import org .springframework .http .MediaType ;
5658import org .springframework .test .context .junit4 .SpringRunner ;
5759import org .springframework .test .web .servlet .MockMvc ;
58- import org .springframework .test .web .servlet .MvcResult ;
5960import org .springframework .test .web .servlet .setup .MockMvcBuilders ;
6061import 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
You can’t perform that action at this time.
0 commit comments