You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2014/08/19 12:30:46 UTC
[8/9] git commit: Remove @Consumes(json) from CatalogApi class
Remove @Consumes(json) from CatalogApi class
It's untrue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a1b6a0d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a1b6a0d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a1b6a0d6
Branch: refs/heads/master
Commit: a1b6a0d645320359ce5824292000978c11540635
Parents: 7724f12
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Aug 12 15:08:49 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Aug 13 17:23:17 2014 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/api/CatalogApi.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1b6a0d6/usage/rest-api/src/main/java/brooklyn/rest/api/CatalogApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/brooklyn/rest/api/CatalogApi.java b/usage/rest-api/src/main/java/brooklyn/rest/api/CatalogApi.java
index 0642612..0888e90 100644
--- a/usage/rest-api/src/main/java/brooklyn/rest/api/CatalogApi.java
+++ b/usage/rest-api/src/main/java/brooklyn/rest/api/CatalogApi.java
@@ -39,7 +39,6 @@ import java.util.List;
@Path("/v1/catalog")
@Apidoc("Catalog")
@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
public interface CatalogApi {
@POST
@@ -82,9 +81,9 @@ public interface CatalogApi {
@ApiOperation(value = "List available entity types optionally matching a query", responseClass = "CatalogItemSummary", multiValueResponse = true)
public List<CatalogItemSummary> listEntities(
@ApiParam(name = "regex", value = "Regular expression to search for")
- final @QueryParam("regex") @DefaultValue("") String regex,
+ @QueryParam("regex") @DefaultValue("") String regex,
@ApiParam(name = "fragment", value = "Substring case-insensitive to search for")
- final @QueryParam("fragment") @DefaultValue("") String fragment
+ @QueryParam("fragment") @DefaultValue("") String fragment
) ;
@GET
@@ -92,9 +91,9 @@ public interface CatalogApi {
@ApiOperation(value = "Fetch a list of application templates optionally matching a query", responseClass = "CatalogItemSummary", multiValueResponse = true)
public List<CatalogItemSummary> listApplications(
@ApiParam(name = "regex", value = "Regular expression to search for")
- final @QueryParam("regex") @DefaultValue("") String regex,
+ @QueryParam("regex") @DefaultValue("") String regex,
@ApiParam(name = "fragment", value = "Substring case-insensitive to search for")
- final @QueryParam("fragment") @DefaultValue("") String fragment
+ @QueryParam("fragment") @DefaultValue("") String fragment
) ;
@GET
@@ -122,9 +121,9 @@ public interface CatalogApi {
@ApiOperation(value = "List available policies optionally matching a query", responseClass = "CatalogItemSummary", multiValueResponse = true)
public List<CatalogItemSummary> listPolicies(
@ApiParam(name = "regex", value = "Regular expression to search for")
- final @QueryParam("regex") @DefaultValue("") String regex,
+ @QueryParam("regex") @DefaultValue("") String regex,
@ApiParam(name = "fragment", value = "Substring case-insensitive to search for")
- final @QueryParam("fragment") @DefaultValue("") String fragment
+ @QueryParam("fragment") @DefaultValue("") String fragment
) ;
@GET
@@ -146,7 +145,7 @@ public interface CatalogApi {
@Produces("application/image")
public Response getIcon(
@ApiParam(name = "itemId", value = "ID of catalog item (application, entity, policy)")
- final @PathParam("itemId") @DefaultValue("") String itemId
+ @PathParam("itemId") @DefaultValue("") String itemId
) ;
}