Allon Mureinik has uploaded a new change for review. Change subject: core: Removed unused Roles queries ......................................................................
core: Removed unused Roles queries This patch removes several queries for Roles which are not used anymore. This patch includes: 1. Removing GetRolesByAdElementIdQuery, GerRolesByAdElementIdAndNullTagQuery and GetRolesForDelegationByUserQuery. 2. Removing the VdcQueryType constants corresponding to the aforementioned queries. 3. Removing the GetRolesByAdElement constant from VdcQueryType, as it has no corresponding query class. 4. Removing RoleDAO.getAllForAdElement(Guid) and RoleDAO.getForAdElement(Guid) which were only used by the aforementioned queries. This removal includes the interfaces, implementations, underlying stored procedures and tests. Change-Id: If424d0936dc9c7dc89400c7b492febde1d2bf075 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/dbscripts/multi_level_administration_sp.sql D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesByAdElementIdAndNullTagQuery.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesByAdElementIdQuery.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java 8 files changed, 0 insertions(+), 198 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/13442/1 diff --git a/backend/manager/dbscripts/multi_level_administration_sp.sql b/backend/manager/dbscripts/multi_level_administration_sp.sql index 0559339..fca7be0 100644 --- a/backend/manager/dbscripts/multi_level_administration_sp.sql +++ b/backend/manager/dbscripts/multi_level_administration_sp.sql @@ -285,19 +285,6 @@ -Create or replace FUNCTION GetAllRolesByAdElementId(v_ad_element_id UUID) -RETURNS SETOF roles - AS $procedure$ -BEGIN - RETURN QUERY SELECT roles.* - FROM roles INNER JOIN - permissions ON permissions.role_id = roles.id - WHERE permissions.ad_element_id = v_ad_element_id - or permissions.ad_element_id in(select * from getUserAndGroupsById(v_ad_element_id)); - -END; $procedure$ -LANGUAGE plpgsql; - Create or replace FUNCTION GetAllRolesByUserIdAndGroupIds(v_user_id UUID, v_group_ids text) RETURNS SETOF roles AS $procedure$ @@ -310,19 +297,6 @@ END; $procedure$ LANGUAGE plpgsql; - -Create or replace FUNCTION GetRolesByAdElementId(v_ad_element_id UUID) -RETURNS SETOF roles - AS $procedure$ -BEGIN - RETURN QUERY SELECT roles.* - FROM roles - inner join permissions permissions on roles.id = permissions.role_id - WHERE ad_element_id = v_ad_element_id; -END; $procedure$ -LANGUAGE plpgsql; - - ---------------------------------------------------------------- -- [roles_relations] Table diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesByAdElementIdAndNullTagQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesByAdElementIdAndNullTagQuery.java deleted file mode 100644 index 0efac79..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesByAdElementIdAndNullTagQuery.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ovirt.engine.core.bll; - -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; - -public class GetRolesByAdElementIdAndNullTagQuery<P extends MultilevelAdministrationByAdElementIdParameters> - extends QueriesCommandBase<P> { - public GetRolesByAdElementIdAndNullTagQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - - getQueryReturnValue() - .setReturnValue(DbFacade.getInstance().getRoleDao().getForAdElement(getParameters().getAdElementId())); - } -} diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesByAdElementIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesByAdElementIdQuery.java deleted file mode 100644 index 4d6906e..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesByAdElementIdQuery.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ovirt.engine.core.bll; - -import org.ovirt.engine.core.common.queries.*; -import org.ovirt.engine.core.dal.dbbroker.*; - -public class GetRolesByAdElementIdQuery<P extends MultilevelAdministrationByAdElementIdParameters> - extends QueriesCommandBase<P> { - public GetRolesByAdElementIdQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - - getQueryReturnValue().setReturnValue( - DbFacade.getInstance().getRoleDao() - .getAllForAdElement(getParameters().getAdElementId())); - } -} diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java deleted file mode 100644 index af2419b..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.ovirt.engine.core.bll; - -import java.util.Iterator; -import java.util.List; - -import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.bll.session.SessionDataContainer; -import org.ovirt.engine.core.common.businessentities.Role; -import org.ovirt.engine.core.common.businessentities.RoleType; -import org.ovirt.engine.core.common.businessentities.permissions; -import org.ovirt.engine.core.common.interfaces.IVdcUser; -import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; - -public class GetRolesForDelegationByUserQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { - - public GetRolesForDelegationByUserQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - IVdcUser user = getCurrentUser(); - // check the user has SuperUser on System Object, directly or via group membership. - List<Role> myRoles = DbFacade.getInstance().getRoleDao().getAll(); - permissions adminPerm = DbFacade - .getInstance() - .getPermissionDao() - .getForRoleAndAdElementAndObjectWithGroupCheck( - PredefinedRoles.SUPER_USER.getId(), user.getUserId(), - MultiLevelAdministrationHandler.SYSTEM_OBJECT_ID); - if (adminPerm == null) { - // user is not super admin - remove all - // ADMIN roles from the list - for (Iterator i = myRoles.iterator(); i.hasNext();) { - Role r = (Role) i.next(); - if (r.getType() == RoleType.ADMIN) - i.remove(); - } - } - getQueryReturnValue().setReturnValue(myRoles); - - } - - private IVdcUser getCurrentUser() { - String sessionId = getParameters().getSessionId(); - IVdcUser user = null; - if (StringUtils.isNotEmpty(sessionId)) { - user = SessionDataContainer.getInstance().getUser(sessionId, false); - } - return user; - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index 6399913..f699373 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -169,19 +169,15 @@ // Multi Level Administration queries GetAllRoles(VdcQueryAuthType.User), - GetRolesByAdElement, - GetRolesByAdElementIdAndNullTag, GetRoleById(VdcQueryAuthType.User), GetRoleByName, GetPermissionById, GetPermissionByRoleId, GetPermissionsByAdElement, HasAdElementReconnectPermission(VdcQueryAuthType.User), - GetRolesByAdElementId, GetPermissionsByAdElementId(VdcQueryAuthType.User), GetRoleActionGroupsByRoleId(VdcQueryAuthType.User), IsUserPowerUserOrAbove, - GetRolesForDelegationByUser, GetPermissionsForObject(VdcQueryAuthType.User), GetAllStoragePools(VdcQueryAuthType.User), GetDataCentersWithPermittedActionOnClusters(VdcQueryAuthType.User), diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAO.java index fc2a3ab..9dff333 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAO.java @@ -22,25 +22,6 @@ Role getByName(String name); /** - * Retrieves all roles for the specified Ad element. - * - * @param id - * the Ad element - * @return the list of roles - */ - List<Role> getAllForAdElement(Guid id); - - /** - * This seems to be a redundant method, but the stored procedure is different from the one for - * {@link #getAllForAdElement(Guid)}. - * - * @param id - * the Ad element - * @return the list of roles - */ - List<Role> getForAdElement(Guid id); - - /** * This method gets the Roles for the given user and its groups. The purpose of this method is to be able to get * roles even if the user is not already added to DB, by getting the roles for his groups * diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java index 791629d..5cc410e 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java @@ -39,13 +39,6 @@ } @Override - public List<Role> getAllForAdElement(Guid id) { - MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() - .addValue("ad_element_id", id); - - return getCallsHandler().executeReadList("GetAllRolesByAdElementId", RolesRowMapper.instance, parameterSource); - } - public List<Role> getAllForUserAndGroups(Guid id, String groupIds) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() .addValue("user_id", id) @@ -54,14 +47,6 @@ RolesRowMapper.instance, parameterSource); - } - - @Override - public List<Role> getForAdElement(Guid id) { - MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() - .addValue("ad_element_id", id); - - return getCallsHandler().executeReadList("GetRolesByAdElementId", RolesRowMapper.instance, parameterSource); } @Override diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java index 844f1af..bf56fad 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java @@ -92,50 +92,6 @@ } /** - * Ensures an empty collection is returned when no roles exist for the specified ad element. - */ - @Test - public void testGetAllRolesForAdElementWithInvalidId() { - List<Role> result = dao.getAllForAdElement(Guid.NewGuid()); - - assertNotNull(result); - assertTrue(result.isEmpty()); - } - - /** - * Ensures that a collection of roles are returned. - */ - @Test - public void testGetAllRolesForAdElement() { - List<Role> result = dao.getAllForAdElement(USER_ID); - - assertNotNull(result); - assertFalse(result.isEmpty()); - } - - /** - * Ensures an empty collection is returned if the ad element is invalid. - */ - @Test - public void testGetAllRolesForUserAndGroupByAdElementWithInvalidAdElement() { - List<Role> result = dao.getAllForAdElement(Guid.NewGuid()); - - assertNotNull(result); - assertTrue(result.isEmpty()); - } - - /** - * Ensures the right collection of roles is returned. - */ - @Test - public void testGetAllRolesForUserAndGroupByAdElement() { - List<Role> result = dao.getAllForAdElement(USER_ID); - - assertNotNull(result); - assertFalse(result.isEmpty()); - } - - /** * Ensures the right collection of roles is returned */ @Test -- To view, visit http://gerrit.ovirt.org/13442 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If424d0936dc9c7dc89400c7b492febde1d2bf075 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
