X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-os%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fcontroller%2FONAPWelcomeController.java;h=615dff060b009f863a16dbd4263a9dd366091dec;hb=3504c843a1322c3a43b9cfe750fdaedfad83c4a8;hp=26564a0443a1ffa3ec4ae207cacdf0f6b52a1c3e;hpb=2edaa4d6a5f7066e0c718f85a7bf7b8dabd0c59b;p=portal.git

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java
index 26564a04..615dff06 100644
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/ONAPWelcomeController.java
@@ -44,42 +44,36 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import lombok.NoArgsConstructor;
 import org.mitre.openid.connect.client.SubjectIssuerGrantedAuthority;
 import org.onap.portalapp.controller.EPRestrictedBaseController;
 import org.onap.portalapp.portal.logging.aop.EPAuditLog;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 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("/")
-@org.springframework.context.annotation.Configuration
+@Configuration
 @EnableAspectJAutoProxy
 @EPAuditLog
+@NoArgsConstructor
 public class ONAPWelcomeController extends EPRestrictedBaseController{
-	String viewName;
-		
-	@RequestMapping(value = "/index.htm", method = RequestMethod.GET)
+	@GetMapping(value = "/index.htm")
     public String getIndexPage(HttpServletRequest request) {
 		return "/index";
     }
 	
-	@RequestMapping(value = {"/applicationsHome", "/dashboard", "/widgetsHome", "/kpidash*", "/admins", "/users", "/portalAdmins", "/applications", "/widgets", "/functionalMenu", "/contactUs", "/getAccess","/appCatalog", "/widgetOnboarding", "/accountOnboarding"}, method = RequestMethod.GET)
+	@GetMapping(value = {"/app/*","/applicationsHome", "/dashboard", "/widgetsHome", "/kpidash*", "/admins", "/users", "/portalAdmins", "/applications", "/widgets", "/functionalMenu", "/contactUs", "/getAccess","/appCatalog", "/widgetOnboarding", "/accountOnboarding"})
     public String getEcompSinglePage(HttpServletRequest request, HttpServletResponse response) {
 		return "forward:/index.html";
     }
 	
-	protected String getViewName() {
-		return viewName;
-	}
-	
-	protected void setViewName(String viewName) {
-		this.viewName = viewName;
-	}
-	
 	// TODO Need to revisit this as its conflicting with Spring Security; check web.xml's oid-context.xml config
 	//@Resource(name = "namedAdmins")
 	private Set<SubjectIssuerGrantedAuthority> admins;