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=05dc3c9dc2fb00f717ebac77184eca6799db6730;hb=05bee83afa43b3eb1eeff209592179436cb7dd0e;hp=9d801b01b7f32ab6676e80682c25186bc63b25d5;hpb=e89e85459d467ecaf794e79ca56c3d1083b77290;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 9d801b01..05dc3c9d 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 @@ -69,6 +69,7 @@ public abstract class EPFusionBaseController extends FusionBaseController { return true; } + @Override public boolean isRESTfulCall() { return true; } @@ -93,20 +94,21 @@ 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(); + Map 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 tempList = new ArrayList(); + List tempList = new ArrayList<>(); for (Object o : menu.getChildMenus()) { MenuData m = (MenuData) o; MenuData data = new MenuData();