* Modifications Copyright (c) 2019 Samsung
* ===================================================================
* Modifications Copyright (c) 2020 IBM
- * ===================================================================
- *
+ * ===================================================================
+ *
* Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the "License");
+ * under the Apache License, Version 2.0 (the "License");
* you may not use this software except in compliance with the License.
* You may obtain a copy of the License at
*
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import com.fasterxml.jackson.databind.DeserializationFeature;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
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.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiOperation;
* @return PortalRestResponse with appropriate status value and message
*/
@ApiOperation(value = "Creates an application user with the specified roles.", response = PortalRestResponse.class)
- @RequestMapping(value = { "/userProfile" }, method = RequestMethod.POST, produces = "application/json")
+ @PostMapping(value = { "/userProfile" }, produces = "application/json")
public PortalRestResponse<String> postUserProfile(HttpServletRequest request,
@RequestBody ExternalSystemUser extSysUser, HttpServletResponse response) {
ExternalRequestFieldsValidator reqResult = null;
* @return PortalRestResponse with appropriate status value and message
*/
@ApiOperation(value = "Updates an application user to have only the specified roles.", response = PortalRestResponse.class)
- @RequestMapping(value = { "/userProfile" }, method = RequestMethod.PUT, produces = "application/json")
+ @PutMapping(value = { "/userProfile" }, produces = "application/json")
public PortalRestResponse<String> putUserProfile(HttpServletRequest request,
@RequestBody ExternalSystemUser extSysUser, HttpServletResponse response) {
ExternalRequestFieldsValidator reqResult = null;
* @return PortalRestResponse with appropriate status value and message
*/
@ApiOperation(value = "Processes a request to delete one or more application roles for one specified user who has roles.", response = PortalRestResponse.class)
- @RequestMapping(value = { "/userProfile" }, method = RequestMethod.DELETE, produces = "application/json")
+ @DeleteMapping(value = { "/userProfile" }, produces = "application/json")
public PortalRestResponse<String> deleteUserProfile(HttpServletRequest request,
@RequestBody ExternalSystemUser extSysUser, HttpServletResponse response) {
ExternalRequestFieldsValidator reqResult = null;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/** The logger. */
private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SchedulerAuxController.class);
- @RequestMapping(value = "/get_policy", method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = "/get_policy", produces = "application/json")
public ResponseEntity<String> getPolicyInfo(HttpServletRequest request) throws Exception {
try {
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
this.adminRolesService = adminRolesService;
}
- @RequestMapping(value = "/get_time_slots/{scheduler_request}", method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = "/get_time_slots/{scheduler_request}", produces = "application/json")
public ResponseEntity<String> getTimeSlots(HttpServletRequest request,
@PathVariable("scheduler_request") String schedulerRequest) throws Exception {
if (checkIfUserISValidToMakeSchedule(request)) {
}
@SuppressWarnings("unchecked")
- @RequestMapping(value = "/post_create_new_vnf_change", method = RequestMethod.POST, produces = "application/json")
+ @PostMapping(value = "/post_create_new_vnf_change", produces = "application/json")
public ResponseEntity<String> postCreateNewVNFChange(HttpServletRequest request,
@RequestBody JSONObject schedulerRequest) throws Exception {
if (checkIfUserISValidToMakeSchedule(request)) {
}
}
- @RequestMapping(value = "/submit_vnf_change_timeslots", method = RequestMethod.POST, produces = "application/json")
+ @PostMapping(value = "/submit_vnf_change_timeslots", produces = "application/json")
public ResponseEntity<String> postSubmitVnfChangeTimeslots(HttpServletRequest request,
@RequestBody JSONObject schedulerRequest) throws Exception {
if (checkIfUserISValidToMakeSchedule(request)) {
* @return Rest response wrapped around a String; e.g., "success" or "ERROR"
* @throws Exception
*/
- @RequestMapping(value = "/get_scheduler_constant", method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = "/get_scheduler_constant", produces = "application/json")
public PortalRestResponse<Map<String, String>> getSchedulerConstant(HttpServletRequest request,
HttpServletResponse response) throws Exception {
logger.debug(EELFLoggerDelegate.debugLogger, "get scheduler constant");
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
* on bad arguments
*/
@ApiOperation(value = "Gets a value for the specified context and key.", response = SharedContext.class)
- @RequestMapping(value = { "/get" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/get" }, produces = "application/json")
public String getContext(HttpServletRequest request, @RequestParam String context_id, @RequestParam String ckey)
throws Exception {
logger.debug(EELFLoggerDelegate.debugLogger, "getContext for ID " + context_id + ", key " + ckey);
* on bad arguments
*/
@ApiOperation(value = "Gets user information for the specified context.", response = SharedContext.class, responseContainer = "List")
- @RequestMapping(value = { "/get_user" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/get_user" }, produces = "application/json")
public String getUserContext(HttpServletRequest request, @RequestParam String context_id) throws Exception {
logger.debug(EELFLoggerDelegate.debugLogger, "getUserContext for ID " + context_id);
* on bad arguments
*/
@ApiOperation(value = "Tests for presence of the specified key in the specified context.", response = SharedContextJsonResponse.class)
- @RequestMapping(value = { "/check" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/check" }, produces = "application/json")
public String checkContext(HttpServletRequest request, @RequestParam String context_id, @RequestParam String ckey)
throws Exception {
* on bad arguments
*/
@ApiOperation(value = "Removes the specified key in the specified context.", response = SharedContextJsonResponse.class)
- @RequestMapping(value = { "/remove" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/remove" }, produces = "application/json")
public String removeContext(HttpServletRequest request, @RequestParam String context_id, @RequestParam String ckey)
throws Exception {
* on bad arguments
*/
@ApiOperation(value = "Clears all key-value pairs in the specified context.", response = SharedContextJsonResponse.class)
- @RequestMapping(value = { "/clear" }, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = { "/clear" }, produces = "application/json")
public String clearContext(HttpServletRequest request, @RequestParam String context_id) throws Exception {
logger.debug(EELFLoggerDelegate.debugLogger, "clearContext for " + context_id);
* on bad arguments
*/
@ApiOperation(value = "Sets a context value for the specified context and key. Creates the context if no context with the specified ID-key pair exists, overwrites the value if it exists already.", response = SharedContextJsonResponse.class)
- @RequestMapping(value = { "/set" }, method = RequestMethod.POST, produces = "application/json")
+ @PostMapping(value = { "/set" }, produces = "application/json")
public String setContext(HttpServletRequest request, @RequestBody String userJson) throws Exception {
if (userJson !=null){
SecureString secureUserJson = new SecureString(userJson);
Code Review / portal.git / commitdiff