Ori Liel has uploaded a new change for review. Change subject: restapi: #920483 - Group Wrongly Displayed as User (within permission) ......................................................................
restapi: #920483 - Group Wrongly Displayed as User (within permission) Change-Id: I033811202a87b1a7e7c7e56d43ad6e2d685f1658 Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.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/BackendUserAssignedPermissionsResourceTest.java 3 files changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/14310/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 fd8d5e1..5d56247 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 @@ -33,7 +33,6 @@ 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> @@ -175,11 +174,11 @@ */ public Permission map(permissions entity, DbUser user) { Permission template = new Permission(); - if (entity.getad_element_id() != null && user != null) { + if (entity.getad_element_id() != null) { if (isUser(user)) { template.setUser(new User()); template.getUser().setId(entity.getad_element_id().toString()); - } else if (entity.getad_element_id() != null) { + } else { template.setGroup(new Group()); template.getGroup().setId(entity.getad_element_id().toString()); } @@ -188,8 +187,8 @@ } //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 != null && !user.getIsGroup(); } /** 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 1eba0ba..bc54d44 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 @@ -106,8 +106,13 @@ @Override protected void verifyModel(Permission model, int index) { super.verifyModel(model, index); - assertTrue(model.isSetUser()); - assertEquals(GUIDS[1].toString(), model.getUser().getId()); + if (index == 0) { + assertTrue(model.isSetUser()); + assertEquals(GUIDS[1].toString(), model.getUser().getId()); + } else { + assertTrue(model.isSetGroup()); + assertEquals(GUIDS[1].toString(), model.getGroup().getId()); + } } } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java index 3b14555..c94fbfe 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java @@ -87,8 +87,13 @@ @Override protected void verifyModel(Permission model, int index) { super.verifyModel(model, index); - assertTrue(model.isSetUser()); - assertEquals(GUIDS[1].toString(), model.getUser().getId()); + if (index == 0) { + assertTrue(model.isSetUser()); + assertEquals(GUIDS[1].toString(), model.getUser().getId()); + } else { + assertTrue(model.isSetGroup()); + assertEquals(GUIDS[1].toString(), model.getGroup().getId()); + } } } -- To view, visit http://gerrit.ovirt.org/14310 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I033811202a87b1a7e7c7e56d43ad6e2d685f1658 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: engine_3.2 Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
