Allon Mureinik has uploaded a new change for review. Change subject: core: Remove unused GetTimeLeasedUsersByVmPoolId ......................................................................
core: Remove unused GetTimeLeasedUsersByVmPoolId Removed the unused GetTimeLeasedUsersByVmPoolId query. This patch removes: 1. The GetTimeLeasedUsersByVmPoolIdQuery class 2. The GetTimeLeasedUsersByVmPoolIdParameters class only used by the aforementioned query. 3. The GetTimeLeasedUsersByVmPoolId constant from VdcQueryType representing the aforementioned query. 4. The getAllTimeLeasedUsersForVm(int) method from DbUserDAO, its implementation and its "test", as it was only used by the aforementioned query. Note that the underlying stored procedure no longer exists, so this DAO would not have worked anyway. Change-Id: I7db6131e621dd1f34d023565d87c1a6afecbf2fa Signed-off-by: Allon Mureinik <[email protected]> --- D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTimeLeasedUsersByVmPoolIdQuery.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTimeLeasedUsersByVmPoolIdParameters.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/DbUserDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbUserDAOTest.java 6 files changed, 0 insertions(+), 59 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/13286/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTimeLeasedUsersByVmPoolIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTimeLeasedUsersByVmPoolIdQuery.java deleted file mode 100644 index 4ee6aa9..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTimeLeasedUsersByVmPoolIdQuery.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.ovirt.engine.core.bll; - -import org.ovirt.engine.core.common.queries.GetTimeLeasedUsersByVmPoolIdParameters; - -public class GetTimeLeasedUsersByVmPoolIdQuery<P extends GetTimeLeasedUsersByVmPoolIdParameters> - extends QueriesCommandBase<P> { - public GetTimeLeasedUsersByVmPoolIdQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue( - getDbFacade().getDbUserDao().getAllTimeLeasedUsersForVm(getParameters().getId())); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTimeLeasedUsersByVmPoolIdParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTimeLeasedUsersByVmPoolIdParameters.java deleted file mode 100644 index e190334..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTimeLeasedUsersByVmPoolIdParameters.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ovirt.engine.core.common.queries; - -public class GetTimeLeasedUsersByVmPoolIdParameters extends VdcQueryParametersBase { - private static final long serialVersionUID = -7330156039187698528L; - - public GetTimeLeasedUsersByVmPoolIdParameters(int id) { - _id = id; - } - - private int _id; - - public int getId() { - return _id; - } - - public GetTimeLeasedUsersByVmPoolIdParameters() { - } -} 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 4fb07f3..7c6fda4 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 @@ -98,7 +98,6 @@ // Users queries GetUserVmsByUserIdAndGroups(VdcQueryAuthType.User), - GetTimeLeasedUsersByVmPoolId, GetAllDbUsers(VdcQueryAuthType.User), GetDbUserByUserId(VdcQueryAuthType.User), GetUsersByVmid, diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAO.java index 02891f2..ba305bd 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAO.java @@ -40,15 +40,6 @@ List<DbUser> getAllForVm(Guid id); /** - * Retrieves all users associated with the specified virtual machine id. - * - * @param vmid - * the virtual machine id - * @return the list of users - */ - List<DbUser> getAllTimeLeasedUsersForVm(int vmid); - - /** * Retrieves all defined used. * * @return the collection of all users diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java index 56b5aa8..e897856 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java @@ -91,16 +91,6 @@ } @Override - public List<DbUser> getAllTimeLeasedUsersForVm(int vmid) { - MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() - .addValue("vm_pool_id", vmid); - - return getCallsHandler().executeReadList("Gettime_leasedusers_by_vm_pool_id", - DbUserRowMapper.instance, - parameterSource); - } - - @Override public List<DbUser> getAllWithQuery(String query) { return new SimpleJdbcTemplate(jdbcTemplate).query(query, DbUserRowMapper.instance); } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbUserDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbUserDAOTest.java index 2d484e8..96a2707 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbUserDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbUserDAOTest.java @@ -108,11 +108,6 @@ } @Test - public void testGetAllTimeLeasedUsersForVm() { - // TODO this API is broken and cannot be tested - } - - @Test public void testGetAll() { List<DbUser> result = dao.getAll(); -- To view, visit http://gerrit.ovirt.org/13286 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7db6131e621dd1f34d023565d87c1a6afecbf2fa 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
