From e414299516c95094fe6e9e25a35ea2d54f39b28e Mon Sep 17 00:00:00 2001 From: Dinithi Date: Tue, 19 May 2015 13:35:33 +0530 Subject: [PATCH 1/3] Modified service group into cartridge group --- .../org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java index ce71418e15..71661a7c25 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java @@ -870,7 +870,8 @@ public static void validateStartupOrders(String groupName, String[] startupOrder for (String splittedStartupOrder : splittedStartupOrders) { if (!splittedStartupOrder.trim().startsWith("cartridge.") && !splittedStartupOrder.trim().startsWith("group.")) { // invalid startup order; should prefixed by either 'cartridge.' or 'group.' - throw new InvalidServiceGroupException("Invalid Service Group: startup order [" + startupOrder + "] for group " + groupName + + throw new InvalidServiceGroupException("Invalid cartridge group: startup order [" + startupOrder + + "] for group " + groupName + ", should prefixed by either 'cartridge.' or 'group.'"); } } @@ -892,7 +893,8 @@ public static void validateScalingDependencies(String groupName, String[] scalin for (String splittedDependent : splittedDependents) { if (!splittedDependent.trim().startsWith("cartridge.") && !splittedDependent.trim().startsWith("group.")) { // invalid startup order; should prefixed by either 'cartridge.' or 'group.' - throw new InvalidServiceGroupException("Invalid Service Group: Scaling Dependency [" + scalingDependent + "] for group " + groupName + + throw new InvalidServiceGroupException("Invalid cartridge group: Scaling Dependency [" + + scalingDependent + "] for group " + groupName + ", should prefixed by either 'cartridge.' or 'group.'"); } } From a9c641a0ee35f1b3317511b7940068890aa3ef94 Mon Sep 17 00:00:00 2001 From: Dinithi Date: Tue, 19 May 2015 15:32:46 +0530 Subject: [PATCH 2/3] adding a proper response message when trying to deploy a non existing application --- .../apache/stratos/rest/endpoint/api/StratosApiV41.java | 7 ++++++- .../stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) 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 670e38bce0..450653d98b 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 Response deployApplication( 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; + } } } 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 4e90a0b594..794907b310 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 static void deployApplication(String applicationId, String applicationPol 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); } From de1f661911a11508e03e06a5ecc617fdba65896b Mon Sep 17 00:00:00 2001 From: Dinithi Date: Tue, 19 May 2015 18:07:14 +0530 Subject: [PATCH 3/3] Fixed issues found when adding a user with a non existing user role --- .../apache/stratos/cli/RestCommandLineService.java | 11 +++++------ .../user/management/StratosUserManagerUtils.java | 2 +- .../stratos/rest/endpoint/api/StratosApiV41Utils.java | 3 +-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java index f878e5fbb2..30b332eb90 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java @@ -63,6 +63,8 @@ import java.util.HashMap; import java.util.List; +import static org.apache.stratos.cli.utils.CliUtils.getHttpResponseString; + public class RestCommandLineService { private static final Logger log = LoggerFactory.getLogger(RestCommandLineService.class); @@ -685,12 +687,9 @@ public void addUser(String userName, String credential, String role, String firs HttpResponse response = restClient.doPost(httpClient, restClient.getBaseURL() + ENDPOINT_ADD_USER, jsonString); - int responseCode = response.getStatusLine().getStatusCode(); - if (responseCode < 200 || responseCode >= 300) { - CliUtils.printError(response); - } else { - System.out.println("User added successfully: " + userName); - } + String result = getHttpResponseString(response); + System.out.println(gson.fromJson(result, ResponseMessageBean.class).getMessage()); + } catch (Exception e) { String message = "Could not add user: " + userName; printError(message, e); diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java index 5ca089d7e7..0f9deeb762 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/StratosUserManagerUtils.java @@ -71,7 +71,7 @@ public static void addUser(UserStoreManager userStoreManager, UserInfoBean userI } catch (UserStoreException e) { String msg = "Error in adding user " + userInfoBean.getUserName() + " to User Store"; log.error(msg, e); - throw new UserManagerException(msg, e); + throw new UserManagerException(e.getMessage()); } } 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 35d2668279..70f18efaee 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 @@ -3243,9 +3243,8 @@ public static void addUser(UserInfoBean userInfoBean) throws RestAPIException { } catch (UserManagerException e) { String msg = "Error in adding User"; log.error(msg, e); - throw new RestAPIException(msg, e); + throw new RestAPIException(e.getMessage()); } - }