Refactoring
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2fdac39d Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2fdac39d Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2fdac39d Branch: refs/heads/master Commit: 2fdac39d7f8c2907511383524b1ef8afced23c3b Parents: ea8fce5 Author: Vishanth <[email protected]> Authored: Wed May 6 18:19:55 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon May 11 12:19:59 2015 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV41.java | 15 +++++---- .../rest/endpoint/api/StratosApiV41Utils.java | 33 ++++++++++---------- 2 files changed, 26 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2fdac39d/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 4578019..543a19b 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 @@ -455,15 +455,18 @@ public class StratosApiV41 extends AbstractApi { if (e.getCause().getMessage().contains("already exists")) { return Response.status(Response.Status.CONFLICT).entity(new StatusResponseBean( Response.Status.CONFLICT.getStatusCode(), "Cartridge group not found")).build(); - } else if(e.getCause().getMessage().contains("duplicate cartridges")) { + } else if (e.getCause().getMessage().contains("duplicate cartridges")) { return Response.status(Response.Status.BAD_REQUEST).entity(new StatusResponseBean( - Response.Status.BAD_REQUEST.getStatusCode(), "Cartridges duplicated in the group definition")).build(); - } else if(e.getCause().getMessage().contains("duplicate groups")) { + Response.Status.BAD_REQUEST.getStatusCode(), "Cartridges duplicated in the group " + + "definition")).build(); + } else if (e.getCause().getMessage().contains("duplicate groups")) { return Response.status(Response.Status.BAD_REQUEST).entity(new StatusResponseBean( - Response.Status.BAD_REQUEST.getStatusCode(), "Groups duplicated in the group definition")).build(); - } else if(e.getCause().getMessage().contains("cyclic group")) { + Response.Status.BAD_REQUEST.getStatusCode(), "Groups duplicated in the group " + + "definition")).build(); + } else if (e.getCause().getMessage().contains("cyclic group")) { return Response.status(Response.Status.BAD_REQUEST).entity(new StatusResponseBean( - Response.Status.BAD_REQUEST.getStatusCode(), "Cyclic group behaviour identified in the group definition")).build(); + Response.Status.BAD_REQUEST.getStatusCode(), "Cyclic group behaviour identified in the group " + + "definition")).build(); } else { throw e; } http://git-wip-us.apache.org/repos/asf/stratos/blob/2fdac39d/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 96f0c18..f611035 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 @@ -966,6 +966,7 @@ public class StratosApiV41Utils { /** * Add a Service Group + * * @param serviceGroupDefinition serviceGroupDefinition * @throws RestAPIException */ @@ -980,11 +981,11 @@ public class StratosApiV41Utils { List<String> groupNames; String[] cartridgeGroupNames; - if (log.isDebugEnabled()) { - log.debug("checking cartridges in cartridge group " + serviceGroupDefinition.getName()); - } + if (log.isDebugEnabled()) { + log.debug("checking cartridges in cartridge group " + serviceGroupDefinition.getName()); + } - findCartridgesInGroupBean(serviceGroupDefinition, cartridgeTypes); + findCartridgesInGroupBean(serviceGroupDefinition, cartridgeTypes); //validate the group definition to check if cartridges duplicate in any groups defined validateCartridgeDuplicationInGroupDefinition(serviceGroupDefinition); @@ -993,7 +994,7 @@ public class StratosApiV41Utils { //validate the group definition to check for cyclic group behaviour validateGroupDuplicationInGroupDefinition(serviceGroupDefinition, new ArrayList<String>()); - CloudControllerServiceClient ccServiceClient = getCloudControllerServiceClient(); + CloudControllerServiceClient ccServiceClient = getCloudControllerServiceClient(); cartridgeNames = new String[cartridgeTypes.size()]; int j = 0; @@ -3230,7 +3231,7 @@ public class StratosApiV41Utils { * @param groupBean - cartridge group definition * @throws RestAPIException - throws the rest api exception when the group definition is invalid */ - private static void validateCartridgeDuplicationInGroupDefinition(GroupBean groupBean) throws RestAPIException{ + private static void validateCartridgeDuplicationInGroupDefinition(GroupBean groupBean) throws RestAPIException { if (groupBean == null) { return; } @@ -3248,19 +3249,19 @@ public class StratosApiV41Utils { } } } + /** * This method is to validate the duplication of cartridges from the given list * * @param cartridges - list of strings which holds the cartridgeTypes values * @throws RestAPIException - throws the rest api exception when the cartridges are duplicated */ - private static void validateCartridgeDuplicationInGroup(List<String> cartridges) throws RestAPIException{ + private static void validateCartridgeDuplicationInGroup(List<String> cartridges) throws RestAPIException { List<String> checkList = new ArrayList<String>(); for (String cartridge : cartridges) { if (!checkList.contains(cartridge)) { checkList.add(cartridge); - } - else { + } else { if (log.isDebugEnabled()) { log.debug("duplicate cartridges defined: " + cartridge); } @@ -3269,15 +3270,16 @@ public class StratosApiV41Utils { } } } + /** * This method is to validate the group duplication in the group definition recursively for group within groups * - * @param groupBean - cartridge group definition + * @param groupBean - cartridge group definition * @param parentGroups - list of string which holds the parent group names (all parents in the hierarchy) * @throws RestAPIException - throws the rest api exception when the group definition is invalid */ private static void validateGroupDuplicationInGroupDefinition(GroupBean groupBean, List<String> parentGroups) - throws RestAPIException{ + throws RestAPIException { if (groupBean == null) { return; } @@ -3299,21 +3301,21 @@ public class StratosApiV41Utils { } } } + /** * This method is to validate the duplication of groups in the same level and to validate cyclic behaviour of groups * - * @param groups - cartridge group definition + * @param groups - cartridge group definition * @param parentGroups - list of string which holds the parent group names (all parents in the hierarchy) * @throws RestAPIException - throws the rest api exception when group duplicate or when cyclic behaviour occurs */ private static void validateGroupDuplicationInGroup(List<String> groups, List<String> parentGroups) - throws RestAPIException{ + throws RestAPIException { List<String> checkList = new ArrayList<String>(); for (String group : groups) { if (!checkList.contains(group)) { checkList.add(group); - } - else { + } else { if (log.isDebugEnabled()) { log.debug("duplicate group defined: " + group); } @@ -3329,5 +3331,4 @@ public class StratosApiV41Utils { } } } - }
