X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fcontroller%2FEPFusionBaseController.java;h=f99c19acb753a1b57551a9b3268dffb81beac5b6;hb=10857e4a304e12d37c92cae86199f1acb10af01e;hp=792db8955dd1d89cd21df254dcaecf5ad72c079a;hpb=21af581d08e3c4c06b129675356f13725d2539a4;p=portal.git 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 792db895..f99c19ac 100644 --- 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,11 +93,12 @@ public abstract class EPFusionBaseController extends FusionBaseController { return model; } + @Override public Map setMenu(Set menuResult) throws Exception { ObjectMapper mapper = new ObjectMapper(); - List> childItemList = new ArrayList>(); + List> childItemList = new ArrayList<>(); - List parentList = new ArrayList(); + List parentList = new ArrayList<>(); Map model = new HashMap<>(); for (MenuData menu : menuResult) { @@ -106,7 +107,7 @@ public abstract class EPFusionBaseController extends FusionBaseController { parentData.setAction(menu.getAction()); parentData.setImageSrc(menu.getImageSrc()); parentList.add(parentData); - List tempList = new ArrayList(); + List tempList = new ArrayList<>(); for (Object o : menu.getChildMenus()) { MenuData m = (MenuData) o; MenuData data = new MenuData();