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 2022/08/11 23:55:03 UTC
[brooklyn-server] 04/09: clarify destruction api, and pass errors to caller
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 d9a0f2eea7f5f852391ed76750bb11509f55083e
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Thu Aug 11 14:33:01 2022 +0100
clarify destruction api, and pass errors to caller
---
rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java | 2 +-
.../java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
index 7a69c9432b..12d2cb236a 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/EntityApi.java
@@ -325,7 +325,7 @@ public interface EntityApi {
public Response expunge(
@ApiParam(value = "Application ID or name", required = true) @PathParam("application") final String applicationId,
@ApiParam(value = "Entity ID or name", required = true) @PathParam("entity") final String entityId,
- @ApiParam(value = "Whether to gracefully release all resources", required = true) @QueryParam("release") final boolean release);
+ @ApiParam(value = "Whether to gracefully release all resources (failing and keeping if unsuccessful)", required = true) @QueryParam("release") final boolean release);
@GET
@Path("/{entity}/descendants")
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java
index d382205b0e..1ecf2d5bc0 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java
@@ -481,7 +481,7 @@ public class BrooklynRestResourceUtils {
@Override
public void run() {
if (release)
- Entities.destroyCatching(entity);
+ Entities.destroy(entity);
else
mgmt.getEntityManager().unmanage(entity);
}