Update the tenant deletion with not support as carbon is not support this feature
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f252352a Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f252352a Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f252352a Branch: refs/heads/master Commit: f252352aee1c0a9f359db9ed89c516f3b45ef236 Parents: 2a9e2d4 Author: Gayan Gunarathne <[email protected]> Authored: Tue Jan 27 16:47:34 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Tue Jan 27 16:47:34 2015 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV41.java | 26 ++------------------ 1 file changed, 2 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f252352a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index cf6a420..6457538 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -1135,31 +1135,9 @@ public class StratosApiV41 extends AbstractApi { @AuthorizationAction("/permission/protected/manage/monitor/tenants") @SuperTenantService(true) public Response removeTenant(@PathParam("tenantDomain") String tenantDomain) throws RestAPIException { - TenantManager tenantManager = ServiceHolder.getTenantManager(); - int tenantId = 0; - try { - tenantId = tenantManager.getTenantId(tenantDomain); - } catch (org.wso2.carbon.user.api.UserStoreException e) { - String msg = "Error in deleting tenant " + tenantDomain; - log.error(msg, e); - //throw new RestAPIException(msg); - return Response.status(Response.Status.NOT_FOUND).build(); - } - try { - //TODO: billing related info cleanup - TenantMgtUtil.deleteTenantRegistryData(tenantId); - TenantMgtUtil.deleteTenantUMData(tenantId); - tenantManager.deleteTenant(tenantId); - log.info("Deleted tenant with domain: " + tenantDomain + " and tenant id: " + tenantId + - " from the system."); - } catch (Exception e) { - String msg = "Error deleting tenant with domain: " + tenantDomain + " and tenant id: " + - tenantId + "."; - log.error(msg, e); - throw new RestAPIException(msg); - } - return Response.noContent().build(); + return Response.status(Response.Status.NOT_ACCEPTABLE).entity("Please use the tenant deactivate method").build(); + } /**
