don't use the deprecated method when given json input
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c9fd0770 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c9fd0770 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c9fd0770 Branch: refs/heads/master Commit: c9fd07703b7d072da2508e740be229ed7eb1e41f Parents: cee8e1e Author: Alex Heneveld <[email protected]> Authored: Mon Apr 24 15:17:46 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Mon Apr 24 15:21:40 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c9fd0770/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java ---------------------------------------------------------------------- diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java index 12a6e93..dbdc847 100644 --- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java +++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java @@ -54,6 +54,7 @@ public interface CatalogApi { /** @deprecated since 0.11.0 use {@link #createFromYaml(String)} instead */ @Deprecated + @Consumes("application/json-deprecated") // prevent this from taking things @POST @ApiOperation( value = "Add a catalog items (e.g. new type of entity, policy or location) by uploading YAML descriptor.",
