diff options
Diffstat (limited to 'ecomp-portal-BE-common')
2 files changed, 11 insertions, 6 deletions
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 611d9665..8d296c93 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 @@ -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 @@ -74,7 +76,7 @@ public abstract class EPFusionBaseController extends FusionBaseController { @ModelAttribute("menu") public Map<String, Object> messages(HttpServletRequest request) { HttpSession session = null; - Map<String, Object> model = new HashMap<String, Object>(); + Map<String, Object> model = new HashMap<>(); session = request.getSession(); EPUser user = EPUserUtils.getUserSession(request); if (session != null && user != null) { @@ -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(); diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/sessionmgt/SessionCommunicationController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/sessionmgt/SessionCommunicationController.java index 46903284..d36cf6cb 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/sessionmgt/SessionCommunicationController.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/controller/sessionmgt/SessionCommunicationController.java @@ -3,6 +3,8 @@ * ONAP Portal * =================================================================== * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2019 IBM. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -81,7 +83,7 @@ public class SessionCommunicationController extends EPRestrictedRESTfulBaseCont @ApiOperation(value = "Extends session timeout values for all on-boarded applications.", response = Boolean.class) @RequestMapping(value={"/extendSessionTimeOuts"}, method = RequestMethod.POST) - public Boolean extendSessionTimeOuts(HttpServletRequest request, HttpServletResponse response, @RequestParam String sessionMap) throws Exception { + public Boolean extendSessionTimeOuts(HttpServletRequest request, HttpServletResponse response, @RequestParam String sessionMap) { manageService.extendSessionTimeOuts(sessionMap); return true; |