Juan Hernandez has submitted this change and it was merged. Change subject: restapi: Improve affinity label resources ...................................................................... restapi: Improve affinity label resources Currently the resources that manage the virtual machines and hosts that are part of an affinity label are implemented using abstract generic base classes. This doesn't work correctly with some versions of Resteasy, as generic methods aren't recognized as implementations of the methods annotated with @GET. In addition the methods to add virtual machines and hosts aren't implemented correctly, as they return "action" instead of the expected "vm" or "host" elements. To address these issues this patch removes the abstract generic base classes, and moves the reusable code to a new helper class. The methods that add virtual machines and hosts are modified so that they return "vm" or "host", as expected. Change-Id: I274750970f283bb9ce813f301a28a5cbc544eb60 Bug-Url: https://bugzilla.redhat.com/1350228 Signed-off-by: Juan Hernandez <juan.hernandez@redhat.com> --- D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAffinityLabelledEntitiesResource.java D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAffinityLabelledEntityResource.java A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAffinityLabelHelper.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAffinityLabelHostResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAffinityLabelHostsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAffinityLabelVmResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAffinityLabelVmsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAffinityLabelsResource.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/AffinityLabelMapper.java 9 files changed, 248 insertions(+), 199 deletions(-) Approvals: Martin Sivák: Looks good to me, but someone else must approve Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/61388 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I274750970f283bb9ce813f301a28a5cbc544eb60 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernandez@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez@redhat.com> Gerrit-Reviewer: Martin Sivák <msivak@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>