Juan Hernandez has uploaded a new change for review. Change subject: restapi: Don't assume that Lists are ArrayLists ......................................................................
restapi: Don't assume that Lists are ArrayLists Currently there are a few places where we assume that the result returned by the backend is an ArrayList. This isn't necessary true, in particular it isn't true for lists of users and groups returned by directories, as they will be special empty lists. This patch changes the RESTAPI so that it uses the List interface instead of the ArrayList class. Change-Id: Iff2d2a7b558f111312b6299ce7ed95993deb68ca Bug-Url: https://bugzilla.redhat.com/1073359 Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com> (cherry picked from commit 975457b92d5b6f02d845c5410ae11d3d186a3635) --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCentersResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUsersResource.java 3 files changed, 3 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/25480/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCentersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCentersResource.java index 20f5497..ae12deb 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCentersResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCentersResource.java @@ -1,6 +1,5 @@ package org.ovirt.engine.api.restapi.resource; -import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.Response; @@ -94,7 +93,7 @@ protected DataCenter deprecatedPopulate(DataCenter model, StoragePool entity) { IdQueryParameters parameters = new IdQueryParameters(new Guid(model.getId())); model.setSupportedVersions(getMapper(List.class, - SupportedVersions.class).map(getEntity(ArrayList.class, + SupportedVersions.class).map(getEntity(List.class, VdcQueryType.GetAvailableStoragePoolVersions, parameters, model.getId()), diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupsResource.java index 3b4bfc0..d9567e4 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupsResource.java @@ -1,7 +1,6 @@ package org.ovirt.engine.api.restapi.resource; import java.text.MessageFormat; -import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.Response; @@ -80,7 +79,7 @@ private List<DirectoryGroup> getDomainGroups() { return asCollection( DirectoryGroup.class, - getEntity(ArrayList.class, SearchType.DirectoryGroup, getSearchPattern()) + getEntity(List.class, SearchType.DirectoryGroup, getSearchPattern()) ); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUsersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUsersResource.java index 391aba2..7c25039 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUsersResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainUsersResource.java @@ -1,7 +1,6 @@ package org.ovirt.engine.api.restapi.resource; import java.text.MessageFormat; -import java.util.ArrayList; import java.util.List; import javax.ws.rs.core.Response; @@ -77,10 +76,7 @@ } private List<DirectoryUser> getDomainUsers() { - return asCollection(DirectoryUser.class, - getEntity(ArrayList.class, - SearchType.DirectoryUser, - getSearchPattern())); + return asCollection(DirectoryUser.class, getEntity(List.class, SearchType.DirectoryUser, getSearchPattern())); } private Users mapUsers(List<DirectoryUser> entities) { -- To view, visit http://gerrit.ovirt.org/25480 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff2d2a7b558f111312b6299ce7ed95993deb68ca Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
