Merge "PORTAL-492 - EPFusionBaseController.java"

diff --combined ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
index 4428186,0298b9a..f99c19a
--- 1/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/EPFusionBaseController.java
--- 2/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,20 -93,21 +93,21 @@@ 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());
                        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();