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 ad012ba..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
@@ -93,13 +93,14 @@ 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());