Set ApiOperaion response class to String Reason :: Using javax.ws.rs.core.Response is invalid
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ad6e8c86 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ad6e8c86 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ad6e8c86 Branch: refs/heads/master Commit: ad6e8c8637361d07d0f0226807763c0d92bdfe65 Parents: fd78635 Author: Mark McKenna <[email protected]> Authored: Tue Nov 24 19:40:20 2015 +0000 Committer: Mark McKenna <[email protected]> Committed: Wed Nov 25 11:36:15 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java | 2 +- .../apache/brooklyn/rest/client/BrooklynApiRestClientTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ad6e8c86/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java index bd93fb2..cf18b89 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java @@ -65,7 +65,7 @@ public interface CatalogApi { @Consumes @POST @ApiOperation(value = "Add a catalog item (e.g. new type of entity, policy or location) by uploading YAML descriptor " - + "Return value is map of ID to CatalogItemSummary, with code 201 CREATED.", response = Response.class) + + "Return value is map of ID to CatalogItemSummary, with code 201 CREATED.", response = String.class) public Response create( @ApiParam(name = "yaml", value = "YAML descriptor of catalog item", required = true) @Valid String yaml); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ad6e8c86/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java index da5bac5..da3966f 100644 --- a/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java +++ b/usage/rest-client/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java @@ -105,7 +105,8 @@ public class BrooklynApiRestClientTest { public void testCatalogCreate()throws Exception { final Response response = api.getCatalogApi().create(getFileContentsAsString("catalog/test-catalog.bom")); - Asserts.assertEquals(response.getStatus(),201); + Asserts.assertEquals(response.getStatus(), 201); + Asserts.assertStringContains(String.valueOf(response.getEntity()), "simple-tomcat:1.0"); }
