Ori Liel has uploaded a new change for review. Change subject: restapi: More DisksSnapshot remove from collection to entity ......................................................................
restapi: More DisksSnapshot 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: I15002d3d428c6d5a206c49ffed5e3dabdb31c525 Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDiskResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDisksResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDiskResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDisksResource.java 4 files changed, 16 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/41920/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDiskResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDiskResource.java index 2ba2c27..cb4fac8 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDiskResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDiskResource.java @@ -1,7 +1,9 @@ package org.ovirt.engine.api.resource; +import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.Produces; +import javax.ws.rs.core.Response; import org.ovirt.engine.api.model.Disk; @@ -11,4 +13,7 @@ @GET public Disk get(); + @DELETE + public Response remove(); + } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDisksResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDisksResource.java index 140001d..6b3d36e 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDisksResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/SnapshotDisksResource.java @@ -1,11 +1,9 @@ package org.ovirt.engine.api.resource; -import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; import org.ovirt.engine.api.model.Disks; @@ -17,8 +15,4 @@ @Path("{id}") public SnapshotDiskResource getDiskSubResource(@PathParam("id") String id); - - @DELETE - @Path("{id}") - public Response remove(@PathParam("id") String id); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDiskResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDiskResource.java index ed03c8e..89a8a59 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDiskResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDiskResource.java @@ -4,6 +4,11 @@ import org.ovirt.engine.api.model.Disk; import org.ovirt.engine.api.resource.SnapshotDiskResource; +import org.ovirt.engine.api.restapi.types.DiskMapper; +import org.ovirt.engine.core.common.action.RemoveDiskSnapshotsParameters; +import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.businessentities.storage.DiskImage; + import javax.ws.rs.core.Response; public class BackendSnapshotDiskResource extends BackendDiskResource implements SnapshotDiskResource { @@ -31,4 +36,10 @@ protected Disk doPopulate(Disk model, org.ovirt.engine.core.common.businessentities.storage.Disk entity) { return model; } + + @Override + public Response remove() { + DiskImage diskImage = (DiskImage) DiskMapper.map(get(), null); + return performAction(VdcActionType.RemoveDiskSnapshots, new RemoveDiskSnapshotsParameters(diskImage.getImageId())); + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDisksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDisksResource.java index 522723c..2a66729 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDisksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDisksResource.java @@ -6,12 +6,8 @@ import org.ovirt.engine.api.resource.SnapshotDiskResource; import org.ovirt.engine.api.resource.SnapshotDisksResource; import org.ovirt.engine.api.restapi.types.DiskMapper; -import org.ovirt.engine.core.common.action.RemoveDiskSnapshotsParameters; -import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.storage.DiskImage; - -import javax.ws.rs.core.Response; public class BackendSnapshotDisksResource extends AbstractBackendCollectionResource<Disk, Snapshot> implements SnapshotDisksResource { @@ -44,15 +40,6 @@ @Override public SnapshotDiskResource getDiskSubResource(String id) { return new BackendSnapshotDiskResource(id, this); - } - - @Override - public Response performRemove(String id) { - getEntity(id); //verifies that entity exists, returns 404 otherwise. - - DiskImage diskImage = (DiskImage) DiskMapper.map(getDiskSubResource(id).get(), null); - - return performAction(VdcActionType.RemoveDiskSnapshots, new RemoveDiskSnapshotsParameters(diskImage.getImageId())); } @Override -- To view, visit https://gerrit.ovirt.org/41920 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I15002d3d428c6d5a206c49ffed5e3dabdb31c525 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
