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=ce4e8942e999e3309a9b9e644104a11ac0117197;hpb=281b91cbaa5e3459b10d563ef29af27d326f140d;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 ce4e8942..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; } @@ -76,7 +77,7 @@ public abstract class EPFusionBaseController extends FusionBaseController { @ModelAttribute("menu") public Map messages(HttpServletRequest request) { HttpSession session = null; - Map model = new HashMap(); + Map model = new HashMap<>(); session = request.getSession(); EPUser user = EPUserUtils.getUserSession(request); if (session != null && user != null) { @@ -93,11 +94,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) {