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

Merge "PORTAL-493 - EPFusionBaseController.java"
---

b1b80420a62fd269b980d316339d3ad4d359be43
diff --cc ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
index cc6c78c2,90d7ae50..44281868
--- 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
@@@ -95,11 -95,11 +95,11 @@@ public abstract class EPFusionBaseContr
  
  	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());