Martin Peřina has uploaded a new change for review. Change subject: core: Make Permissions more friendly to Java Coding Conventions ......................................................................
core: Make Permissions more friendly to Java Coding Conventions 1. Renames getter/setters according to Java Coding Conventions 2. Code cleanup Change-Id: I7571800e3cba302a67960209e676ed374013bf0d Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddQuotaCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UniquePermissionsSet.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetPermissionsByAdElementIdQueryTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permissions.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PermissionDAOTest.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaPermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserPermissionView.java 26 files changed, 115 insertions(+), 118 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/38645/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java index 397f041..b1111ed 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java @@ -47,8 +47,8 @@ return false; } - Role role = getRoleDao().get(perm.getrole_id()); - Guid adElementId = perm.getad_element_id(); + Role role = getRoleDao().get(perm.getRoleId()); + Guid adElementId = perm.getAdElementId(); if (role == null) { addCanDoActionMessage(VdcBllMessages.PERMISSION_ADD_FAILED_INVALID_ROLE_ID); @@ -141,18 +141,18 @@ principalId = group.getId(); } else { - principalId = parameters.getPermission().getad_element_id(); + principalId = parameters.getPermission().getAdElementId(); } final Permissions paramPermission = parameters.getPermission(); Permissions permission = - getPermissionDAO().getForRoleAndAdElementAndObject(paramPermission.getrole_id(), principalId, + getPermissionDAO().getForRoleAndAdElementAndObject(paramPermission.getRoleId(), principalId, paramPermission.getObjectId()); if (permission == null) { paramPermission.setId(Guid.newGuid()); - paramPermission.setad_element_id(principalId); + paramPermission.setAdElementId(principalId); TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { @Override @@ -177,9 +177,9 @@ private void updateAdminStatus(Permissions perm) { // if the role of the permission is of type admin update the user // lastAdminCheckStatus to true - Role role = getRoleDao().get(perm.getrole_id()); + Role role = getRoleDao().get(perm.getRoleId()); if (role.getType() == RoleType.ADMIN) { - MultiLevelAdministrationHandler.setIsAdminGUIFlag(perm.getad_element_id(), true); + MultiLevelAdministrationHandler.setIsAdminGUIFlag(perm.getAdElementId(), true); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddQuotaCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddQuotaCommand.java index f1b165c..b2e599a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddQuotaCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddQuotaCommand.java @@ -120,7 +120,7 @@ getEngineSessionSeqId(), false); for (Permissions vmPermission : vmPermissions) { - permissionsToAdd.addPermission(vmPermission.getad_element_id(), vmPermission.getrole_id(), + permissionsToAdd.addPermission(vmPermission.getAdElementId(), vmPermission.getRoleId(), getQuotaId(), vmPermission.getObjectType()); } if (!permissionsToAdd.isEmpty()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index 6bc36d0..49aec66 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -1255,14 +1255,14 @@ List<Permissions> templatePermissions = dao.getAllForEntity(getVmTemplateId(), getEngineSessionSeqId(), false); for (Permissions templatePermission : templatePermissions) { - boolean templateOwnerRole = templatePermission.getrole_id().equals(PredefinedRoles.TEMPLATE_OWNER.getId()); - boolean templateUserRole = templatePermission.getrole_id().equals(PredefinedRoles.TEMPLATE_USER.getId()); + boolean templateOwnerRole = templatePermission.getRoleId().equals(PredefinedRoles.TEMPLATE_OWNER.getId()); + boolean templateUserRole = templatePermission.getRoleId().equals(PredefinedRoles.TEMPLATE_USER.getId()); if (templateOwnerRole || templateUserRole) { continue; } - permissionsToAdd.addPermission(templatePermission.getad_element_id(), templatePermission.getrole_id(), + permissionsToAdd.addPermission(templatePermission.getAdElementId(), templatePermission.getRoleId(), getVmId(), VdcObjectType.VM); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index 8b97ae1..cd1d32a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -850,7 +850,7 @@ List<Permissions> vmPermissions = dao.getAllForEntity(getVmId(), getEngineSessionSeqId(), false); for (Permissions vmPermission : vmPermissions) { - permissionsToAdd.addPermission(vmPermission.getad_element_id(), vmPermission.getrole_id(), + permissionsToAdd.addPermission(vmPermission.getAdElementId(), vmPermission.getRoleId(), getParameters().getVmTemplateId(), VdcObjectType.VmTemplate); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java index d4bf645..711cc74 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java @@ -120,7 +120,7 @@ // get group role permissions = getPermissionDAO().getAllForAdElement(groupId); for (Permissions permission : permissions){ - if (permission.getrole_id().equals(PredefinedRoles.SUPER_USER.getId())){ + if (permission.getRoleId().equals(PredefinedRoles.SUPER_USER.getId())){ retValue = true; break; } @@ -135,10 +135,10 @@ public static void addPermission(Guid userId, Guid entityId, PredefinedRoles role, VdcObjectType objectType) { Permissions perms = new Permissions(); - perms.setad_element_id(userId); + perms.setAdElementId(userId); perms.setObjectType(objectType); perms.setObjectId(entityId); - perms.setrole_id(role.getId()); + perms.setRoleId(role.getId()); addPermission(perms); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java index 4ffca35..336f44ea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java @@ -63,7 +63,7 @@ } public String getRoleName() { - Role role = getRoleDao().get(getParameters().getPermission().getrole_id()); + Role role = getRoleDao().get(getParameters().getPermission().getRoleId()); return role == null ? null : role.getName(); } @@ -89,10 +89,10 @@ public void initUserAndGroupData() { if (dbUser == null) { - dbUser = getDbUserDAO().get(getParameters().getPermission().getad_element_id()); + dbUser = getDbUserDAO().get(getParameters().getPermission().getAdElementId()); } if (dbUser == null && dbGroup == null) { - dbGroup = getAdGroupDAO().get(getParameters().getPermission().getad_element_id()); + dbGroup = getAdGroupDAO().get(getParameters().getPermission().getAdElementId()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java index 31cbdb2..41daeb7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java @@ -41,11 +41,11 @@ protected boolean canDoAction() { boolean returnValue = true; Permissions p = getPermissionDAO().get(getParameters().getPermission().getId()); - if (p.getad_element_id().equals(PredefinedUsers.ADMIN_USER.getId()) && - (p.getrole_id().equals(PredefinedRoles.SUPER_USER.getId()))) { + if (p.getAdElementId().equals(PredefinedUsers.ADMIN_USER.getId()) && + (p.getRoleId().equals(PredefinedRoles.SUPER_USER.getId()))) { addCanDoActionMessage(VdcBllMessages.USER_CANNOT_REMOVE_ADMIN_USER); returnValue = false; - } else if (MultiLevelAdministrationHandler.isLastSuperUserPermission(p.getrole_id())) { + } else if (MultiLevelAdministrationHandler.isLastSuperUserPermission(p.getRoleId())) { getReturnValue().getCanDoActionMessages() .add(VdcBllMessages.ERROR_CANNOT_REMOVE_LAST_SUPER_USER_ROLE.toString()); returnValue = false; @@ -59,12 +59,12 @@ @Override protected void executeCommand() { Permissions perms = getParameters().getPermission(); - Guid userId = perms.getad_element_id(); + Guid userId = perms.getAdElementId(); // if removing engine user permission from vm, // check if vm is from pool and detach it if (perms.getObjectType().equals(VdcObjectType.VM) - && perms.getrole_id().equals(PredefinedRoles.ENGINE_USER.getId())) { + && perms.getRoleId().equals(PredefinedRoles.ENGINE_USER.getId())) { VM vm = getVmDAO().get(perms.getObjectId()); if (vm != null && vm.getVmPoolId() != null) { runInternalActionWithTasksContext(VdcActionType.DetachUserFromVmFromPool, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UniquePermissionsSet.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UniquePermissionsSet.java index 7d13356..4654567 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UniquePermissionsSet.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UniquePermissionsSet.java @@ -43,16 +43,16 @@ } public Permissions asPermission() { - return new Permissions(getad_element_id(), getrole_id(), getObjectId(), getObjectType()); + return new Permissions(getAdElementId(), getRoleId(), getObjectId(), getObjectType()); } @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((getad_element_id() == null) ? 0 : getad_element_id().hashCode()); + result = prime * result + ((getAdElementId() == null) ? 0 : getAdElementId().hashCode()); result = prime * result + ((getObjectId() == null) ? 0 : getObjectId().hashCode()); - result = prime * result + ((getrole_id() == null) ? 0 : getrole_id().hashCode()); + result = prime * result + ((getRoleId() == null) ? 0 : getRoleId().hashCode()); return result; } @@ -68,8 +68,8 @@ return false; } Permissions other = (Permissions) obj; - return Objects.equals(getad_element_id(), other.getad_element_id()) - && Objects.equals(getrole_id(), other.getrole_id()) + return Objects.equals(getAdElementId(), other.getAdElementId()) + && Objects.equals(getRoleId(), other.getRoleId()) && Objects.equals(getObjectId(), other.getObjectId()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java index e974098..fb59867 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java @@ -156,7 +156,7 @@ return null; } - return perms.iterator().next().getad_element_id(); + return perms.iterator().next().getAdElementId(); } private RemoveVmFromPoolParameters buildRemoveVmFromPoolParameters() { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetPermissionsByAdElementIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetPermissionsByAdElementIdQueryTest.java index afcf4c2..91b12a7 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetPermissionsByAdElementIdQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetPermissionsByAdElementIdQueryTest.java @@ -27,7 +27,7 @@ // Create expected result Permissions expected = new Permissions(); - expected.setad_element_id(adElementGuid); + expected.setAdElementId(adElementGuid); // Mock the DAOs PermissionDAO permissionDAOMock = mock(PermissionDAO.class); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permissions.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permissions.java index 9fe9379..531b71f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permissions.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Permissions.java @@ -45,30 +45,30 @@ return getId(); } - public Guid getad_element_id() { - return this.adElementId; + public Guid getAdElementId() { + return adElementId; } @Override public Guid getId() { - return this.id; + return id; } - public Guid getrole_id() { - return this.roleId; + public Guid getRoleId() { + return roleId; } - public void setad_element_id(Guid value) { - this.adElementId = value; + public void setAdElementId(Guid value) { + adElementId = value; } @Override public void setId(Guid value) { - this.id = value; + id = value; } - public void setrole_id(Guid value) { - this.roleId = value; + public void setRoleId(Guid value) { + roleId = value; } public Guid getObjectId() { @@ -139,17 +139,17 @@ public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((adElementId == null) ? 0 : adElementId.hashCode()); - result = prime * result + ((objectId == null) ? 0 : objectId.hashCode()); - result = prime * result + ((objectName == null) ? 0 : objectName.hashCode()); - result = prime * result + ((objectType == null) ? 0 : objectType.hashCode()); - result = prime * result + ((ownerName == null) ? 0 : ownerName.hashCode()); - result = prime * result + ((roleName == null) ? 0 : roleName.hashCode()); - result = prime * result + ((roleType == null) ? 0 : roleType.hashCode()); - result = prime * result + ((roleId == null) ? 0 : roleId.hashCode()); - result = prime * result + ((authz == null) ? 0 : authz.hashCode()); - result = prime * result + ((namespace == null) ? 0 : namespace.hashCode()); + result = prime * result + (id == null ? 0 : id.hashCode()); + result = prime * result + (adElementId == null ? 0 : adElementId.hashCode()); + result = prime * result + (objectId == null ? 0 : objectId.hashCode()); + result = prime * result + (objectName == null ? 0 : objectName.hashCode()); + result = prime * result + (objectType == null ? 0 : objectType.hashCode()); + result = prime * result + (ownerName == null ? 0 : ownerName.hashCode()); + result = prime * result + (roleName == null ? 0 : roleName.hashCode()); + result = prime * result + (roleType == null ? 0 : roleType.hashCode()); + result = prime * result + (roleId == null ? 0 : roleId.hashCode()); + result = prime * result + (authz == null ? 0 : authz.hashCode()); + result = prime * result + (namespace == null ? 0 : namespace.hashCode()); return result; } @@ -159,10 +159,7 @@ if (this == obj) { return true; } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { + if (!(obj instanceof Permissions)) { return false; } Permissions other = (Permissions) obj; diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAODbFacadeImpl.java index 9a76779..fa83239 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/PermissionDAODbFacadeImpl.java @@ -218,9 +218,9 @@ @Override public void save(Permissions permission) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() - .addValue("ad_element_id", permission.getad_element_id()) + .addValue("ad_element_id", permission.getAdElementId()) .addValue("id", permission.getId()) - .addValue("role_id", permission.getrole_id()) + .addValue("role_id", permission.getRoleId()) .addValue("object_id", permission.getObjectId()) .addValue("object_type_id", permission.getObjectType().getValue()); @@ -259,9 +259,9 @@ @Override public Permissions mapRow(ResultSet rs, int rowNum) throws SQLException { Permissions entity = new Permissions(); - entity.setad_element_id(getGuidDefaultEmpty(rs, "ad_element_id")); + entity.setAdElementId(getGuidDefaultEmpty(rs, "ad_element_id")); entity.setId(getGuidDefaultEmpty(rs, "id")); - entity.setrole_id(getGuidDefaultEmpty(rs, "role_id")); + entity.setRoleId(getGuidDefaultEmpty(rs, "role_id")); entity.setObjectId(getGuidDefaultEmpty(rs, "object_id")); entity.setObjectType(VdcObjectType.forValue(rs .getInt(("object_type_id")))); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java index f721b93..bd4487e 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java @@ -158,8 +158,8 @@ perms.setRoleType(RoleType.ADMIN); // An available role from the fixtures - perms.setrole_id(ADMIN_ROLE_TYPE_FROM_FIXTURE_ID); - perms.setad_element_id(nonAdminUser.getId()); + perms.setRoleId(ADMIN_ROLE_TYPE_FROM_FIXTURE_ID); + perms.setAdElementId(nonAdminUser.getId()); perms.setObjectId(SYSTEM_OBJECT_ID); perms.setObjectType(VdcObjectType.System); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PermissionDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PermissionDAOTest.java index 66a8bfe..d6a6511 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PermissionDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PermissionDAOTest.java @@ -121,8 +121,8 @@ AD_ELEMENT_ID, VM_ENTITY_ID); assertNotNull(result); - assertEquals(ROLE_ID, result.getrole_id()); - assertEquals(AD_ELEMENT_ID, result.getad_element_id()); + assertEquals(ROLE_ID, result.getRoleId()); + assertEquals(AD_ELEMENT_ID, result.getAdElementId()); assertEquals(VM_ENTITY_ID, result.getObjectId()); } @@ -135,7 +135,7 @@ @Test public void testGetAllForQuotaId() { List<Permissions> result = dao.getConsumedPermissionsForQuotaId(FixturesTool.QUOTA_GENERAL); - assertEquals(result.get(0).getad_element_id(), FixturesTool.USER_EXISTING_ID); + assertEquals(result.get(0).getAdElementId(), FixturesTool.USER_EXISTING_ID); } /** @@ -218,7 +218,7 @@ assertNotNull(result); assertFalse(result.isEmpty()); for (Permissions permission : result) { - assertEquals(AD_ELEMENT_ID, permission.getad_element_id()); + assertEquals(AD_ELEMENT_ID, permission.getAdElementId()); } } @@ -306,7 +306,7 @@ assertNotNull(result); assertFalse(result.isEmpty()); for (Permissions permission : result) { - assertEquals(ROLE_ID, permission.getrole_id()); + assertEquals(ROLE_ID, permission.getRoleId()); } } @@ -345,8 +345,8 @@ assertNotNull(result); assertFalse(result.isEmpty()); for (Permissions permission : result) { - assertEquals(ROLE_ID, permission.getrole_id()); - assertEquals(AD_ELEMENT_ID, permission.getad_element_id()); + assertEquals(ROLE_ID, permission.getRoleId()); + assertEquals(AD_ELEMENT_ID, permission.getAdElementId()); } } @@ -382,7 +382,7 @@ assertNotNull(result); assertFalse(result.isEmpty()); for (Permissions permission : result) { - assertEquals(ROLE_ID, permission.getrole_id()); + assertEquals(ROLE_ID, permission.getRoleId()); assertEquals(VM_ENTITY_ID, permission.getObjectId()); } } @@ -592,8 +592,8 @@ dao.save(new_permissions); Permissions result = dao.getForRoleAndAdElementAndObject( - new_permissions.getrole_id(), - new_permissions.getad_element_id(), + new_permissions.getRoleId(), + new_permissions.getAdElementId(), new_permissions.getObjectId()); assertNotNull(result); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java index 3297f72..0bc2ea1 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java @@ -120,17 +120,17 @@ org.ovirt.engine.api.model.Permissions collection = new org.ovirt.engine.api.model.Permissions(); for (Permissions entity : entities) { castEveryonePermissionsToUser(entity); - Permission permission = map(entity, getUserById(entity.getad_element_id())); + Permission permission = map(entity, getUserById(entity.getAdElementId())); collection.getPermissions().add(addLinks(permission, permission.getUser() != null ? suggestedParentType : Group.class)); } return collection; } private void castEveryonePermissionsToUser(Permissions entity) { - if (entity.getad_element_id() != null && - entity.getad_element_id().equals(Guid.EVERYONE) && + if (entity.getAdElementId() != null && + entity.getAdElementId().equals(Guid.EVERYONE) && queryType.equals(VdcQueryType.GetPermissionsByAdElementId)) { - entity.setad_element_id(this.targetId); + entity.setAdElementId(this.targetId); } } @@ -168,13 +168,13 @@ */ public Permission map(Permissions entity, DbUser user) { Permission template = new Permission(); - if (entity.getad_element_id() != null) { + if (entity.getAdElementId() != null) { if (isUser(user)) { template.setUser(new User()); - template.getUser().setId(entity.getad_element_id().toString()); + template.getUser().setId(entity.getAdElementId().toString()); } else { template.setGroup(new Group()); - template.getGroup().setId(entity.getad_element_id().toString()); + template.getGroup().setId(entity.getAdElementId().toString()); } } return map(entity, template); @@ -238,12 +238,12 @@ Object principal = getPrincipal(model); if (principal instanceof DbUser) { DbUser user = (DbUser) principal; - entity.setad_element_id(user.getId()); + entity.setAdElementId(user.getId()); parameters.setUser(user); } if (principal instanceof DbGroup) { DbGroup group = (DbGroup) principal; - entity.setad_element_id(group.getId()); + entity.setAdElementId(group.getId()); parameters.setGroup(group); } return parameters; diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java index 897f047..1b4f685 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResource.java @@ -42,7 +42,7 @@ @Override protected Permission map(Permissions entity, Permission template) { Map<Guid, DbUser> users = parent.getUsers(); - return parent.map(entity, users.containsKey(entity.getad_element_id()) ? users.get(entity.getad_element_id()) : null); + return parent.map(entity, users.containsKey(entity.getAdElementId()) ? users.get(entity.getAdElementId()) : null); } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java index 96e29ba..75af455 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedPermissionsResourceTest.java @@ -133,9 +133,9 @@ setUpCreationExpectations(VdcActionType.AddPermission, PermissionsOperationsParameters.class, new String[] { principalParameterName, - "Permission.ad_element_id", + "Permission.AdElementId", "Permission.ObjectId", - "Permission.role_id" }, + "Permission.RoleId" }, new Object[] { GUIDS[1], chooseElementId(), chooseObjectId(), GUIDS[3] }, true, true, @@ -242,10 +242,10 @@ protected Permissions getEntity(int index) { Permissions permission = new Permissions(); permission.setId(GUIDS[index]); - permission.setad_element_id(GUIDS[1]); + permission.setAdElementId(GUIDS[1]); permission.setObjectId(GUIDS[2]); permission.setObjectType(VdcObjectType.StoragePool); - permission.setrole_id(GUIDS[3]); + permission.setRoleId(GUIDS[3]); return permission; } @@ -261,7 +261,7 @@ List<Permissions> perms = new ArrayList<Permissions>(); for (int i = 0; i < NAMES.length; i++) { Permissions entity = getEntity(i); - entity.setad_element_id(adElementId); + entity.setAdElementId(adElementId); perms.add(entity); } return perms; diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java index 6cbda62..f82385d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java @@ -47,8 +47,8 @@ protected Permissions getEntity(int index) { Permissions permission = new Permissions(); permission.setId(GUIDS[(index + 1) % 3]); - permission.setad_element_id(GUIDS[0]); - permission.setrole_id(GUIDS[index]); + permission.setAdElementId(GUIDS[0]); + permission.setRoleId(GUIDS[index]); permission.setObjectType(VdcObjectType.System); return permission; } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java index 4e743cc..d16f229 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java @@ -71,9 +71,9 @@ setUpCreationExpectations(VdcActionType.AddPermission, PermissionsOperationsParameters.class, new String[] { "Group.Id", - "Permission.ad_element_id", + "Permission.AdElementId", "Permission.ObjectId", - "Permission.role_id" }, + "Permission.RoleId" }, new Object[] { GUIDS[1], GUIDS[1], targetId, GUIDS[3] }, true, true, diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java index a2d4172..8e23c28 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java @@ -93,8 +93,8 @@ protected Permissions getEntity(int index) { Permissions permission = new Permissions(); permission.setId(GUIDS[0]); - permission.setad_element_id(GUIDS[1]); - permission.setrole_id(GUIDS[2]); + permission.setAdElementId(GUIDS[1]); + permission.setRoleId(GUIDS[2]); return permission; } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java index 6ed5373..f57f90d 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermissionMapper.java @@ -25,7 +25,7 @@ entity.setId(GuidUtils.asGuid(model.getId())); } if (model.isSetRole() && model.getRole().isSetId()) { - entity.setrole_id(GuidUtils.asGuid(model.getRole().getId())); + entity.setRoleId(GuidUtils.asGuid(model.getRole().getId())); } entity.setObjectId(map(model, template != null ? template.getObjectId() : null)); entity.setObjectType(map(model, template != null ? template.getObjectType() : null)); @@ -36,7 +36,7 @@ public static Role map(Permissions entity, Role template) { Role model = template != null ? template : new Role(); model.setName(entity.getRoleName()); - model.setId(entity.getrole_id().toString()); + model.setId(entity.getRoleId().toString()); return model; } @@ -44,13 +44,13 @@ public static Permission map(Permissions entity, Permission template) { Permission model = template != null ? template : new Permission(); model.setId(entity.getId().toString()); - if (entity.getrole_id() != null) { + if (entity.getRoleId() != null) { model.setRole(new Role()); - model.getRole().setId(entity.getrole_id().toString()); + model.getRole().setId(entity.getRoleId().toString()); } - if (entity.getad_element_id() != null && (template == null || !template.isSetGroup())) { + if (entity.getAdElementId() != null && (template == null || !template.isSetGroup())) { model.setUser(new User()); - model.getUser().setId(entity.getad_element_id().toString()); + model.getUser().setId(entity.getAdElementId().toString()); } if (entity.getObjectId() != null) { setObjectId(model, entity); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaPermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaPermissionListModel.java index aa03a66..b53e6c0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaPermissionListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaPermissionListModel.java @@ -46,7 +46,7 @@ ArrayList<Permissions> list = ((VdcQueryReturnValue) ReturnValue).getReturnValue(); ArrayList<Permissions> newList = new ArrayList<Permissions>(); for (Permissions permission : list) { - if (!permission.getrole_id().equals(ApplicationGuids.quotaConsumer.asGuid())) { + if (!permission.getRoleId().equals(ApplicationGuids.quotaConsumer.asGuid())) { newList.add(permission); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java index 8476147..60f366a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java @@ -84,17 +84,17 @@ Map<Guid, Permissions> map = new HashMap<Guid, Permissions>(); for (Permissions permission : list) { //filter out sys-admin and dc admin from consumers sub-tab - if (permission.getrole_id().equals(ApplicationGuids.superUser.asGuid()) - || permission.getrole_id().equals(ApplicationGuids.dataCenterAdmin.asGuid())) { + if (permission.getRoleId().equals(ApplicationGuids.superUser.asGuid()) + || permission.getRoleId().equals(ApplicationGuids.dataCenterAdmin.asGuid())) { continue; } - if (!map.containsKey(permission.getad_element_id())) { - map.put(permission.getad_element_id(), permission); + if (!map.containsKey(permission.getAdElementId())) { + map.put(permission.getAdElementId(), permission); } else { - if (map.get(permission.getad_element_id()) - .getrole_id() + if (map.get(permission.getAdElementId()) + .getRoleId() .equals(ApplicationGuids.quotaConsumer.asGuid())) { - map.put(permission.getad_element_id(), permission); + map.put(permission.getAdElementId(), permission); } } } @@ -145,7 +145,7 @@ removeExe = true; } for (Permissions perm : items) { - if (!perm.getrole_id().equals(ApplicationGuids.quotaConsumer.asGuid())) { + if (!perm.getRoleId().equals(ApplicationGuids.quotaConsumer.asGuid())) { removeExe = false; break; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java index 9c97088..b0f6209 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java @@ -206,9 +206,9 @@ || isEveryoneVnicProfileUserPermission(permission)) { continue; } - if (!roleIdList.contains(permission.getrole_id())) + if (!roleIdList.contains(permission.getRoleId())) { - roleIdList.add(permission.getrole_id()); + roleIdList.add(permission.getRoleId()); } } UserPortalLoginModel loginModel1 = (UserPortalLoginModel) target; @@ -226,20 +226,20 @@ } private boolean isEveryoneVnicProfileUserPermission(Permissions permission) { - return permission.getad_element_id().equals(ApplicationGuids.everyone.asGuid()) && - permission.getrole_id().equals(ApplicationGuids.vnicProfileUser.asGuid()); + return permission.getAdElementId().equals(ApplicationGuids.everyone.asGuid()) && + permission.getRoleId().equals(ApplicationGuids.vnicProfileUser.asGuid()); } private boolean isEveryoneUserPortalBasedVmPermission(Permissions permission) { - return permission.getad_element_id().equals(ApplicationGuids.everyone.asGuid()) + return permission.getAdElementId().equals(ApplicationGuids.everyone.asGuid()) && - permission.getrole_id() + permission.getRoleId() .equals(ApplicationGuids.userTemplateBasedVM.asGuid()); } private boolean isEveryoneQuotaConsumerPermission(Permissions permission) { - return permission.getad_element_id().equals(ApplicationGuids.everyone.asGuid()) && - permission.getrole_id().equals(ApplicationGuids.quotaConsumer.asGuid()); + return permission.getAdElementId().equals(ApplicationGuids.everyone.asGuid()) && + permission.getRoleId().equals(ApplicationGuids.quotaConsumer.asGuid()); } }), loginModel.getLoggedUser().getId()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java index 5fb15e4..7fffebf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserPermissionListModel.java @@ -84,7 +84,7 @@ ArrayList<Permissions> list = ((VdcQueryReturnValue) ReturnValue).getReturnValue(); ArrayList<Permissions> newList = new ArrayList<Permissions>(); for (Permissions permission : list) { - if (!permission.getrole_id().equals(ApplicationGuids.quotaConsumer.asGuid())) { + if (!permission.getRoleId().equals(ApplicationGuids.quotaConsumer.asGuid())) { newList.add(permission); } } @@ -184,7 +184,7 @@ Permissions p = getSelectedItem(); if (p != null && getEntity() != null) { - isInherited = !p.getad_element_id().equals(getEntity().getId()); + isInherited = !p.getAdElementId().equals(getEntity().getId()); } getRemoveCommand().setIsExecutionAllowed(!isInherited && (getSelectedItem() != null diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserPermissionView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserPermissionView.java index c50e7bc..64b1d37 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserPermissionView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserPermissionView.java @@ -63,7 +63,7 @@ AbstractTextColumn<Permissions> inheritedColumn = new AbstractGroupNameColumn<Permissions>() { @Override protected Object[] getRawValue(Permissions object) { - return new Object[] { getDetailModel().getEntity(), object.getad_element_id(), object.getOwnerName() }; + return new Object[] { getDetailModel().getEntity(), object.getAdElementId(), object.getOwnerName() }; } }; inheritedColumn.makeSortable(); -- To view, visit https://gerrit.ovirt.org/38645 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7571800e3cba302a67960209e676ed374013bf0d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
