From 65dbb8c82c79f2a99e5cdd5feb46bd8c14d20890 Mon Sep 17 00:00:00 2001 From: "julian.schallenmueller" Date: Wed, 6 Jun 2018 14:30:50 +0200 Subject: [PATCH] TSK-560: Changed http status code for successfully deleting a task to 204 --- .../taskana/doc/api/TaskControllerRestDocumentation.java | 8 ++++---- .../test/java/pro/taskana/rest/TaskControllerIntTest.java | 2 +- .../src/main/java/pro/taskana/rest/TaskController.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/doc/api/TaskControllerRestDocumentation.java b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/doc/api/TaskControllerRestDocumentation.java index 9c582324c..f81f0e18a 100644 --- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/doc/api/TaskControllerRestDocumentation.java +++ b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/doc/api/TaskControllerRestDocumentation.java @@ -354,7 +354,7 @@ public class TaskControllerRestDocumentation { this.mockMvc.perform(RestDocumentationRequestBuilders .delete("http://127.0.0.1:" + port + "/v1/tasks/" + newId) .header("Authorization", "Basic YWRtaW46YWRtaW4=")) //admin - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.status().isNoContent()) .andDo(MockMvcRestDocumentation.document("DeleteTaskDocTest")); } @@ -386,7 +386,7 @@ public class TaskControllerRestDocumentation { this.mockMvc.perform(RestDocumentationRequestBuilders .delete("http://127.0.0.1:" + port + "/v1/tasks/" + newId) .header("Authorization", "Basic YWRtaW46YWRtaW4=")) //admin - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.status().isNoContent()) .andDo(MockMvcRestDocumentation.document("DeleteTaskDocTest")); } @@ -417,7 +417,7 @@ public class TaskControllerRestDocumentation { this.mockMvc.perform(RestDocumentationRequestBuilders .delete("http://127.0.0.1:" + port + "/v1/tasks/" + newId) .header("Authorization", "Basic YWRtaW46YWRtaW4=")) //admin - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.status().isNoContent()) .andDo(MockMvcRestDocumentation.document("DeleteTaskDocTest")); } @@ -447,6 +447,6 @@ public class TaskControllerRestDocumentation { this.mockMvc.perform(RestDocumentationRequestBuilders .delete("http://127.0.0.1:" + port + "/v1/tasks/" + newId) .header("Authorization", "Basic YWRtaW46YWRtaW4=")) //admin - .andExpect(MockMvcResultMatchers.status().isOk()); + .andExpect(MockMvcResultMatchers.status().isNoContent()); } } diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java index 58a97b7cb..33554e091 100644 --- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java +++ b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java @@ -353,7 +353,7 @@ public class TaskControllerIntTest { con = (HttpURLConnection) url.openConnection(); con.setRequestMethod("DELETE"); con.setRequestProperty("Authorization", "Basic YWRtaW46YWRtaW4="); // admin - assertEquals(200, con.getResponseCode()); + assertEquals(204, con.getResponseCode()); con.disconnect(); } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java index 5e2cfd6de..2b37407e4 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java @@ -163,7 +163,7 @@ public class TaskController extends AbstractPagingController { public ResponseEntity deleteTask(@PathVariable String taskId) throws TaskNotFoundException, InvalidStateException, NotAuthorizedException { taskService.forceDeleteTask(taskId); - ResponseEntity result = new ResponseEntity<>(HttpStatus.OK); + ResponseEntity result = new ResponseEntity<>(HttpStatus.NO_CONTENT); return result; }