X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-os%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fcontroller%2FONAPLoginController.java;h=9ac209074fc90454c4e0088541a03860d45d3c55;hb=3504c843a1322c3a43b9cfe750fdaedfad83c4a8;hp=d20a4608f9a6212823bd15754429e54c384ada89;hpb=21a8761f684745bb300e075c7e98ad897ace9eed;p=portal.git

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPLoginController.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPLoginController.java
index d20a4608..9ac20907 100644
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPLoginController.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPLoginController.java
@@ -33,16 +33,14 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.controller;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import lombok.NoArgsConstructor;
 import org.onap.portalsdk.core.auth.LoginStrategy;
 import org.onap.portalsdk.core.controller.UnRestrictedBaseController;
 import org.onap.portalsdk.core.onboarding.listener.PortalTimeoutHandler;
@@ -52,21 +50,28 @@ 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.GetMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
 @Controller
 @RequestMapping("/")
+@NoArgsConstructor
 public class ONAPLoginController extends UnRestrictedBaseController {
-	@Autowired
-	ProfileService service;
-	@Autowired
+	private ProfileService service;
 	private LoginService loginService;
-	@Autowired
 	private LoginStrategy loginStrategy;
-	String viewName;
+	private String viewName;
+
+	@Autowired
+	public ONAPLoginController(ProfileService service, LoginService loginService,
+		LoginStrategy loginStrategy) {
+		this.service = service;
+		this.loginService = loginService;
+		this.loginStrategy = loginStrategy;
+	}
 
-	@RequestMapping(value = { "/doLogin" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/doLogin" })
 	public ModelAndView doLogin(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		return loginStrategy.doLogin(request, response);
 	}
@@ -80,14 +85,6 @@ public class ONAPLoginController extends UnRestrictedBaseController {
 		PortalTimeoutHandler.sessionCreated(jSessionId, jSessionId, AppUtils.getSession(request));
 	}
 
-	public String getViewName() {
-		return viewName;
-	}
-
-	public void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-
 	public LoginService getLoginService() {
 		return loginService;
 	}
@@ -96,4 +93,13 @@ public class ONAPLoginController extends UnRestrictedBaseController {
 		this.loginService = loginService;
 	}
 
+	@Override
+	public String getViewName() {
+		return viewName;
+	}
+
+	@Override
+	public void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
 }