Merge "removed code smells"

3 files changed, 87 insertions, 69 deletions

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java
index 7d9f297c..103e3386 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAccessRolesController.java
@@ -4,6 +4,8 @@
  * ===================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ *  Modification Copyright © 2020 IBM.
+ * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -90,6 +92,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -124,8 +130,8 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	private UserService userservice =  new UserServiceCentalizedImpl();
 
 	@ApiOperation(value = "Gets user role for an application.", response = CentralUser.class, responseContainer="List")
-	@RequestMapping(value = {
-			"/user/{loginId}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/user/{loginId}" }, produces = "application/json")
 	public CentralUser getUser(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("loginId") String loginId) throws Exception {
 		if (!DATA_VALIDATOR.isValid(new SecureString(loginId))){
@@ -145,8 +151,8 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets user roles for an application which is upgraded to newer version.", response = String.class, responseContainer="List")
-	@RequestMapping(value = {
-			"/v1/user/{loginId}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/v1/user/{loginId}" }, produces = "application/json")
 	public String getV2UserList(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("loginId") String loginId) throws Exception {
 		if (!DATA_VALIDATOR.isValid(new SecureString(loginId))){
@@ -166,8 +172,8 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets roles for an application.", response = CentralRole.class, responseContainer="Json")
-	@RequestMapping(value = {
-			"/roles" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/roles" }, produces = "application/json")
 	public List<CentralRole> getRolesForApp(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		logger.debug(EELFLoggerDelegate.debugLogger, "Request received for getRolesForApp");
 		List<CentralV2Role> v2CenRole = null;
@@ -190,8 +196,8 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets roles for an application which is upgraded to newer version.", response = CentralV2Role.class, responseContainer="Json")
-	@RequestMapping(value = {
-			"/v1/roles" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/v1/roles" }, produces = "application/json")
 	public List<CentralV2Role> getV2RolesForApp(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		logger.debug(EELFLoggerDelegate.debugLogger, "Request received for getV2RolesForApp");
 		List<CentralV2Role> answer = null;
@@ -212,8 +218,8 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 
 	@ApiOperation(value = "Gets all role functions for an application for older version.", response = CentralRoleFunction.class, responseContainer="Json")
-	@RequestMapping(value = {
-			"/functions" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/functions" }, produces = "application/json")
 	public List<CentralRoleFunction> getRoleFunctionsList(HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
 		List<CentralV2RoleFunction> answer = null;
@@ -237,8 +243,8 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}	
 	
 	@ApiOperation(value = "Gets all role functions for an application which is upgraded to newer version.", response = CentralV2RoleFunction.class, responseContainer="Json")
-	@RequestMapping(value = {
-			"/v1/functions" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/v1/functions" }, produces = "application/json")
 	public List<CentralV2RoleFunction> getV2RoleFunctionsList(HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
 		List<CentralV2RoleFunction> cenRoleFuncList = null;
@@ -261,8 +267,8 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	
 
 	@ApiOperation(value = "Gets role information for an application.", response = CentralRole.class, responseContainer="Json")
-	@RequestMapping(value = {
-			"/role/{role_id}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/role/{role_id}" }, produces = "application/json")
 	public CentralRole getRoleInfo(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("role_id") Long roleId) throws Exception {
 		CentralV2Role answer = null;
@@ -281,8 +287,8 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets v2 role information for an application which is upgraded to newer version.", response = CentralV2Role.class, responseContainer="Json")
-	@RequestMapping(value = {
-			"/v1/role/{role_id}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/v1/role/{role_id}" }, produces = "application/json")
 	public CentralV2Role getV2RoleInfo(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("role_id") Long roleId) throws Exception {
 		CentralV2Role answer = null;
@@ -299,7 +305,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets role information for an application provided by function code.", response = CentralRoleFunction.class, responseContainer = "Json")
-	@RequestMapping(value = { "/function/{code}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/function/{code}" }, produces = "application/json")
 	public CentralRoleFunction getRoleFunction(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("code") String code) throws Exception {
 		CentralV2RoleFunction centralV2RoleFunction = null;
@@ -322,7 +328,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets role information for an application provided by function code.", response = CentralV2RoleFunction.class, responseContainer = "Json")
-	@RequestMapping(value = { "/v1/function/{code}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/v1/function/{code}" }, produces = "application/json")
 	public CentralV2RoleFunction getV2RoleFunction(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("code") String code) throws Exception {
 		CentralV2RoleFunction centralV2RoleFunction = null;
@@ -344,7 +350,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 
 	@ApiOperation(value = "Saves role function for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/roleFunction" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/roleFunction" }, produces = "application/json")
 	public PortalRestResponse<String> saveRoleFunction(HttpServletRequest request, HttpServletResponse response,
 			@RequestBody String roleFunc) {
 		String status = "Successfully saved!";
@@ -437,7 +443,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Deletes role function for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/roleFunction/{code}" }, method = RequestMethod.DELETE, produces = "application/json")
+	@DeleteMapping(value = { "/roleFunction/{code}" }, produces = "application/json")
 	public PortalRestResponse<String> deleteRoleFunction(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("code") String code) {
 		if(!DATA_VALIDATOR.isValid(new SecureString(code))){
@@ -492,7 +498,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}	
 	
 	@ApiOperation(value = "Saves role for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/role" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/role" }, produces = "application/json")
 	public PortalRestResponse<String> saveRole(HttpServletRequest request, HttpServletResponse response,
 			@RequestBody Role role) {
 		try {
@@ -553,7 +559,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Deletes role for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/deleteRole/{code}" }, method = RequestMethod.DELETE, produces = "application/json")
+	@DeleteMapping(value = { "/deleteRole/{code}" }, produces = "application/json")
 	public  PortalRestResponse<String> deleteRole(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable String code) {
 		if(!DATA_VALIDATOR.isValid(new SecureString(code))){
@@ -608,7 +614,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets active roles for an application.", response = CentralRole.class, responseContainer = "Json")
-	@RequestMapping(value = { "/activeRoles" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/activeRoles" }, produces = "application/json")
 	public  List<CentralRole> getActiveRoles(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		List<CentralRole> roles = null;
 		try {
@@ -624,7 +630,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets active roles for an application.", response = CentralV2Role.class, responseContainer = "Json")
-	@RequestMapping(value = { "/v1/activeRoles" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/v1/activeRoles" }, produces = "application/json")
 	public  List<CentralV2Role> getV2ActiveRoles(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		List<CentralV2Role> cenRole = null;
 		try {
@@ -639,7 +645,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "deletes user roles for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/deleteDependcyRoleRecord/{roleId}" }, method = RequestMethod.DELETE, produces = "application/json")
+	@DeleteMapping(value = { "/deleteDependcyRoleRecord/{roleId}" }, produces = "application/json")
 	public PortalRestResponse<String> deleteDependencyRoleRecord(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("roleId") Long roleId) {
 		ExternalRequestFieldsValidator removeResult = null;
@@ -666,7 +672,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	
 	
 	@ApiOperation(value = "deletes  roles for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/v2/deleteRole/{roleId}" }, method = RequestMethod.DELETE, produces = "application/json")
+	@DeleteMapping(value = { "/v2/deleteRole/{roleId}" }, produces = "application/json")
 	public PortalRestResponse<String> deleteRole(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("roleId") Long roleId) {
 		ExternalRequestFieldsValidator removeResult = null;
@@ -693,7 +699,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	
 	
 	@ApiOperation(value = "Bulk upload functions for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/upload/portal/functions" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/upload/portal/functions" }, produces = "application/json")
 	public  PortalRestResponse<String> bulkUploadFunctions(HttpServletRequest request, HttpServletResponse response) {
 		Integer result = 0;
 		try {
@@ -707,7 +713,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Bulk upload roles for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/upload/portal/roles" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/upload/portal/roles" }, produces = "application/json")
 	public  PortalRestResponse<String> bulkUploadRoles(HttpServletRequest request, HttpServletResponse response) {
 		Integer result = 0;
 		try {
@@ -721,7 +727,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Bulk upload role functions for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/upload/portal/roleFunctions" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/upload/portal/roleFunctions" }, produces = "application/json")
 	public  PortalRestResponse<String> bulkUploadRoleFunctions(HttpServletRequest request, HttpServletResponse response) {
 		Integer result = 0;
 		try {
@@ -735,7 +741,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Bulk upload user roles for an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/upload/portal/userRoles" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/upload/portal/userRoles" }, produces = "application/json")
 	public  PortalRestResponse<String> bulkUploadUserRoles(HttpServletRequest request, HttpServletResponse response) {
 		Integer result = 0;
 		try {
@@ -749,7 +755,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Bulk upload users for renamed role of an application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/upload/portal/userRole/{roleId}" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/upload/portal/userRole/{roleId}" }, produces = "application/json")
 	public  PortalRestResponse<String> bulkUploadUsersSingleRole(HttpServletRequest request, HttpServletResponse response, @PathVariable Long roleId) {
 		Integer result = 0;
 		try {
@@ -764,7 +770,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Bulk upload functions for an partner application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/upload/partner/functions" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/upload/partner/functions" }, produces = "application/json")
 	public  PortalRestResponse<String> bulkUploadPartnerFunctions(HttpServletRequest request, HttpServletResponse response) {
 		Integer addedFunctions = 0;
 		try {
@@ -779,7 +785,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Bulk upload roles for an partner application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/upload/partner/roles" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/upload/partner/roles" }, produces = "application/json")
 	public  PortalRestResponse<String> bulkUploadPartnerRoles(HttpServletRequest request, HttpServletResponse response, @RequestBody List<Role> upload) {
 		try {
 			externalAccessRolesService.bulkUploadPartnerRoles(request.getHeader(UEBKEY), upload);
@@ -792,7 +798,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Bulk upload role functions for an partner application.", response = PortalRestResponse.class, responseContainer = "Json")
-	@RequestMapping(value = { "/upload/partner/roleFunctions" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/upload/partner/roleFunctions" }, produces = "application/json")
 	public  PortalRestResponse<String> bulkUploadPartnerRoleFunctions(HttpServletRequest request, HttpServletResponse response) {
 		Integer addedRoleFunctions = 0;
 		try {
@@ -808,7 +814,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets all functions along with global functions", response = List.class, responseContainer = "Json")
-	@RequestMapping(value = { "/menuFunctions" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/menuFunctions" }, produces = "application/json")
 	public  List<String> getMenuFunctions(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		List<String> functionsList = null;
 		try {
@@ -822,7 +828,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets all active Users of application", response = String.class, responseContainer = "Json")
-	@RequestMapping(value = { "/users" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/users" }, produces = "application/json")
 	public  List<EcompUser> getUsersOfApplication(HttpServletRequest request, HttpServletResponse response) throws Exception {
 		List<EcompUser> users = null;
 		try {
@@ -882,7 +888,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 	
 	@ApiOperation(value = "Gets ecompUser of an application.", response = CentralUser.class, responseContainer = "List")
-	@RequestMapping(value = { "/v2/user/{loginId}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/v2/user/{loginId}" }, produces = "application/json")
 	public String getEcompUser(HttpServletRequest request, HttpServletResponse response,
 			@PathVariable("loginId") String loginId) throws Exception {
 		if(!DATA_VALIDATOR.isValid(new SecureString(loginId))){
@@ -913,7 +919,7 @@ public class ExternalAccessRolesController implements BasicAuthenticationControl
 	}
 
 	@ApiOperation(value = "Gets user ecomp role for an application.", response = CentralUser.class, responseContainer = "List")
-	@RequestMapping(value = { "/v2/roles" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/v2/roles" }, produces = "application/json")
 	public List<EcompRole> getEcompRolesOfApplication(HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
 		List<EcompRole> ecompRoles = null;
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java
index d77475ca..bc2c19b5 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ExternalAppsRestfulController.java
@@ -6,6 +6,8 @@
  * ===================================================================
  *  Modifications Copyright (c) 2019 Samsung
  * ===================================================================
+ *  Modification Copyright © 2020 IBM.
+ * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -82,6 +84,10 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -114,7 +120,7 @@ public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseContro
 	private EPRoleService epRoleService;
 
 	@ApiOperation(value = "Creates a Portal user notification for roles identified in the content from an external application.", response = PortalAPIResponse.class)
-	@RequestMapping(value = { "/publishNotification" }, method = RequestMethod.POST, produces = "application/json")
+	@PostMapping(value = { "/publishNotification" }, produces = "application/json")
 	@ResponseBody
 	public PortalAPIResponse publishNotification(HttpServletRequest request,
 			@RequestBody EpNotificationItem notificationItem) throws Exception {
@@ -174,7 +180,7 @@ public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseContro
 	}
 
 	@ApiOperation(value = "Gets favorite items within the functional menu for the current user.", response = FavoritesFunctionalMenuItemJson.class, responseContainer="List")
-	@RequestMapping(value = { "/getFavorites" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/getFavorites" }, produces = "application/json")
 	public List<FavoritesFunctionalMenuItemJson> getFavoritesForUser(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
 		String loginId = "";
@@ -203,8 +209,8 @@ public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseContro
 	}
 
 	@ApiOperation(value = "Gets functional menu items appropriate for the current user.", response = FunctionalMenuItem.class, responseContainer="List")
-	@RequestMapping(value = {
-			"/functionalMenuItemsForUser" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/functionalMenuItemsForUser" }, produces = "application/json")
 	public List<FunctionalMenuItem> getFunctionalMenuItemsForUser(HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
 		String loginId = "";
@@ -246,7 +252,7 @@ public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseContro
 	}
 	
 	@EPAuditLog
-	@RequestMapping(value = { "/validateCookie" }, method = RequestMethod.POST)
+	@PostMapping(value = { "/validateCookie" })
 	public boolean validateCookie(@RequestBody EPServiceCookie epServiceCookie, HttpServletRequest request) throws Exception {
 		Map<String,String> epServiceCookieValueMap = epServiceCookie.getValue();
 		if(epServiceCookieValueMap!=null) {
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/FunctionalMenuController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/FunctionalMenuController.java
index 4a94748b..65abc280 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/FunctionalMenuController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/FunctionalMenuController.java
@@ -4,6 +4,8 @@
  * ===================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ *  Modification Copyright © 2020 IBM.
+ * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -82,6 +84,10 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -116,7 +122,7 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            HttpServletResponse
 	 * @return List of FunctionalMenuItem objects
 	 */
-	@RequestMapping(value = { "/portalApi/functionalMenu" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/portalApi/functionalMenu" }, produces = "application/json")
 	public List<FunctionalMenuItem> getMenuItems(HttpServletRequest request, HttpServletResponse response) {
 		// TODO: should only the superuser be allowed to use this API?
 		List<FunctionalMenuItem> menuItems = null;
@@ -139,7 +145,7 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            HttpServletResponse
 	 * @return PortalRestResponse of ONAP portal title
 	 */
-	@RequestMapping(value = { "/portalApi/ecompTitle" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/portalApi/ecompTitle" }, produces = "application/json")
 	public PortalRestResponse<String> getECOMPTitle(HttpServletRequest request, HttpServletResponse response) {
 		PortalRestResponse<String> portalRestResponse = null;
 		try {
@@ -164,8 +170,8 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            HttpServletResponse
 	 * @return List of FunctionalMenuItem objects
 	 */
-	@RequestMapping(value = {
-			"/portalApi/functionalMenuForEditing" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/functionalMenuForEditing" }, produces = "application/json")
 	public List<FunctionalMenuItem> getMenuItemsForEditing(HttpServletRequest request, HttpServletResponse response) {
 		// TODO: should only the superuser be allowed to use this API?
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -194,8 +200,8 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            HttpServletResponse
 	 * @return List of FunctionalMenuItem objects
 	 */
-	@RequestMapping(value = {
-			"/portalApi/functionalMenuForNotificationTree" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/functionalMenuForNotificationTree" }, produces = "application/json")
 	public List<FunctionalMenuItem> getMenuItemsForNotifications(HttpServletRequest request,
 			HttpServletResponse response) {
 		// TODO: should only the superuser be allowed to use this API?
@@ -221,8 +227,8 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            application ID
 	 * @return List of FunctionalMenuItem objects
 	 */
-	@RequestMapping(value = {
-			"/portalApi/functionalMenuForApp/{appId}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/functionalMenuForApp/{appId}" }, produces = "application/json")
 	public List<FunctionalMenuItem> getMenuItemsForApp(HttpServletRequest request,
 			@PathVariable("appId") Integer appId) {
 		// TODO: should only the superuser be allowed to use this API?
@@ -248,8 +254,8 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            user ID
 	 * @return List of FunctionalMenuItem objects
 	 */
-	@RequestMapping(value = {
-			"/portalApi/functionalMenuForUser/{orgUserId}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/functionalMenuForUser/{orgUserId}" }, produces = "application/json")
 	public List<FunctionalMenuItem> getMenuItemsForUser(HttpServletRequest request,
 			@PathVariable("orgUserId") String orgUserId) {
 		// TODO: should only the superuser be allowed to use this API?
@@ -276,8 +282,8 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            HttpServletResponse
 	 * @return List of FunctionalMenuItem objects
 	 */
-	@RequestMapping(value = {
-			"/portalApi/functionalMenuForAuthUser" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/functionalMenuForAuthUser" }, produces = "application/json")
 	public List<FunctionalMenuItem> getMenuItemsForAuthUser(HttpServletRequest request, HttpServletResponse response) {
 
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -313,8 +319,8 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            menu ID
 	 * @return FunctionalMenuItem object
 	 */
-	@RequestMapping(value = {
-			"/portalApi/functionalMenuItemDetails/{menuId}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/functionalMenuItemDetails/{menuId}" }, produces = "application/json")
 	public FunctionalMenuItem getFunctionalMenuItemDetails(HttpServletRequest request,
 			@PathVariable("menuId") Long menuId, HttpServletResponse response) {
 		// TODO: return FunctionalMenuItemJson
@@ -349,7 +355,7 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            FunctionalMenuItemWithRoles
 	 * @return FieldsValidator
 	 */
-	@RequestMapping(value = { "/portalApi/functionalMenuItem" }, method = RequestMethod.POST)
+	@PostMapping(value = { "/portalApi/functionalMenuItem" })
 	public FieldsValidator createFunctionalMenuItem(HttpServletRequest request,
 			@RequestBody FunctionalMenuItemWithRoles menuItemJson, HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -389,7 +395,7 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            FunctionalMenuItemWithRoles
 	 * @return FieldsValidator
 	 */
-	@RequestMapping(value = { "/portalApi/functionalMenuItem" }, method = RequestMethod.PUT)
+	@PutMapping(value = { "/portalApi/functionalMenuItem" })
 	public FieldsValidator editFunctionalMenuItem(HttpServletRequest request,
 			@RequestBody FunctionalMenuItemWithRoles menuItemJson, HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -425,7 +431,7 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            menu identifier
 	 * @return FieldsValidator
 	 */
-	@RequestMapping(value = { "/portalApi/functionalMenuItem/{menuId}" }, method = RequestMethod.DELETE)
+	@DeleteMapping(value = { "/portalApi/functionalMenuItem/{menuId}" })
 	public FieldsValidator deleteFunctionalMenuItem(HttpServletRequest request, @PathVariable("menuId") Long menuId,
 			HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -451,7 +457,7 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            HttpServletResponse
 	 * @return FieldsValidator
 	 */
-	@RequestMapping(value = { "/portalApi/regenerateFunctionalMenuAncestors" }, method = RequestMethod.GET)
+	@GetMapping(value = { "/portalApi/regenerateFunctionalMenuAncestors" })
 	public FieldsValidator regenerateAncestorTable(HttpServletRequest request, HttpServletResponse response) {
 		// TODO: should only the superuser be allowed to use this API?
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -480,7 +486,7 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            FunctionalMenuItemWithRoles
 	 * @return FieldsValidator
 	 */
-	@RequestMapping(value = { "/portalApi/setFavoriteItem" }, method = RequestMethod.POST)
+	@PostMapping(value = { "/portalApi/setFavoriteItem" })
 	public FieldsValidator addFavoriteItem(HttpServletRequest request,
 			@RequestBody FavoritesFunctionalMenuItem menuItemJson, HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -504,8 +510,8 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            HttpServletResponse
 	 * @return List of FavoritesFunctionalMenuItemJson
 	 */
-	@RequestMapping(value = {
-			"/portalApi/getFavoriteItems" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/getFavoriteItems" }, produces = "application/json")
 	public List<FavoritesFunctionalMenuItemJson> getFavoritesForUser(HttpServletRequest request,
 			HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -529,7 +535,7 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            menu identifier
 	 * @return FieldsValidator
 	 */
-	@RequestMapping(value = { "/portalApi/removeFavoriteItem/{menuId}" }, method = RequestMethod.DELETE)
+	@DeleteMapping(value = { "/portalApi/removeFavoriteItem/{menuId}" })
 	public FieldsValidator deleteFavoriteItem(HttpServletRequest request, @PathVariable("menuId") Long menuId,
 			HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -556,8 +562,8 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 *            HttpServletResponse
 	 * @return JSON collection of key-value pairs shown below.
 	 */
-	@RequestMapping(value = {
-			"/portalApi/functionalMenuStaticInfo" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/functionalMenuStaticInfo" }, produces = "application/json")
 	public String getFunctionalMenuStaticInfo(HttpServletRequest request, HttpServletResponse response) {
 
 		// Get user details from session
@@ -648,8 +654,8 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 	 * @throws IOException
 	 *             on error
 	 */
-	@RequestMapping(value = {
-			"/portalApi/userApplicationRoles" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/userApplicationRoles" }, produces = "application/json")
 	public List<BusinessCardApplicationRolesList> getAppList(HttpServletRequest request, HttpServletResponse response,
 			@RequestParam("userId") String userId) throws IOException {