From 9546ff37b2677f305143f67e0b36ff9f022aaed3 Mon Sep 17 00:00:00 2001 From: Sofie Hofmann <29145005+sofie29@users.noreply.github.com> Date: Mon, 17 Feb 2020 13:15:18 +0100 Subject: [PATCH] TSK-1112 Changed @RequestMapping to @PostMapping / @GetMapping / ... TSK-1112 deleted suppressWarnings TSK-1112 Removed duplicated method --- .../pro/taskana/TaskanaTestController.java | 23 ++++++++++--------- .../rest/controllers/ViewController.java | 4 ++-- .../security/LoginErrorController.java | 14 +++++++---- .../java/pro/taskana/rest/TaskController.java | 3 +-- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java index 2268850dc..028547f90 100644 --- a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java +++ b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java @@ -3,7 +3,8 @@ package pro.taskana; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; @@ -27,7 +28,7 @@ public class TaskanaTestController { @Autowired private TaskanaEngine taskanaEngine; @Transactional(rollbackFor = Exception.class) - @RequestMapping("/schema") + @GetMapping(path = "/schema") public @ResponseBody String schema() { String schema = jdbcTemplate.queryForObject("SELECT SCHEMA()", String.class); System.err.println("current schema: " + schema); @@ -35,19 +36,19 @@ public class TaskanaTestController { } @Transactional(readOnly = true, rollbackFor = Exception.class) - @RequestMapping("/workbaskets") + @GetMapping(path = "/workbaskets") public @ResponseBody Integer workbaskets() { return getWorkbaskets(); } @Transactional(readOnly = true, rollbackFor = Exception.class) - @RequestMapping("/customdb-tests") + @GetMapping(path = "/customdb-tests") public @ResponseBody Integer customdbTests() { return getCustomdbTests(); } @Transactional(rollbackFor = Exception.class) - @RequestMapping("/transaction") + @GetMapping(path = "/transaction") public @ResponseBody String transaction( @RequestParam(value = "rollback", defaultValue = "false") String rollback) throws InvalidWorkbasketException, NotAuthorizedException, WorkbasketAlreadyExistException, @@ -55,7 +56,7 @@ public class TaskanaTestController { taskanaEngine.getWorkbasketService().createWorkbasket(createWorkBasket("key", "workbasket")); int workbaskets = getWorkbaskets(); - if (Boolean.valueOf(rollback)) { + if (Boolean.parseBoolean(rollback)) { throw new RuntimeException("workbaskets: " + workbaskets); } else { return "workbaskets: " + workbaskets; @@ -63,7 +64,7 @@ public class TaskanaTestController { } @Transactional(rollbackFor = Exception.class) - @RequestMapping("/transaction-many") + @GetMapping(path = "/transaction-many") public @ResponseBody String transactionMany( @RequestParam(value = "rollback", defaultValue = "false") String rollback) throws InvalidWorkbasketException, NotAuthorizedException, WorkbasketAlreadyExistException, @@ -72,7 +73,7 @@ public class TaskanaTestController { taskanaEngine.getWorkbasketService().createWorkbasket(createWorkBasket("key2", "workbasket2")); taskanaEngine.getWorkbasketService().createWorkbasket(createWorkBasket("key3", "workbasket3")); - if (Boolean.valueOf(rollback)) { + if (Boolean.parseBoolean(rollback)) { throw new RuntimeException("workbaskets: " + getWorkbaskets()); } else { return "workbaskets: " + getWorkbaskets(); @@ -80,7 +81,7 @@ public class TaskanaTestController { } @Transactional(rollbackFor = Exception.class) - @RequestMapping("/customdb") + @GetMapping(path = "/customdb") public @ResponseBody String transactionCustomdb( @RequestParam(value = "rollback", defaultValue = "false") String rollback) throws InvalidWorkbasketException, NotAuthorizedException, WorkbasketAlreadyExistException, @@ -91,7 +92,7 @@ public class TaskanaTestController { jdbcTemplate.execute("INSERT INTO CUSTOMDB.TEST VALUES ('1', 'test')"); jdbcTemplate.execute("INSERT INTO CUSTOMDB.TEST VALUES ('2', 'test2')"); - if (Boolean.valueOf(rollback)) { + if (Boolean.parseBoolean(rollback)) { throw new RuntimeException( "workbaskets: " + getWorkbaskets() + ", tests: " + getCustomdbTests()); } else { @@ -100,7 +101,7 @@ public class TaskanaTestController { } @Transactional(rollbackFor = Exception.class) - @RequestMapping("/cleanup") + @DeleteMapping(path = "/cleanup") public @ResponseBody String cleanup() { jdbcTemplate.execute("DELETE FROM WORKBASKET"); jdbcTemplate.execute("DELETE FROM CUSTOMDB.TEST"); diff --git a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/controllers/ViewController.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/controllers/ViewController.java index 4fefc9d30..2601ecc46 100644 --- a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/controllers/ViewController.java +++ b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/rest/controllers/ViewController.java @@ -1,13 +1,13 @@ package pro.taskana.rest.controllers; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; /** The view controller. */ @Controller public class ViewController { - @RequestMapping({"", "taskana/**"}) + @GetMapping(path = {"", "taskana/**"}) public String index() { return "forward:/index.html"; } diff --git a/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/LoginErrorController.java b/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/LoginErrorController.java index 669763e44..719f128e3 100644 --- a/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/LoginErrorController.java +++ b/rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/wildfly/security/LoginErrorController.java @@ -3,16 +3,22 @@ package pro.taskana.wildfly.security; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.view.RedirectView; /** The loginError controller. */ @Controller public class LoginErrorController { - @PostMapping - @GetMapping - @RequestMapping("/loginerror") + @GetMapping(path = "/loginerror") + public RedirectView loginErrorGet() { + return loginError(); + } + + @PostMapping(path = "/loginerror") + public RedirectView loginErrorPost() { + return loginError(); + } + public RedirectView loginError() { return new RedirectView("/login?error", true); } 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 b882c4c10..8b826dc18 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 @@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -206,7 +205,7 @@ public class TaskController extends AbstractPagingController { return result; } - @RequestMapping(path = Mapping.URL_TASKS_ID_TRANSFER_WORKBASKETID) + @PostMapping(path = Mapping.URL_TASKS_ID_TRANSFER_WORKBASKETID) @Transactional(rollbackFor = Exception.class) public ResponseEntity transferTask( @PathVariable String taskId, @PathVariable String workbasketId)