Allon Mureinik has uploaded a new change for review. Change subject: restapi: Use DbUser.isGroup() properly ......................................................................
restapi: Use DbUser.isGroup() properly Replaced an explicit string check on DbUser's user name with the BE's method isGroup(). This achieves two goals: 1. It's easier to understand. 2. It removes a dependency on the deprecated StringHelper. Change-Id: Ib17d50003d2b1425db9a2fc17c206da2d4db5de7 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java 1 file changed, 5 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/13653/1 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 d838cd2..2a7eafc 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 @@ -15,9 +15,8 @@ import org.ovirt.engine.api.model.Permission; import org.ovirt.engine.api.model.Permissions; import org.ovirt.engine.api.model.User; -import org.ovirt.engine.api.resource.PermissionResource; import org.ovirt.engine.api.resource.AssignedPermissionsResource; - +import org.ovirt.engine.api.resource.PermissionResource; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.PermissionsOperationsParametes; import org.ovirt.engine.core.common.action.VdcActionType; @@ -25,15 +24,14 @@ import org.ovirt.engine.core.common.businessentities.LdapGroup; import org.ovirt.engine.core.common.businessentities.permissions; import org.ovirt.engine.core.common.interfaces.SearchType; +import org.ovirt.engine.core.common.queries.GetDbUserByUserIdParameters; +import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters; import org.ovirt.engine.core.common.queries.MultilevelAdministrationByPermissionIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; -import org.ovirt.engine.core.common.queries.GetDbUserByUserIdParameters; -import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters; import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.StringHelper; public class BackendAssignedPermissionsResource extends AbstractBackendCollectionResource<Permission, permissions> @@ -180,9 +178,8 @@ return map(entity, template); } - //REVISIT: fix once BE can distinguish between the user and group - private boolean isUser(DbUser user) { - return StringHelper.isNullOrEmpty(user.getusername()) ? false : true; + private static boolean isUser(DbUser user) { + return !user.getIsGroup(); } /** -- To view, visit http://gerrit.ovirt.org/13653 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib17d50003d2b1425db9a2fc17c206da2d4db5de7 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
