Juan Hernandez has uploaded a new change for review. Change subject: restapi: Move External Host Provider remove from collection to entity ......................................................................
restapi: Move External Host Provider 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: If3287d0f8daf80ff6d2bb8e814361efabb8a8001 Related: https://gerrit.ovirt.org/41783 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProviderResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProvidersResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProviderResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProvidersResource.java 4 files changed, 26 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/41829/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProviderResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProviderResource.java index bc4e7d7..0b54dac 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProviderResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProviderResource.java @@ -16,8 +16,10 @@ package org.ovirt.engine.api.resource.externalhostproviders; +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.ExternalHostProvider; import org.ovirt.engine.api.resource.ApiMediaType; @@ -25,15 +27,18 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface ExternalHostProviderResource extends ExternalProviderResource<ExternalHostProvider> { + @DELETE + Response remove(); + @Path("computeresources") - public ExternalComputeResourcesResource getExternalComputeResources(); + ExternalComputeResourcesResource getExternalComputeResources(); @Path("discoveredhosts") - public ExternalDiscoveredHostsResource getExternalDiscoveredHosts(); + ExternalDiscoveredHostsResource getExternalDiscoveredHosts(); @Path("hostgroups") - public ExternalHostGroupsResource getExternalHostGroups(); + ExternalHostGroupsResource getExternalHostGroups(); @Path("hosts") - public ExternalHostsResource getExternalHosts(); + ExternalHostsResource getExternalHosts(); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProvidersResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProvidersResource.java index c0baa06..b508de0 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProvidersResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/externalhostproviders/ExternalHostProvidersResource.java @@ -17,7 +17,6 @@ package org.ovirt.engine.api.resource.externalhostproviders; 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; @@ -33,16 +32,12 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface ExternalHostProvidersResource { @GET - public ExternalHostProviders list(); + ExternalHostProviders list(); @POST @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) - public Response add(ExternalHostProvider provider); - - @DELETE - @Path("{id}") - public Response remove(@PathParam("id") String id); + Response add(ExternalHostProvider provider); @Path("{id}") - public ExternalHostProviderResource getExternalHostProvider(@PathParam("id") String id); + ExternalHostProviderResource getExternalHostProvider(@PathParam("id") String id); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProviderResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProviderResource.java index 2db3947..21afbf1 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProviderResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProviderResource.java @@ -25,6 +25,12 @@ import org.ovirt.engine.api.resource.externalhostproviders.ExternalHostProviderResource; import org.ovirt.engine.api.resource.externalhostproviders.ExternalHostsResource; 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; + +import javax.ws.rs.core.Response; public class BackendExternalHostProviderResource extends AbstractBackendExternalProviderResource<ExternalHostProvider> @@ -52,4 +58,12 @@ public ExternalHostsResource getExternalHosts() { return inject(new BackendExternalHostsResource(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/externalhostproviders/BackendExternalHostProvidersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProvidersResource.java index cb96456..2ef24c4 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProvidersResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProvidersResource.java @@ -29,7 +29,6 @@ import org.ovirt.engine.api.resource.externalhostproviders.ExternalHostProvidersResource; 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; @@ -101,13 +100,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 -- To view, visit https://gerrit.ovirt.org/41829 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3287d0f8daf80ff6d2bb8e814361efabb8a8001 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
