Merge "added proper annotations"

1 files changed, 6 insertions, 5 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SDKLoginController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SDKLoginController.java
index 6418b1e1..a585b9f7 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SDKLoginController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/SDKLoginController.java
@@ -53,7 +53,8 @@ import org.onap.portalsdk.core.web.support.AppUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 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.PostMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 @Controller
@@ -68,24 +69,24 @@ public class SDKLoginController extends UnRestrictedBaseController {
 	
 	private String viewName;
 
-	@RequestMapping(value = { "/login.htm" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/login.htm" })
 	public ModelAndView login() {
 		Map<String, Object> model = new HashMap<>();
 		return new ModelAndView("login", "model", model);
 	}
 
-	@RequestMapping(value = { "/login_external.htm" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/login_external.htm" })
 	public ModelAndView externalLogin() {
 		Map<String, Object> model = new HashMap<>();
 		return new ModelAndView("login_external", "model", model);
 	}
 
-	@RequestMapping(value = { "/login_external" }, method = RequestMethod.POST)
+	@PostMapping(value = { "/login_external" })
 	public ModelAndView doexternalLogin(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		return loginStrategy.doExternalLogin(request, response);
 	}
 
-	@RequestMapping(value = { "/doLogin" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/doLogin" })
 	public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		return loginStrategy.doLogin(request, response);
 	}