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=a425812f8a30ab3c262be0b71497bbe87b5efde6;hpb=21a8761f684745bb300e075c7e98ad897ace9eed;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 a425812f..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
@@ -3,6 +3,8 @@
  * ONAP Portal
  * ===================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright © 2018 IBM.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
@@ -33,7 +35,7 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.controller;
 
@@ -67,6 +69,7 @@ public abstract class EPFusionBaseController extends FusionBaseController {
 		return true;
 	}
 
+	@Override
 	public boolean isRESTfulCall() {
 		return true;
 	}
@@ -74,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) {
@@ -91,20 +94,21 @@ 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());
 			parentData.setAction(menu.getAction());
 			parentData.setImageSrc(menu.getImageSrc());
 			parentList.add(parentData);
-			List<MenuData> tempList = new ArrayList<MenuData>();
+			List<MenuData> tempList = new ArrayList<>();
 			for (Object o : menu.getChildMenus()) {
 				MenuData m = (MenuData) o;
 				MenuData data = new MenuData();