Ori Liel has uploaded a new change for review. Change subject: restapi: Move OpenStackImageProviders remove from collection to entity ......................................................................
restapi: Move OpenStackImageProviders 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: I7e3955373f22e8ccf9ba3a3ae874c1489e0db9e3 Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProviderResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProvidersResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProvidersResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResourceTest.java 5 files changed, 32 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/41828/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProviderResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProviderResource.java index 87c3232..01580fe 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProviderResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProviderResource.java @@ -16,8 +16,10 @@ package org.ovirt.engine.api.resource.openstack; +import javax.ws.rs.DELETE; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.core.Response; import org.ovirt.engine.api.model.OpenStackImageProvider; import org.ovirt.engine.api.resource.ApiMediaType; @@ -27,4 +29,8 @@ public interface OpenStackImageProviderResource extends ExternalProviderResource<OpenStackImageProvider> { @Path("images") public OpenStackImagesResource getOpenStackImages(); + + @DELETE + public Response remove(); + } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProvidersResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProvidersResource.java index e81cb4e..5255362 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProvidersResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProvidersResource.java @@ -17,7 +17,6 @@ package org.ovirt.engine.api.resource.openstack; 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; @@ -38,10 +37,6 @@ @POST @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public Response add(OpenStackImageProvider provider); - - @DELETE - @Path("{id}") - public Response remove(@PathParam("id") String id); @Path("{id}") public OpenStackImageProviderResource getOpenStackImageProvider(@PathParam("id") String id); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResource.java index d0c58ff..26a1621 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResource.java @@ -18,10 +18,16 @@ import static org.ovirt.engine.api.restapi.resource.openstack.BackendOpenStackImageProvidersResource.SUB_COLLECTIONS; +import javax.ws.rs.core.Response; + import org.ovirt.engine.api.model.OpenStackImageProvider; import org.ovirt.engine.api.resource.openstack.OpenStackImageProviderResource; import org.ovirt.engine.api.resource.openstack.OpenStackImagesResource; import org.ovirt.engine.api.restapi.resource.AbstractBackendExternalProviderResource; +import org.ovirt.engine.api.restapi.resource.BackendExternalProviderHelper; +import org.ovirt.engine.core.common.action.ProviderParameters; +import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.businessentities.Provider; public class BackendOpenStackImageProviderResource extends AbstractBackendExternalProviderResource<OpenStackImageProvider> @@ -34,4 +40,11 @@ public OpenStackImagesResource getOpenStackImages() { return inject(new BackendOpenStackImagesResource(id)); } + + @Override + public Response remove() { + Provider provider = BackendExternalProviderHelper.getProvider(this, id); + ProviderParameters parameters = new ProviderParameters(provider); + return performAction(VdcActionType.RemoveProvider, parameters); + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProvidersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProvidersResource.java index fafb176..9666613 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProvidersResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProvidersResource.java @@ -28,7 +28,6 @@ import org.ovirt.engine.api.resource.openstack.OpenStackImageProvidersResource; import org.ovirt.engine.api.restapi.resource.AbstractBackendCollectionResource; import org.ovirt.engine.api.restapi.resource.SingleEntityResource; -import org.ovirt.engine.api.restapi.resource.BackendExternalProviderHelper; import org.ovirt.engine.core.common.action.ProviderParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.Provider; @@ -97,13 +96,6 @@ new ProviderParameters(map(provider)), new QueryIdResolver<Guid>(VdcQueryType.GetProviderById, IdQueryParameters.class) ); - } - - @Override - protected Response performRemove(String id) { - Provider provider = BackendExternalProviderHelper.getProvider(this, id); - ProviderParameters parameters = new ProviderParameters(provider); - return performAction(VdcActionType.RemoveProvider, parameters); } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResourceTest.java index bbe7480..6f22bd8 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResourceTest.java @@ -107,6 +107,19 @@ doTestBadUpdate(true, false, FAILURE); } + @Test + public void testRemove() throws Exception { + setUriInfo(setUpBasicUriExpectations()); + setUpGetEntityExpectations(1); + setUpActionExpectations(VdcActionType.RemoveProvider, + ProviderParameters.class, + new String[] { "Provider.Id" }, + new Object[] { GUIDS[0] }, + true, + true); + resource.remove(); + } + private void doTestBadUpdate(boolean canDo, boolean success, String detail) throws Exception { setUpGetEntityExpectations(1); setUriInfo( -- To view, visit https://gerrit.ovirt.org/41828 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e3955373f22e8ccf9ba3a3ae874c1489e0db9e3 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
