You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/07/11 06:14:11 UTC
[04/10] git commit: Adds /v1/catalog/applications/id to Rest API
Adds /v1/catalog/applications/id to Rest API
Just calls equivalent for /v1/catalog/entities/id. Makes jsgui logic
much simpler.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/02a60db8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/02a60db8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/02a60db8
Branch: refs/heads/master
Commit: 02a60db8efaefd1938a363cb20327803d3ffcf4e
Parents: 1c7fab3
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Jul 8 13:19:03 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Jul 9 14:29:36 2014 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/api/CatalogApi.java | 10 ++++++++++
.../java/brooklyn/rest/resources/CatalogResource.java | 7 +++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/02a60db8/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 8e0d213..3503df8 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
@@ -71,6 +71,16 @@ public interface CatalogApi {
@PathParam("entityId") String entityId) throws Exception ;
@GET
+ @Path("/applications/{applicationId}")
+ @ApiOperation(value = "Fetch an application's definition from the catalog", responseClass = "CatalogEntitySummary", multiValueResponse = true)
+ @ApiErrors(value = {
+ @ApiError(code = 404, reason = "Entity not found")
+ })
+ public CatalogEntitySummary getApplication(
+ @ApiParam(name = "applicationId", value = "The ID of the application to retrieve", required = true)
+ @PathParam("applicationId") String entityId) throws Exception ;
+
+ @GET
@Path("/policies")
@ApiOperation(value = "List available policies optionally matching a query", responseClass = "CatalogItemSummary", multiValueResponse = true)
public List<CatalogItemSummary> listPolicies(
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/02a60db8/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
index 2872a64..169130a 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
@@ -35,8 +35,6 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
import com.google.common.io.CharStreams;
import com.google.common.io.Files;
import com.sun.jersey.core.header.FormDataContentDisposition;
@@ -104,6 +102,11 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
}
@Override
+ public CatalogEntitySummary getApplication(String applicationId) {
+ return getEntity(applicationId);
+ }
+
+ @Override
public List<CatalogItemSummary> listPolicies(String regex, String fragment) {
return getCatalogItemSummariesMatchingRegexFragment(CatalogPredicates.IS_POLICY, regex, fragment);
}