From 542a2aa04073955f59f8d712b042a53f0cedd550 Mon Sep 17 00:00:00 2001 From: alberts Date: Wed, 18 Jun 2014 15:06:22 +0200 Subject: [PATCH] remove commented lines --- .../euro_iaas/sdc/rest/resources/ArtifactResource.java | 2 -- .../telefonica/euro_iaas/sdc/rest/resources/NodeResource.java | 1 - .../euro_iaas/sdc/rest/resources/ProductInstanceResource.java | 2 -- .../euro_iaas/sdc/rest/resources/ProductReleaseResource.java | 3 --- .../euro_iaas/sdc/rest/resources/ProductResource.java | 2 -- .../telefonica/euro_iaas/sdc/rest/resources/TaskResource.java | 1 - 6 files changed, 11 deletions(-) diff --git a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ArtifactResource.java b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ArtifactResource.java index 36011a09..14313208 100644 --- a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ArtifactResource.java +++ b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ArtifactResource.java @@ -60,7 +60,6 @@ public interface ArtifactResource { * @return the installed product. */ @POST -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) Task install(@PathParam("vdc") String vdc, @PathParam("productInstance") String productIntanceName, @@ -88,7 +87,6 @@ Task install(@PathParam("vdc") String vdc, @PathParam("productInstance") String * @return the product instances that match with the criteria. */ @GET -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) List findAll(@QueryParam("page") Integer page, @QueryParam("pageSize") Integer pageSize, @QueryParam("orderBy") String orderBy, @QueryParam("orderType") String orderType, diff --git a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/NodeResource.java b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/NodeResource.java index 28b56336..231e5933 100644 --- a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/NodeResource.java +++ b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/NodeResource.java @@ -54,7 +54,6 @@ public interface NodeResource { * @return the chefclients. */ @GET -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) ChefClient findByHostname(@QueryParam("hostname") String hostname) throws EntityNotFoundException, ChefClientExecutionException; diff --git a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductInstanceResource.java b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductInstanceResource.java index 56b593de..1a9912c4 100644 --- a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductInstanceResource.java +++ b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductInstanceResource.java @@ -59,7 +59,6 @@ public interface ProductInstanceResource extends BaseInstallableInstanceResource * @return the installed product. */ @POST -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) Task install(@PathParam("vdc") String vdc, ProductInstanceDto product, @HeaderParam("callback") String callback); @@ -86,7 +85,6 @@ public interface ProductInstanceResource extends BaseInstallableInstanceResource * @return the product instances that match with the criteria. */ @GET -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) List findAll(@QueryParam("hostname") String hostname, @QueryParam("domain") String domain, @QueryParam("ip") String ip, @QueryParam("fqn") String fqn, @QueryParam("page") Integer page, diff --git a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductReleaseResource.java b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductReleaseResource.java index 907c88d8..3e5a490a 100644 --- a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductReleaseResource.java +++ b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductReleaseResource.java @@ -66,7 +66,6 @@ public interface ProductReleaseResource { * if the Product Release is invalid due to either OS, Product or Product Release */ @POST -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) ProductRelease insert(@PathParam("pName") String pName, ProductReleaseDto productRelease) @@ -80,7 +79,6 @@ ProductRelease insert(@PathParam("pName") String pName, ProductReleaseDto produc * @throws InvalidMultiPartRequestException */ @POST -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes("multipart/mixed") ProductRelease insert(MultiPart multiPart) throws AlreadyExistsProductReleaseException, @@ -102,7 +100,6 @@ ProductRelease insert(MultiPart multiPart) throws AlreadyExistsProductReleaseExc * @return the ProductReleases. */ @GET -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) List findAll(@PathParam("pName") String pName, @QueryParam("osType") String osType, @QueryParam("page") Integer page, @QueryParam("pageSize") Integer pageSize, diff --git a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductResource.java b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductResource.java index 1d58e3a9..f24dafa3 100644 --- a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductResource.java +++ b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/ProductResource.java @@ -61,7 +61,6 @@ public interface ProductResource { * @return product */ @POST -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) Product insert(Product product) throws AlreadyExistsEntityException, InvalidEntityException; @@ -80,7 +79,6 @@ public interface ProductResource { * @return the created OS instances. */ @GET -// @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) List findAll(@QueryParam("page") Integer page, @QueryParam("pageSize") Integer pageSize, @QueryParam("orderBy") String orderBy, @QueryParam("orderType") String orderType); diff --git a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/TaskResource.java b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/TaskResource.java index 07a4bf8e..42933269 100644 --- a/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/TaskResource.java +++ b/rest-api/src/main/java/com/telefonica/euro_iaas/sdc/rest/resources/TaskResource.java @@ -82,7 +82,6 @@ public interface TaskResource { * @return the tasks that match with the criteria. */ @GET - @Path("/") @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) List findAll(@QueryParam("page") Integer page, @QueryParam("pageSize") Integer pageSize, @QueryParam("orderBy") String orderBy, @QueryParam("orderType") String orderType,