Allon Mureinik has uploaded a new change for review. Change subject: core: Remove unused IsUserPowerUserOrAboveQuery ......................................................................
core: Remove unused IsUserPowerUserOrAboveQuery Removed the IsUserPowerUserOrAboveQuery and its corresponding constant in VdcQueryType since it is not used anywhere in the code. Change-Id: I82982b3a6950339a9c3623078f4bd0e36c9d8f6f Signed-off-by: Allon Mureinik <[email protected]> --- D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsUserPowerUserOrAboveQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java 2 files changed, 0 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/13443/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsUserPowerUserOrAboveQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsUserPowerUserOrAboveQuery.java deleted file mode 100644 index bd9264f..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsUserPowerUserOrAboveQuery.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ovirt.engine.core.bll; - -import java.util.List; - -import org.ovirt.engine.core.common.businessentities.permissions; -import org.ovirt.engine.core.common.queries.MultilevelAdministrationByAdElementIdParameters; -import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.utils.linq.LinqUtils; -import org.ovirt.engine.core.utils.linq.Predicate; - -public class IsUserPowerUserOrAboveQuery<P extends MultilevelAdministrationByAdElementIdParameters> - extends QueriesCommandBase<P> { - public IsUserPowerUserOrAboveQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - final Guid superUserId = new Guid("00000000-0000-0000-0000-000000000001"); - final Guid powerUserId = new Guid("00000000-0000-0000-0001-000000000002"); - List<permissions> list = DbFacade.getInstance().getPermissionDao() - .getAllForAdElement(getParameters().getAdElementId()); - - permissions permissions = LinqUtils.firstOrNull(list, new Predicate<permissions>() { - @Override - public boolean eval(permissions p) { - return (p.getrole_id().equals(superUserId) || p.getrole_id().equals(powerUserId)); - } - }); - getQueryReturnValue().setReturnValue(permissions != null); - } -} 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 f699373..9740759 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 @@ -177,7 +177,6 @@ HasAdElementReconnectPermission(VdcQueryAuthType.User), GetPermissionsByAdElementId(VdcQueryAuthType.User), GetRoleActionGroupsByRoleId(VdcQueryAuthType.User), - IsUserPowerUserOrAbove, GetPermissionsForObject(VdcQueryAuthType.User), GetAllStoragePools(VdcQueryAuthType.User), GetDataCentersWithPermittedActionOnClusters(VdcQueryAuthType.User), -- To view, visit http://gerrit.ovirt.org/13443 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82982b3a6950339a9c3623078f4bd0e36c9d8f6f 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
