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%2FRoleManageController.java;h=e2dd6588b804619bce23ed831d7ef5d527959997;hb=6a1b66d85bc824234d01627b826fdd528869f2ed;hp=9a525b5128c2b5ecc0350283f6ae16f62a3a7c96;hpb=86ba2484d74af450e6a657bc00a0575df1c1c3b0;p=portal.git diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java index 9a525b51..e2dd6588 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java @@ -46,10 +46,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import javax.validation.ConstraintViolation; import javax.validation.Valid; import javax.validation.Validation; @@ -101,7 +99,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; - import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -333,7 +330,7 @@ public class RoleManageController extends EPRestrictedBaseController { if (existRole.getName().equalsIgnoreCase(role.getName())) throw new DuplicateRecordException("Role already exists: " + existRole.getName()); - domainRole = new CentralV2Role(); + domainRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); domainRole.setName(role.getName()); domainRole.setPriority(role.getPriority()); domainRole.setActive(role.getActive()); @@ -517,6 +514,7 @@ public class RoleManageController extends EPRestrictedBaseController { return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "Data is not valid", "ERROR"); } } + EPUser user = EPUserUtils.getUserSession(request); boolean saveOrUpdateResponse = false; try { @@ -691,6 +689,7 @@ public class RoleManageController extends EPRestrictedBaseController { return null; } } + EPUser user = EPUserUtils.getUserSession(request); List applicationsList = null; if (adminRolesService.isAccountAdmin(user) || adminRolesService.isSuperAdmin(user)