From: Manoop Talasila <talasila@research.att.com>
Date: Thu, 7 Feb 2019 21:30:13 +0000 (+0000)
Subject: Merge "PORTAL-492 - EPFusionBaseController.java"
X-Git-Tag: 3.2.0~354
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=commitdiff_plain;h=10857e4a304e12d37c92cae86199f1acb10af01e;hp=6d26b8b5ad3980e1d46edc6b221ce6e96fbf19d3

Merge "PORTAL-492 - 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 0298b9ae..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
@@ -96,18 +96,18 @@ public abstract class EPFusionBaseController extends FusionBaseController {
 	@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;