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

Merge "PORTAL-494 - EPFusionBaseController.java"
---

c8bfa7bdcc3687bfad31ab14fa804f3eb0b9d44e
diff --cc ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
index ce4e8942,ecd5cd5e..cc6c78c2
--- 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
@@@ -97,9 -97,9 +97,9 @@@ public abstract class EPFusionBaseContr
  		ObjectMapper mapper = new ObjectMapper();
  		List<List<MenuData>> childItemList = new ArrayList<List<MenuData>>();
  		
- 		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());