Ori Liel has uploaded a new change for review. Change subject: resatpi: Move Numa-Node remove to entity ......................................................................
resatpi: Move Numa-Node remove 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: I24bd95e1f21c117c48a811818a4ba31cbb9d022c Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodeResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodeResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodesResource.java 4 files changed, 23 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/42018/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodeResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodeResource.java index eb3ea38..ca0a501 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodeResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodeResource.java @@ -1,9 +1,11 @@ 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.PUT; import javax.ws.rs.Produces; +import javax.ws.rs.core.Response; import org.ovirt.engine.api.model.VirtualNumaNode; @@ -16,4 +18,7 @@ @GET public VirtualNumaNode get(); + + @DELETE + public Response remove(); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodesResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodesResource.java index fc9e403..13e5af4 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodesResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/VmNumaNodesResource.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(VirtualNumaNode node); - - @DELETE - @Path("{id}") - public Response remove(@PathParam("id") String id); @Path("{iden}") public VmNumaNodeResource getVmNumaNodeSubResource(@PathParam("iden") String id); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodeResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodeResource.java index ba87036..1de9e9e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodeResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodeResource.java @@ -1,8 +1,12 @@ package org.ovirt.engine.api.restapi.resource; +import javax.ws.rs.core.Response; + import org.ovirt.engine.api.model.VirtualNumaNode; import org.ovirt.engine.api.resource.VmNumaNodeResource; +import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.action.VmNumaNodeOperationParameters; import org.ovirt.engine.core.common.businessentities.VmNumaNode; import org.ovirt.engine.core.compat.Guid; @@ -15,6 +19,7 @@ private EntityIdResolver<Guid> entityResolver; private String[] requiredUpdateFields; private BackendVmNumaNodesResource collection; + private VdcActionType removeAction; public BackendVmNumaNodeResource(String id, final BackendVmNumaNodesResource collection, @@ -26,6 +31,7 @@ this.updateParametersProvider = updateParametersProvider; this.requiredUpdateFields = requiredUpdateFields; this.collection = collection; + this.removeAction = VdcActionType.RemoveVmNumaNodes; entityResolver = new EntityIdResolver<Guid>() { @Override public VmNumaNode lookupEntity(Guid id) throws BackendFailureException { @@ -59,4 +65,16 @@ return model; } + @Override + public Response remove() { + get(); + return performAction(removeAction, getRemoveParameters(id)); + } + + private VdcActionParametersBase getRemoveParameters(String id) { + VmNumaNode entity = new VmNumaNode(); + entity.setId(asGuid(id)); + VmNumaNodeOperationParameters parameters = new VmNumaNodeOperationParameters(collection.parentId, entity); + return parameters; + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodesResource.java index e68070b..83e03ca 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmNumaNodesResource.java @@ -24,7 +24,6 @@ implements VmNumaNodesResource { private VdcActionType addAction; - private VdcActionType removeAction; private VdcActionType updateType; protected Class<VirtualNumaNodes> collectionType; protected Guid parentId; @@ -34,7 +33,6 @@ public BackendVmNumaNodesResource(Guid parentId) { super(VirtualNumaNode.class, VmNumaNode.class); this.addAction = VdcActionType.AddVmNumaNodes; - this.removeAction = VdcActionType.RemoveVmNumaNodes; this.updateType = VdcActionType.UpdateVmNumaNodes; this.collectionType = VirtualNumaNodes.class; this.parentId = parentId; @@ -56,13 +54,6 @@ private VdcActionParametersBase getAddParameters(VmNumaNode entity, VirtualNumaNode device) { VmNumaNodeOperationParameters parameters = new VmNumaNodeOperationParameters(parentId, map(device, entity)); - return parameters; - } - - private VdcActionParametersBase getRemoveParameters(String id) { - VmNumaNode entity = new VmNumaNode(); - entity.setId(asGuid(id)); - VmNumaNodeOperationParameters parameters = new VmNumaNodeOperationParameters(parentId, entity); return parameters; } @@ -147,10 +138,5 @@ } return null; } - } - - @Override - protected Response performRemove(String id) { - return performAction(removeAction, getRemoveParameters(id)); } } -- To view, visit https://gerrit.ovirt.org/42018 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24bd95e1f21c117c48a811818a4ba31cbb9d022c 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
