Merge "PORTAL-492 - EPFusionBaseController.java"

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / controller / EPFusionBaseController.java

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 a425812..f99c19a 100644 (file)
--- 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;
 
@@ -91,20 +93,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();