X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FExternalAccessRolesServiceImpl.java;h=4e83b9218850b30191f58f64710e22847fcec782;hb=8e83c25788017acd56271a72286f7dcbc974e76d;hp=786ad42990d6e94f470fb2f68e6e7e050b494a63;hpb=d9a26e7fe8c2dfee2ea43ae697278e11f10f31e9;p=portal.git diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java index 786ad429..4e83b921 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java @@ -1158,7 +1158,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic @SuppressWarnings("unchecked") private CentralV2User createEPUser(EPUser userInfo, Set userAppSet, EPApp app) throws Exception { final Map params = new HashMap<>(); - CentralV2User userAppList = new CentralV2User(); + CentralV2User userAppList = new CentralV2User.CentralV2UserBuilder().createCentralV2User(); CentralV2User user1 = null; final Map params1 = new HashMap<>(); List globalRoleList = new ArrayList<>(); @@ -1179,14 +1179,19 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic && (globalRole.toLowerCase().startsWith("global_")))) { CentralV2UserApp cua = new CentralV2UserApp(); cua.setUserId(null); - CentralApp cenApp = new CentralApp(1L, epApp.getCreated(), epApp.getModified(), - epApp.getCreatedId(), epApp.getModifiedId(), epApp.getRowNum(), epApp.getName(), - epApp.getImageUrl(), epApp.getDescription(), epApp.getNotes(), epApp.getUrl(), - epApp.getAlternateUrl(), epApp.getAppRestEndpoint(), epApp.getMlAppName(), - epApp.getMlAppAdminId(), String.valueOf(epApp.getMotsId()), epApp.getAppPassword(), - String.valueOf(epApp.getOpen()), String.valueOf(epApp.getEnabled()), - epApp.getThumbnail(), epApp.getUsername(), epApp.getUebKey(), epApp.getUebSecret(), - epApp.getUebTopicName()); + CentralApp cenApp = new CentralApp.CentralAppBuilder().setId(1L).setCreated(epApp.getCreated()) + .setModified(epApp.getModified()).setCreatedId(epApp.getCreatedId()) + .setModifiedId(epApp.getModifiedId()).setRowNum(epApp.getRowNum()) + .setName(epApp.getName()).setImageUrl(epApp.getImageUrl()) + .setDescription(epApp.getDescription()).setNotes(epApp.getNotes()) + .setUrl(epApp.getUrl()).setAlternateUrl(epApp.getAlternateUrl()) + .setRestEndpoint(epApp.getAppRestEndpoint()).setMlAppName(epApp.getMlAppName()) + .setMlAppAdminId(epApp.getMlAppAdminId()).setMotsId(String.valueOf(epApp.getMotsId())) + .setAppPassword(epApp.getAppPassword()).setOpen(String.valueOf(epApp.getOpen())) + .setEnabled(String.valueOf(epApp.getEnabled())).setThumbnail(epApp.getThumbnail()) + .setUsername(epApp.getUsername()).setUebKey(epApp.getUebKey()) + .setUebSecret(epApp.getUebSecret()).setUebTopicName(epApp.getUebTopicName()) + .createCentralApp(); cenApp.setAppPassword(EPCommonSystemProperties.APP_DISPLAY_PASSWORD); cua.setApp(cenApp); Long appId = null; @@ -1224,31 +1229,45 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic } else { userRoleId = userApp.getRole().getAppRoleId(); } - CentralV2Role cenRole = new CentralV2Role(userRoleId, userApp.getRole().getCreated(), - userApp.getRole().getModified(), userApp.getRole().getCreatedId(), - userApp.getRole().getModifiedId(), userApp.getRole().getRowNum(), - userApp.getRole().getName(), userApp.getRole().getActive(), - userApp.getRole().getPriority(), roleFunctionSet, null, null); + CentralV2Role cenRole = new CentralV2Role.CentralV2RoleBuilder().setId(userRoleId) + .setCreated(userApp.getRole().getCreated()).setModified(userApp.getRole().getModified()) + .setCreatedId(userApp.getRole().getCreatedId()) + .setModifiedId(userApp.getRole().getModifiedId()) + .setRowNum(userApp.getRole().getRowNum()).setName(userApp.getRole().getName()) + .setActive(userApp.getRole().getActive()).setPriority(userApp.getRole().getPriority()) + .setRoleFunctions(roleFunctionSet).setChildRoles(null).setParentRoles(null) + .createCentralV2Role(); cua.setRole(cenRole); userAppList.getUserApps().add(cua); } } } - user1 = new CentralV2User(null, userInfo.getCreated(), userInfo.getModified(), userInfo.getCreatedId(), - userInfo.getModifiedId(), userInfo.getRowNum(), userInfo.getOrgId(), userInfo.getManagerId(), - userInfo.getFirstName(), userInfo.getMiddleInitial(), userInfo.getLastName(), userInfo.getPhone(), - userInfo.getFax(), userInfo.getCellular(), userInfo.getEmail(), userInfo.getAddressId(), - userInfo.getAlertMethodCd(), userInfo.getHrid(), userInfo.getOrgUserId(), userInfo.getOrgCode(), - userInfo.getAddress1(), userInfo.getAddress2(), userInfo.getCity(), userInfo.getState(), - userInfo.getZipCode(), userInfo.getCountry(), userInfo.getOrgManagerUserId(), - userInfo.getLocationClli(), userInfo.getBusinessCountryCode(), userInfo.getBusinessCountryName(), - userInfo.getBusinessUnit(), userInfo.getBusinessUnitName(), userInfo.getDepartment(), - userInfo.getDepartmentName(), userInfo.getCompanyCode(), userInfo.getCompany(), - userInfo.getZipCodeSuffix(), userInfo.getJobTitle(), userInfo.getCommandChain(), - userInfo.getSiloStatus(), userInfo.getCostCenter(), userInfo.getFinancialLocCode(), - userInfo.getLoginId(), userInfo.getLoginPwd(), userInfo.getLastLoginDate(), userInfo.getActive(), - userInfo.getInternal(), userInfo.getSelectedProfileId(), userInfo.getTimeZoneId(), - userInfo.isOnline(), userInfo.getChatId(), userAppList.getUserApps(), null); + user1 = new CentralV2User.CentralV2UserBuilder().setId(null).setCreated(userInfo.getCreated()) + .setModified(userInfo.getModified()).setCreatedId(userInfo.getCreatedId()) + .setModifiedId(userInfo.getModifiedId()).setRowNum(userInfo.getRowNum()) + .setOrgId(userInfo.getOrgId()).setManagerId(userInfo.getManagerId()) + .setFirstName(userInfo.getFirstName()).setMiddleInitial(userInfo.getMiddleInitial()) + .setLastName(userInfo.getLastName()).setPhone(userInfo.getPhone()).setFax(userInfo.getFax()) + .setCellular(userInfo.getCellular()).setEmail(userInfo.getEmail()) + .setAddressId(userInfo.getAddressId()).setAlertMethodCd(userInfo.getAlertMethodCd()) + .setHrid(userInfo.getHrid()).setOrgUserId(userInfo.getOrgUserId()).setOrgCode(userInfo.getOrgCode()) + .setAddress1(userInfo.getAddress1()).setAddress2(userInfo.getAddress2()).setCity(userInfo.getCity()) + .setState(userInfo.getState()).setZipCode(userInfo.getZipCode()).setCountry(userInfo.getCountry()) + .setOrgManagerUserId(userInfo.getOrgManagerUserId()).setLocationClli(userInfo.getLocationClli()) + .setBusinessCountryCode(userInfo.getBusinessCountryCode()) + .setBusinessCountryName(userInfo.getBusinessCountryName()) + .setBusinessUnit(userInfo.getBusinessUnit()).setBusinessUnitName(userInfo.getBusinessUnitName()) + .setDepartment(userInfo.getDepartment()).setDepartmentName(userInfo.getDepartmentName()) + .setCompanyCode(userInfo.getCompanyCode()).setCompany(userInfo.getCompany()) + .setZipCodeSuffix(userInfo.getZipCodeSuffix()).setJobTitle(userInfo.getJobTitle()) + .setCommandChain(userInfo.getCommandChain()).setSiloStatus(userInfo.getSiloStatus()) + .setCostCenter(userInfo.getCostCenter()).setFinancialLocCode(userInfo.getFinancialLocCode()) + .setLoginId(userInfo.getLoginId()).setLoginPwd(userInfo.getLoginPwd()) + .setLastLoginDate(userInfo.getLastLoginDate()).setActive(userInfo.getActive()) + .setInternal(userInfo.getInternal()).setSelectedProfileId(userInfo.getSelectedProfileId()) + .setTimeZoneId(userInfo.getTimeZoneId()).setOnline(userInfo.isOnline()) + .setChatId(userInfo.getChatId()).setUserApps(userAppList.getUserApps()).setPseudoRoles(null) + .createCentralV2User(); } catch (Exception e) { logger.error(EELFLoggerDelegate.errorLogger, "createEPUser: createEPUser failed", e); throw e; @@ -1260,7 +1279,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic public CentralV2Role getRoleInfo(Long roleId, String uebkey) throws Exception { final Map params = new HashMap<>(); List roleList = new ArrayList<>(); - CentralV2Role cenRole = new CentralV2Role(); + CentralV2Role cenRole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); List roleInfo = null; List app = null; try { @@ -1308,8 +1327,9 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic return roleInfo; } + @Override @SuppressWarnings("unchecked") - private List getPortalAppRoleInfo(Long roleId) { + public List getPortalAppRoleInfo(Long roleId) { List roleInfo; final Map getPortalAppRoleParams = new HashMap<>(); getPortalAppRoleParams.put("roleId", roleId); @@ -1351,15 +1371,19 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic SortedSet childRoles = new TreeSet<>(); SortedSet parentRoles = new TreeSet<>(); CentralV2Role cenRole = null; - if (role.getAppRoleId() == null) { - cenRole = new CentralV2Role(role.getId(), role.getCreated(), role.getModified(), role.getCreatedId(), - role.getModifiedId(), role.getRowNum(), role.getName(), role.getActive(), role.getPriority(), - roleFunctionSet, childRoles, parentRoles); - } else { - cenRole = new CentralV2Role(role.getAppRoleId(), role.getCreated(), role.getModified(), - role.getCreatedId(), role.getModifiedId(), role.getRowNum(), role.getName(), role.getActive(), - role.getPriority(), roleFunctionSet, childRoles, parentRoles); - } + if (role.getAppRoleId() == null) { + cenRole = new CentralV2Role.CentralV2RoleBuilder().setId(role.getId()).setCreated(role.getCreated()) + .setModified(role.getModified()).setCreatedId(role.getCreatedId()) + .setModifiedId(role.getModifiedId()).setRowNum(role.getRowNum()).setName(role.getName()) + .setActive(role.getActive()).setPriority(role.getPriority()).setRoleFunctions(roleFunctionSet) + .setChildRoles(childRoles).setParentRoles(parentRoles).createCentralV2Role(); + } else { + cenRole = new CentralV2Role.CentralV2RoleBuilder().setId(role.getAppRoleId()) + .setCreated(role.getCreated()).setModified(role.getModified()).setCreatedId(role.getCreatedId()) + .setModifiedId(role.getModifiedId()).setRowNum(role.getRowNum()).setName(role.getName()) + .setActive(role.getActive()).setPriority(role.getPriority()).setRoleFunctions(roleFunctionSet) + .setChildRoles(childRoles).setParentRoles(parentRoles).createCentralV2Role(); + } roleList.add(cenRole); } return roleList; @@ -2869,7 +2893,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic roleFunction = dataAccessService.executeNamedQuery("getAppFunctionOnCodeAndAppId", appFuncsParams, null); } - if (!roleFunction.isEmpty()) { + if (!roleFunction.isEmpty() && roleId != null) { EPAppRoleFunction apRoleFunction = new EPAppRoleFunction(); apRoleFunction.setAppId(app.getId()); apRoleFunction.setRoleId(roleId); @@ -3272,7 +3296,7 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic } } if (!found) { - CentralV2Role cenrole = new CentralV2Role(); + CentralV2Role cenrole = new CentralV2Role.CentralV2RoleBuilder().createCentralV2Role(); cenrole.setName(role.getRoleName()); cenrole.setId(role.getRoleId()); cenrole.setActive(role.isActive()); @@ -3319,9 +3343,11 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic } private CentralV2Role convertRoleToCentralV2Role(EPRole role) { - return new CentralV2Role(role.getId(), role.getCreated(), role.getModified(), role.getCreatedId(), - role.getModifiedId(), role.getRowNum(), role.getName(), role.getActive(), role.getPriority(), - new TreeSet<>(), new TreeSet<>(), new TreeSet<>()); + return new CentralV2Role.CentralV2RoleBuilder().setId(role.getId()).setCreated(role.getCreated()) + .setModified(role.getModified()).setCreatedId(role.getCreatedId()).setModifiedId(role.getModifiedId()) + .setRowNum(role.getRowNum()).setName(role.getName()).setActive(role.getActive()) + .setPriority(role.getPriority()).setRoleFunctions(new TreeSet<>()).setChildRoles(new TreeSet<>()) + .setParentRoles(new TreeSet<>()).createCentralV2Role(); } @Override @@ -3469,22 +3495,31 @@ public class ExternalAccessRolesServiceImpl implements ExternalAccessRolesServic cua.setRole(role); userApps.add(cua); } - return new CentralUser(cenV2User.getId(), cenV2User.getCreated(), cenV2User.getModified(), - cenV2User.getCreatedId(), cenV2User.getModifiedId(), cenV2User.getRowNum(), cenV2User.getOrgId(), - cenV2User.getManagerId(), cenV2User.getFirstName(), cenV2User.getMiddleInitial(), - cenV2User.getLastName(), cenV2User.getPhone(), cenV2User.getFax(), cenV2User.getCellular(), - cenV2User.getEmail(), cenV2User.getAddressId(), cenV2User.getAlertMethodCd(), cenV2User.getHrid(), - cenV2User.getOrgUserId(), cenV2User.getOrgCode(), cenV2User.getAddress1(), cenV2User.getAddress2(), - cenV2User.getCity(), cenV2User.getState(), cenV2User.getZipCode(), cenV2User.getCountry(), - cenV2User.getOrgManagerUserId(), cenV2User.getLocationClli(), cenV2User.getBusinessCountryCode(), - cenV2User.getBusinessCountryName(), cenV2User.getBusinessUnit(), cenV2User.getBusinessUnitName(), - cenV2User.getDepartment(), cenV2User.getDepartmentName(), cenV2User.getCompanyCode(), - cenV2User.getCompany(), cenV2User.getZipCodeSuffix(), cenV2User.getJobTitle(), - cenV2User.getCommandChain(), cenV2User.getSiloStatus(), cenV2User.getCostCenter(), - cenV2User.getFinancialLocCode(), cenV2User.getLoginId(), cenV2User.getLoginPwd(), - cenV2User.getLastLoginDate(), cenV2User.isActive(), cenV2User.isInternal(), - cenV2User.getSelectedProfileId(), cenV2User.getTimeZoneId(), cenV2User.isOnline(), - cenV2User.getChatId(), userApps); + return new CentralUser.CentralUserBuilder().setId(cenV2User.getId()).setCreated(cenV2User.getCreated()) + .setModified(cenV2User.getModified()).setCreatedId(cenV2User.getCreatedId()) + .setModifiedId(cenV2User.getModifiedId()).setRowNum(cenV2User.getRowNum()) + .setOrgId(cenV2User.getOrgId()).setManagerId(cenV2User.getManagerId()) + .setFirstName(cenV2User.getFirstName()).setMiddleInitial(cenV2User.getMiddleInitial()) + .setLastName(cenV2User.getLastName()).setPhone(cenV2User.getPhone()).setFax(cenV2User.getFax()) + .setCellular(cenV2User.getCellular()).setEmail(cenV2User.getEmail()) + .setAddressId(cenV2User.getAddressId()).setAlertMethodCd(cenV2User.getAlertMethodCd()) + .setHrid(cenV2User.getHrid()).setOrgUserId(cenV2User.getOrgUserId()).setOrgCode(cenV2User.getOrgCode()) + .setAddress1(cenV2User.getAddress1()).setAddress2(cenV2User.getAddress2()).setCity(cenV2User.getCity()) + .setState(cenV2User.getState()).setZipCode(cenV2User.getZipCode()).setCountry(cenV2User.getCountry()) + .setOrgManagerUserId(cenV2User.getOrgManagerUserId()).setLocationClli(cenV2User.getLocationClli()) + .setBusinessCountryCode(cenV2User.getBusinessCountryCode()) + .setBusinessCountryName(cenV2User.getBusinessCountryName()).setBusinessUnit(cenV2User.getBusinessUnit()) + .setBusinessUnitName(cenV2User.getBusinessUnitName()).setDepartment(cenV2User.getDepartment()) + .setDepartmentName(cenV2User.getDepartmentName()).setCompanyCode(cenV2User.getCompanyCode()) + .setCompany(cenV2User.getCompany()).setZipCodeSuffix(cenV2User.getZipCodeSuffix()) + .setJobTitle(cenV2User.getJobTitle()).setCommandChain(cenV2User.getCommandChain()) + .setSiloStatus(cenV2User.getSiloStatus()).setCostCenter(cenV2User.getCostCenter()) + .setFinancialLocCode(cenV2User.getFinancialLocCode()).setLoginId(cenV2User.getLoginId()) + .setLoginPwd(cenV2User.getLoginPwd()).setLastLoginDate(cenV2User.getLastLoginDate()) + .setActive(cenV2User.isActive()).setInternal(cenV2User.isInternal()) + .setSelectedProfileId(cenV2User.getSelectedProfileId()).setTimeZoneId(cenV2User.getTimeZoneId()) + .setOnline(cenV2User.isOnline()).setChatId(cenV2User.getChatId()).setUserApps(userApps) + .createCentralUser(); } @Override