diff options
Diffstat (limited to 'ecomp-sdk/epsdk-workflow/src/main/java')
5 files changed, 18 insertions, 16 deletions
diff --git a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/NotebookController.java b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/NotebookController.java index 4af5d21c..18c4222a 100644 --- a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/NotebookController.java +++ b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/NotebookController.java @@ -40,14 +40,14 @@ package org.onap.portalsdk.rnotebookintegration.controller; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; @Controller @RequestMapping("/") public class NotebookController extends RestrictedBaseController{ - @RequestMapping(value = {"/notebook" }, method = RequestMethod.GET) + @GetMapping(value = {"/notebook" }) public ModelAndView noteBook() { return new ModelAndView(getViewName()); } diff --git a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/NotebookTestController.java b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/NotebookTestController.java index f608586d..95c00e41 100644 --- a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/NotebookTestController.java +++ b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/NotebookTestController.java @@ -41,14 +41,14 @@ package org.onap.portalsdk.rnotebookintegration.controller; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; @Controller @RequestMapping("/") public class NotebookTestController extends RestrictedBaseController { - @RequestMapping(value = { "/nbooktest" }, method = RequestMethod.GET) + @GetMapping(value = { "/nbooktest" }) public ModelAndView noteBook() { return new ModelAndView(getViewName()); } diff --git a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/RNoteBookController.java b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/RNoteBookController.java index 82e88f23..f37d16f0 100644 --- a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/RNoteBookController.java +++ b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/RNoteBookController.java @@ -47,7 +47,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ResponseBody; @Controller @@ -67,7 +67,7 @@ public class RNoteBookController extends RestrictedRESTfulBaseController { this.rNoteBookIntegrationService = rNoteBookIntegrationService; } - @RequestMapping(value = { "authCr" }, method = RequestMethod.GET, produces = "application/json") + @GetMapping(value = { "authCr" }, produces = "application/json") @ResponseBody public ResponseEntity<String> getRNotebookCredentials(String token) { String returnJSON = ""; diff --git a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/RNoteBookFEController.java b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/RNoteBookFEController.java index 3bf81f6d..fefade2d 100644 --- a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/RNoteBookFEController.java +++ b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/rnotebookintegration/controller/RNoteBookFEController.java @@ -58,7 +58,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; @Controller @@ -78,7 +78,7 @@ public class RNoteBookFEController extends RestrictedBaseController { this.rNoteBookIntegrationService = rNoteBookIntegrationService; } - @RequestMapping(value = { "authCr" }, method = RequestMethod.POST, produces = "application/json") + @PostMapping(value = { "authCr" }, produces = "application/json") @ResponseBody public ResponseEntity<String> saveRNotebookCredentials(@RequestBody String notebookId, HttpServletRequest request, HttpServletResponse response) { diff --git a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/workflow/controllers/WorkflowController.java b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/workflow/controllers/WorkflowController.java index 5aa556d1..19c7ea50 100644 --- a/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/workflow/controllers/WorkflowController.java +++ b/ecomp-sdk/epsdk-workflow/src/main/java/org/onap/portalsdk/workflow/controllers/WorkflowController.java @@ -58,7 +58,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; @@ -78,7 +80,7 @@ public class WorkflowController extends RestrictedBaseController { @Autowired private WorkflowService workflowService; - @RequestMapping(value = { "workflows/saveCronJob" }, method = RequestMethod.POST) + @PostMapping(value = { "workflows/saveCronJob" }) public void saveCronJob(HttpServletRequest request, HttpServletResponse response) throws Exception { try { @@ -108,7 +110,7 @@ public class WorkflowController extends RestrictedBaseController { } - @RequestMapping(value = { "workflows/list" }, method = RequestMethod.GET, produces = "application/json") + @GetMapping(value = { "workflows/list" }, produces = "application/json") @ResponseBody public String getWorkflowList() { ObjectMapper mapper = new ObjectMapper(); @@ -142,21 +144,21 @@ public class WorkflowController extends RestrictedBaseController { return ""; } - @RequestMapping(value = "workflows/addWorkflow", method = RequestMethod.POST, consumes = "application/json") + @PostMapping(value = "workflows/addWorkflow", consumes = "application/json") @ResponseBody public Workflow addWorkflow(@RequestBody Workflow workflow, HttpServletRequest request) { String loginId = ((User) (request.getSession().getAttribute("user"))).getLoginId(); return workflowService.addWorkflow(workflow, loginId); } - @RequestMapping(value = "workflows/editWorkflow", method = RequestMethod.POST, consumes = "application/json") + @PostMapping(value = "workflows/editWorkflow", consumes = "application/json") @ResponseBody public Workflow editWorkflow(@RequestBody WorkflowLite workflow, HttpServletRequest request) { String loginId = ((User) (request.getSession().getAttribute("user"))).getLoginId(); return workflowService.editWorkflow(workflow, loginId); } - @RequestMapping(value = { "workflows/removeWorkflow" }, method = RequestMethod.POST, consumes = "application/json") + @PostMapping(value = { "workflows/removeWorkflow" }, consumes = "application/json") @ResponseBody public String removeWorkflow(@RequestBody Long workflowId, HttpServletRequest request, HttpServletResponse response) { workflowService.deleteWorkflow(workflowId); @@ -165,13 +167,13 @@ public class WorkflowController extends RestrictedBaseController { return "{removed: 123}"; } - @RequestMapping(value = "workflows/removeAllWorkflows", method = RequestMethod.DELETE) + @DeleteMapping(value = "workflows/removeAllWorkflows") @ResponseBody public void removeAllWorkflows() { throw new UnsupportedOperationException(); } - @RequestMapping(value = { "/workflows" }, method = RequestMethod.GET) + @GetMapping(value = { "/workflows" }) public ModelAndView getWorkflowPartialPage() { Map<String, Object> model = new HashMap<>(); return new ModelAndView(getViewName(), "workflows", model); |