From: Manoop Talasila <talasila@research.att.com>
Date: Thu, 7 Feb 2019 21:30:13 +0000 (+0000)
Subject: Merge "PORTAL-492 - EPFusionBaseController.java"
X-Git-Tag: 3.2.0~354
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=commitdiff_plain;h=10857e4a304e12d37c92cae86199f1acb10af01e

Merge "PORTAL-492 - EPFusionBaseController.java"
---

10857e4a304e12d37c92cae86199f1acb10af01e
diff --cc ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
index 44281868,0298b9ae..f99c19ac
--- 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
@@@ -93,13 -93,14 +93,14 @@@ public abstract class EPFusionBaseContr
  		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());