X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fcontroller%2FEPFusionBaseController.java;h=05dc3c9dc2fb00f717ebac77184eca6799db6730;hb=05bee83afa43b3eb1eeff209592179436cb7dd0e;hp=ad012ba164f79a722dedbcb8a607b45cbae65ea3;hpb=5d3d7e1758b67bdfa79ff0d6d09b1241f4d5a0e7;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
index ad012ba1..05dc3c9d 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
@@ -69,6 +69,7 @@ public abstract class EPFusionBaseController extends FusionBaseController {
 		return true;
 	}
 
+	@Override
 	public boolean isRESTfulCall() {
 		return true;
 	}
@@ -76,7 +77,7 @@ public abstract class EPFusionBaseController extends FusionBaseController {
 	@ModelAttribute("menu")
 	public Map<String, Object> messages(HttpServletRequest request) {
 		HttpSession session = null;
-		Map<String, Object> model = new HashMap<String, Object>();
+		Map<String, Object> model = new HashMap<>();
 		session = request.getSession();
 		EPUser user = EPUserUtils.getUserSession(request);
 		if (session != null && user != null) {
@@ -93,13 +94,14 @@ public abstract class EPFusionBaseController extends FusionBaseController {
 		return model;
 	}
 
+	@Override
 	public Map<String, Object> setMenu(Set<MenuData> menuResult) throws Exception {
 		ObjectMapper mapper = new ObjectMapper();
-		List<List<MenuData>> childItemList = new ArrayList<List<MenuData>>();
+		List<List<MenuData>> childItemList = new ArrayList<>();
 		
-		List<MenuData> parentList = new ArrayList<MenuData>();
+		List<MenuData> parentList = new ArrayList<>();
 		
-		Map<String, Object> model = new HashMap<String, Object>();
+		Map<String, Object> model = new HashMap<>();
 		for (MenuData menu : menuResult) {
 			MenuData parentData = new MenuData();
 			parentData.setLabel(menu.getLabel());