This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 258aef521eb1441fe41e4e6d88a9a9c9236bb3ed Merge: 39f67492e1 0d0b5fa4a1 Author: Alex Heneveld <[email protected]> AuthorDate: Mon Jun 27 13:46:54 2022 +0100 Merge remote-tracking branch 'nakomis/add-api-response' .../org/apache/brooklyn/rest/api/AccessApi.java | 16 ++- .../org/apache/brooklyn/rest/api/ActivityApi.java | 35 ++++- .../org/apache/brooklyn/rest/api/AdjunctApi.java | 70 ++++++++-- .../apache/brooklyn/rest/api/ApplicationApi.java | 114 ++++++++++++++-- .../org/apache/brooklyn/rest/api/BundleApi.java | 80 ++++++++++- .../org/apache/brooklyn/rest/api/CatalogApi.java | 149 ++++++++++++++++++--- .../org/apache/brooklyn/rest/api/EffectorApi.java | 12 +- .../org/apache/brooklyn/rest/api/EntityApi.java | 134 +++++++++++++++--- .../apache/brooklyn/rest/api/EntityConfigApi.java | 37 ++++- .../org/apache/brooklyn/rest/api/LocationApi.java | 38 +++++- .../org/apache/brooklyn/rest/api/LogbookApi.java | 10 +- .../org/apache/brooklyn/rest/api/LogoutApi.java | 22 ++- .../org/apache/brooklyn/rest/api/ScriptApi.java | 10 +- .../org/apache/brooklyn/rest/api/SensorApi.java | 45 ++++++- .../org/apache/brooklyn/rest/api/ServerApi.java | 125 ++++++++++++++++- .../java/org/apache/brooklyn/rest/api/TypeApi.java | 32 ++++- .../org/apache/brooklyn/rest/api/UsageApi.java | 25 +++- 17 files changed, 848 insertions(+), 106 deletions(-) diff --cc rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/TypeApi.java index f17a003b7c,e50d4d23ba..46a3192f33 --- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/TypeApi.java +++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/TypeApi.java @@@ -89,15 -106,19 +106,22 @@@ public interface TypeApi @GET @ApiOperation(value = "Returns the icon image registered for this item") @Produces("application/image") + @ApiResponses(value = { + @ApiResponse(code = 200, message = "OK"), + @ApiResponse(code = 400, message = "Bad Request"), + @ApiResponse(code = 401, message = "Unauthorized"), + @ApiResponse(code = 404, message = "Type or version not found"), + @ApiResponse(code = 500, message = "Internal Server Error") + }) public Response icon( - @ApiParam(name = "symbolicName", value = "Type name to query", required = true) - @PathParam("symbolicName") - String symbolicName, - @ApiParam(name = "version", value = "Version to query", required = true) - @PathParam("version") - String version); + @ApiParam(name = "symbolicName", value = "Type name to query", required = true) + @PathParam("symbolicName") + String symbolicName, + @ApiParam(name = "version", value = "Version to query (or 'latest')", required = true) + @PathParam("version") + String version, + @ApiParam(name = "iconUrl", value = "URL or path to icon to load with respect to this entity", required = false) + @QueryParam("iconUrl") + String iconUrl); }
