Ravi Nori has uploaded a new change for review. Change subject: restapi: Mapping of empty name in user object (#B861098) ......................................................................
restapi: Mapping of empty name in user object (#B861098) When retrieving list of users using /api/users, empty name tag is added to the xml returned when the user does not belong to a group. The group should be omitted from the groups list if it is empty. Change-Id: I1444e755797b101a216fd2e20537dd6e2aaefb33 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=861098 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/9138/1 diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java index 98f25de..d4e3cef 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java @@ -24,10 +24,13 @@ model.setDepartment(entity.getdepartment()); if (entity.getgroups() != null) { model.setGroups(new Groups()); - for (String name : entity.getgroups().split(",")) { - Group group = new Group(); - group.setName(name); - model.getGroups().getGroups().add(group); + // string.split for an empty string returns an array of size 1 + if (entity.getgroups().trim().length() > 0) { + for (String name : entity.getgroups().split(",")) { + Group group = new Group(); + group.setName(name); + model.getGroups().getGroups().add(group); + } } } if(!StringHelper.isNullOrEmpty(entity.getdomain())){ -- To view, visit http://gerrit.ovirt.org/9138 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1444e755797b101a216fd2e20537dd6e2aaefb33 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
