adding a proper response message when trying to deploy a non existing application
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a9c641a0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a9c641a0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a9c641a0 Branch: refs/heads/master Commit: a9c641a0ee35f1b3317511b7940068890aa3ef94 Parents: 8c395a8 Author: Dinithi <[email protected]> Authored: Tue May 19 15:32:46 2015 +0530 Committer: Dinithi <[email protected]> Committed: Tue May 19 15:32:46 2015 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/rest/endpoint/api/StratosApiV41.java | 7 ++++++- .../apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a9c641a0/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 670e38b..450653d 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 @@ -800,7 +800,12 @@ public class StratosApiV41 extends AbstractApi { return Response.status(Response.Status.CONFLICT).entity(new ResponseMessageBean( ResponseMessageBean.ERROR, "Application policy already deployed")).build(); } catch (RestAPIException e) { - throw e; + if (e.getMessage().contains("Application not found")) { + return Response.status(Response.Status.BAD_REQUEST).entity(new ResponseMessageBean( + ResponseMessageBean.ERROR, e.getMessage())).build(); + } else { + throw e; + } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/a9c641a0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java index 4e90a0b..794907b 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java @@ -1622,7 +1622,7 @@ public class StratosApiV41Utils { ApplicationContext application = autoscalerServiceClient.getApplication(applicationId); if (application == null) { - String message = String.format("Application is not found: [application-id] %s", applicationId); + String message = String.format("Application not found: [application-id] %s", applicationId); log.error(message); throw new RestAPIException(message); }
