X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FPortalAdminController.java;h=563a387abe56e43da56bfa4ac83503f2df1dfbf6;hb=ad4dc7cf7d0411a08733bfef27a6954a098f7052;hp=32b28c7dab98e6714e84cd1952de58597c8a3391;hpb=21e503048d2d083e532064de6aab0fcb7ae0dea1;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/PortalAdminController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/PortalAdminController.java
index 32b28c7d..563a387a 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/PortalAdminController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/PortalAdminController.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");
@@ -69,6 +71,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.RestController;
 
@@ -92,7 +98,7 @@ public class PortalAdminController extends EPRestrictedBaseController {
 		this.auditService = auditService;
 	}
 
-	@RequestMapping(value = { "/portalApi/portalAdmins" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = { "/portalApi/portalAdmins" }, produces = "application/json")
 	public List<PortalAdmin> getPortalAdmins(HttpServletRequest request, HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);
 		List<PortalAdmin> portalAdmins = null;
@@ -120,7 +126,7 @@ public class PortalAdminController extends EPRestrictedBaseController {
 	 * @param response 
 	 * @return FieldsValidator 
 	 */
-	@RequestMapping(value = { "/portalApi/portalAdmin" }, method = RequestMethod.POST)
+	@PostMapping(value = { "/portalApi/portalAdmin" })
 	public FieldsValidator createPortalAdmin(HttpServletRequest request, @RequestBody String userId,
 			HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);
@@ -167,7 +173,7 @@ public class PortalAdminController extends EPRestrictedBaseController {
 		return fieldsValidator;
 	}
 
-	@RequestMapping(value = { "/portalApi/portalAdmin/{userInfo}" }, method = RequestMethod.DELETE)
+	@DeleteMapping(value = { "/portalApi/portalAdmin/{userInfo}" })
 	public FieldsValidator deletePortalAdmin(HttpServletRequest request, @PathVariable("userInfo") String userInfo,
 			HttpServletResponse response) {
 
@@ -225,8 +231,8 @@ public class PortalAdminController extends EPRestrictedBaseController {
 		return fieldsValidator;
 	}
 
-	@RequestMapping(value = {
-			"/portalApi/adminAppsRoles/{appId}" }, method = RequestMethod.GET, produces = "application/json")
+	@GetMapping(value = {
+			"/portalApi/adminAppsRoles/{appId}" }, produces = "application/json")
 	public List<EPRole> getRolesByApp(HttpServletRequest request, @PathVariable("appId") Long appId,
 			HttpServletResponse response) {
 		EPUser user = EPUserUtils.getUserSession(request);