Ori Liel has uploaded a new change for review. Change subject: restapi: Move QoS remove from collection to entity ......................................................................
restapi: Move QoS remove from collection to entity This patch moves the method that implements the DELETE operation from the collection interface to the entity interface. This is needed to avoid issues with newer versions of Resteasy. Change-Id: I727ef19388024fd9d329b201e7c2457d26afcbee Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QoSsResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QosResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQosResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQossResource.java 4 files changed, 17 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/41924/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QoSsResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QoSsResource.java index b1035fb..9fc7986 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QoSsResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QoSsResource.java @@ -1,7 +1,6 @@ package org.ovirt.engine.api.resource; import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -21,10 +20,6 @@ @POST @Consumes({ ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML }) public Response add(QoS qos); - - @DELETE - @Path("{id}") - public Response remove(@PathParam("id") String id); @Path("{id}") public QosResource getQosSubResource(@PathParam("id") String id); diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QosResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QosResource.java index 91279c1..3fdf73e 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QosResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/QosResource.java @@ -1,10 +1,16 @@ package org.ovirt.engine.api.resource; +import javax.ws.rs.DELETE; import javax.ws.rs.Produces; +import javax.ws.rs.core.Response; import org.ovirt.engine.api.model.QoS; @Produces({ ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML }) public interface QosResource extends UpdatableResource<QoS> { + @DELETE + public Response remove(); + + } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQosResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQosResource.java index 994fe80..52f23d5 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQosResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQosResource.java @@ -1,7 +1,10 @@ package org.ovirt.engine.api.restapi.resource; +import javax.ws.rs.core.Response; + import org.ovirt.engine.api.model.QoS; import org.ovirt.engine.api.resource.QosResource; +import org.ovirt.engine.api.restapi.utils.GuidUtils; import org.ovirt.engine.core.common.action.QosParametersBase; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; @@ -81,4 +84,12 @@ protected QoS doPopulate(QoS model, QosBase entity) { return model; } + + @Override + public Response remove() { + get(); + QosParametersBase<?> params = new QosParametersBase<>(); + params.setQosId(GuidUtils.asGuid(id)); + return performAction(VdcActionType.RemoveStorageQos, params); + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQossResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQossResource.java index fec37a4..16916dc 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQossResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendQossResource.java @@ -9,7 +9,6 @@ import org.ovirt.engine.api.model.QoSs; import org.ovirt.engine.api.resource.QoSsResource; import org.ovirt.engine.api.resource.QosResource; -import org.ovirt.engine.api.restapi.utils.GuidUtils; import org.ovirt.engine.core.common.action.QosParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.network.NetworkQoS; @@ -67,13 +66,6 @@ return performCreate(addVdcActionType, params, new QueryIdResolver<Guid>(VdcQueryType.GetQosById, IdQueryParameters.class)); - } - - @Override - protected Response performRemove(String id) { - QosParametersBase<?> params = new QosParametersBase<>(); - params.setQosId(GuidUtils.asGuid(id)); - return performAction(VdcActionType.RemoveStorageQos, params); } @Override -- To view, visit https://gerrit.ovirt.org/41924 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I727ef19388024fd9d329b201e7c2457d26afcbee Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
