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 ReportDashboardController extends RestrictedBaseController {
- @RequestMapping(value = {"/report_dashboard" }, method = RequestMethod.GET)
+ @GetMapping(value = {"/report_dashboard" })
public ModelAndView adminView(HttpServletRequest request) {
Map<String, Object> model = new HashMap<>();
return new ModelAndView(getViewName(),"model", model);
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;
/**
@RequestMapping("/")
public class SamplePageController extends RestrictedBaseController {
- @RequestMapping(value = { "/samplePage" }, method = RequestMethod.GET)
+ @GetMapping(value = { "/samplePage" })
public ModelAndView plot(HttpServletRequest request) {
Map<String, Object> model = new HashMap<>();
import org.onap.portalsdk.core.service.LoginService;
import org.onap.portalsdk.core.service.UrlAccessService;
import org.onap.portalsdk.core.service.WebServiceCallService;
-import org.onap.portalsdk.core.util.SystemProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.beans.factory.annotation.Autowired;
-import org.onap.portalsdk.core.logging.aspect.MetricsLog;
import org.onap.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum;
@Aspect
import org.onap.portalsdk.core.domain.User;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.onap.portalsdk.core.menu.MenuBuilder;
-import org.onap.portalsdk.core.service.DataAccessService;
-import org.onap.portalsdk.core.service.LoginServiceCentralizedImpl;
import org.onap.portalsdk.core.util.SystemProperties;
import org.onap.portalsdk.core.web.support.AppUtils;
import org.onap.portalsdk.core.web.support.UserUtils;
import org.onap.portalsdk.core.onboarding.util.CipherUtil;
import org.onap.portalsdk.core.onboarding.util.KeyConstants;
import org.onap.portalsdk.core.onboarding.util.KeyProperties;
-import org.onap.portalsdk.core.util.SystemProperties;
import org.onap.portalsdk.external.authorization.domain.ExternalAccessPerms;
import org.onap.portalsdk.external.authorization.domain.ExternalAccessRole;
import org.onap.portalsdk.external.authorization.domain.ExternalAccessUserRoleDetail;
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());
}
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());
}
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
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 = "";
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
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) {