Juan Hernandez has uploaded a new change for review. Change subject: restapi: Don't use generic interfaces in Open Stack resources ......................................................................
restapi: Don't use generic interfaces in Open Stack resources The RSDL generator doesn't support generic interfaces. This means that the generated RSDL document won't be complete, in particular the "volumetypes" subcollection won't be documented, and thus won't be available in the SDKs. To avoid this issue this patch replaces the use of generic interfaces with normal interfaces. This doesn't affect the semantics of the resources. Change-Id: I561ba517a5a882657cb72fd2f8a831269a5e7bc3 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/ExternalProviderResource.java 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/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/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImagesResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworksResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetsResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypeResource.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendExternalProviderResource.java 17 files changed, 79 insertions(+), 49 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/39561/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/ExternalProviderResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/ExternalProviderResource.java index b691df2..b8ad792 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/ExternalProviderResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/ExternalProviderResource.java @@ -16,33 +16,26 @@ package org.ovirt.engine.api.resource; -import javax.ws.rs.Consumes; import javax.ws.rs.POST; -import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; import org.ovirt.engine.api.model.Action; import org.ovirt.engine.api.model.Actionable; -import org.ovirt.engine.api.model.ExternalProvider; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) -public interface ExternalProviderResource<R extends ExternalProvider> extends UpdatableResource<R> { +public interface ExternalProviderResource { @Path("certificates") - public ExternalProviderCertificatesResource getCertificates(); + ExternalProviderCertificatesResource getCertificates(); @POST @Actionable @Path("testconnectivity") - public Response testConnectivity(Action action); + Response testConnectivity(Action action); @POST @Actionable @Path("importcertificates") - public Response importCertificates(Action action); - - @PUT - @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) - public R update(R resource); + Response importCertificates(Action action); } 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..3012762 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,6 +16,9 @@ package org.ovirt.engine.api.resource.externalhostproviders; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -24,16 +27,23 @@ import org.ovirt.engine.api.resource.ExternalProviderResource; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) -public interface ExternalHostProviderResource extends ExternalProviderResource<ExternalHostProvider> { +public interface ExternalHostProviderResource extends ExternalProviderResource { + @GET + ExternalHostProvider get(); + + @PUT + @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) + ExternalHostProvider update(ExternalHostProvider resource); + @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/openstack/OpenStackImageProviderResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageProviderResource.java index 87c3232..4841545 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,6 +16,9 @@ package org.ovirt.engine.api.resource.openstack; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -24,7 +27,14 @@ import org.ovirt.engine.api.resource.ExternalProviderResource; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) -public interface OpenStackImageProviderResource extends ExternalProviderResource<OpenStackImageProvider> { +public interface OpenStackImageProviderResource extends ExternalProviderResource { + @GET + OpenStackImageProvider get(); + + @PUT + @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) + OpenStackImageProvider update(OpenStackImageProvider resource); + @Path("images") - public OpenStackImagesResource getOpenStackImages(); + OpenStackImagesResource getOpenStackImages(); } 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..5557f13 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 @@ -33,16 +33,16 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackImageProvidersResource { @GET - public OpenStackImageProviders list(); + OpenStackImageProviders list(); @POST @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) - public Response add(OpenStackImageProvider provider); + Response add(OpenStackImageProvider provider); @DELETE @Path("{id}") - public Response remove(@PathParam("id") String id); + Response remove(@PathParam("id") String id); @Path("{id}") - public OpenStackImageProviderResource getOpenStackImageProvider(@PathParam("id") String id); + OpenStackImageProviderResource getOpenStackImageProvider(@PathParam("id") String id); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageResource.java index d2c6401..4d819ca 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImageResource.java @@ -30,10 +30,10 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackImageResource { @GET - public OpenStackImage get(); + OpenStackImage get(); @POST @Actionable @Path("import") - public Response doImport(Action action); + Response doImport(Action action); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImagesResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImagesResource.java index 1e93a32..fa29428 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImagesResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackImagesResource.java @@ -28,7 +28,7 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackImagesResource { @GET - public OpenStackImages list(); + OpenStackImages list(); @Path("{id}") OpenStackImageResource getOpenStackImage(@PathParam("id") String id); diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java index ef57fc3..9a3e98d 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProviderResource.java @@ -16,6 +16,9 @@ package org.ovirt.engine.api.resource.openstack; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -24,7 +27,14 @@ import org.ovirt.engine.api.resource.ExternalProviderResource; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) -public interface OpenStackNetworkProviderResource extends ExternalProviderResource<OpenStackNetworkProvider> { +public interface OpenStackNetworkProviderResource extends ExternalProviderResource { + @GET + OpenStackNetworkProvider get(); + + @PUT + @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) + OpenStackNetworkProvider update(OpenStackNetworkProvider resource); + @Path("networks") - public OpenStackNetworksResource getOpenStackNetworks(); + OpenStackNetworksResource getOpenStackNetworks(); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java index 385eb13..bfe4b28 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkProvidersResource.java @@ -32,18 +32,17 @@ @Path("/openstacknetworkproviders") @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackNetworkProvidersResource { - @GET - public OpenStackNetworkProviders list(); + OpenStackNetworkProviders list(); @POST @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) - public Response add(OpenStackNetworkProvider provider); + Response add(OpenStackNetworkProvider provider); @DELETE @Path("{id}") - public Response remove(@PathParam("id") String id); + Response remove(@PathParam("id") String id); @Path("{id}") - public OpenStackNetworkProviderResource getOpenStackNetworkProvider(@PathParam("id") String id); + OpenStackNetworkProviderResource getOpenStackNetworkProvider(@PathParam("id") String id); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkResource.java index e99b660..6907e2b 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworkResource.java @@ -26,7 +26,7 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackNetworkResource { @GET - public OpenStackNetwork get(); + OpenStackNetwork get(); @Path("subnets") OpenStackSubnetsResource getOpenStackSubnets(); diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworksResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworksResource.java index 712347b..abdca2f 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworksResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackNetworksResource.java @@ -28,7 +28,7 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackNetworksResource { @GET - public OpenStackNetworks list(); + OpenStackNetworks list(); @Path("{id}") OpenStackNetworkResource getOpenStackNetwork(@PathParam("id") String id); diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetResource.java index a0abd2b..34c390f 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetResource.java @@ -25,5 +25,5 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackSubnetResource { @GET - public OpenStackSubnet get(); + OpenStackSubnet get(); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetsResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetsResource.java index a209fff..54fd385 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetsResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackSubnetsResource.java @@ -33,15 +33,15 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackSubnetsResource { @GET - public OpenStackSubnets list(); + OpenStackSubnets list(); @POST @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) - public Response add(OpenStackSubnet subnet); + Response add(OpenStackSubnet subnet); @DELETE @Path("{id}") - public Response remove(@PathParam("id") String id); + Response remove(@PathParam("id") String id); @Path("{id}") OpenStackSubnetResource getOpenStackSubnet(@PathParam("id") String id); diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java index 4fb3b2f..f77a7f8 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProviderResource.java @@ -20,11 +20,21 @@ import org.ovirt.engine.api.resource.ApiMediaType; import org.ovirt.engine.api.resource.ExternalProviderResource; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) -public interface OpenStackVolumeProviderResource extends ExternalProviderResource<OpenStackVolumeProvider> { +public interface OpenStackVolumeProviderResource extends ExternalProviderResource { + @GET + OpenStackVolumeProvider get(); + + @PUT + @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) + OpenStackVolumeProvider update(OpenStackVolumeProvider resource); + @Path("volumetypes") - public OpenStackVolumeTypesResource getOpenStackVolumeTypes(); + OpenStackVolumeTypesResource getOpenStackVolumeTypes(); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java index a4fbb3f..95ee6bd 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeProvidersResource.java @@ -33,16 +33,16 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackVolumeProvidersResource { @GET - public OpenStackVolumeProviders list(); + OpenStackVolumeProviders list(); @POST @Consumes({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) - public Response add(OpenStackVolumeProvider provider); + Response add(OpenStackVolumeProvider provider); @DELETE @Path("{id}") - public Response remove(@PathParam("id") String id); + Response remove(@PathParam("id") String id); @Path("{id}") - public OpenStackVolumeProviderResource getOpenStackVolumeProvider(@PathParam("id") String id); + OpenStackVolumeProviderResource getOpenStackVolumeProvider(@PathParam("id") String id); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypeResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypeResource.java index a8f5443..946ffcb 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypeResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypeResource.java @@ -25,5 +25,5 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackVolumeTypeResource { @GET - public OpenStackVolumeType get(); + OpenStackVolumeType get(); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypesResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypesResource.java index 4d4c2c8..644002b 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypesResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/openstack/OpenStackVolumeTypesResource.java @@ -28,7 +28,7 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface OpenStackVolumeTypesResource { @GET - public OpenStackVolumeTypes list(); + OpenStackVolumeTypes list(); @Path("{id}") OpenStackVolumeTypeResource getOpenStackVolumeType(@PathParam("id") String id); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendExternalProviderResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendExternalProviderResource.java index 4bca115..24f4c51 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendExternalProviderResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendExternalProviderResource.java @@ -37,17 +37,15 @@ public abstract class AbstractBackendExternalProviderResource<R extends ExternalProvider> extends AbstractBackendActionableResource<R, Provider> - implements ExternalProviderResource<R> { + implements ExternalProviderResource { public AbstractBackendExternalProviderResource(String id, Class<R> modelType, String... subCollections) { super(id, modelType, Provider.class, subCollections); } - @Override public R get() { return performGet(VdcQueryType.GetProviderById, new IdQueryParameters(guid)); } - @Override public R update(R incoming) { return performUpdate( incoming, -- To view, visit https://gerrit.ovirt.org/39561 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I561ba517a5a882657cb72fd2f8a831269a5e7bc3 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
