Repository: stratos Updated Branches: refs/heads/master 67c3d8dd0 -> 2b6178202
Renaming group bean to cartridge group bean Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2b617820 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2b617820 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2b617820 Branch: refs/heads/master Commit: 2b6178202abfce58337707200a64e8bb8a60ef5a Parents: 67c3d8d Author: Imesh Gunaratne <[email protected]> Authored: Fri May 15 10:42:37 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri May 15 10:42:37 2015 +0530 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 16 +++--- .../common/beans/application/ComponentBean.java | 7 +-- .../common/beans/cartridge/VolumeBean.java | 7 +-- .../rest/endpoint/api/StratosApiV41.java | 11 ++-- .../rest/endpoint/api/StratosApiV41Utils.java | 54 +++++++++----------- .../util/converter/ObjectConverter.java | 24 ++++----- 6 files changed, 58 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2b617820/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java ---------------------------------------------------------------------- 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 ec43014..97eb728 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 @@ -37,7 +37,7 @@ import org.apache.stratos.cli.utils.RowMapper; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.beans.UserInfoBean; import org.apache.stratos.common.beans.application.ApplicationBean; -import org.apache.stratos.common.beans.application.GroupBean; +import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean; import org.apache.stratos.common.beans.application.domain.mapping.DomainMappingBean; import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean; import org.apache.stratos.common.beans.cartridge.CartridgeBean; @@ -364,9 +364,9 @@ public class RestCommandLineService { */ public void listCartridgeGroups() throws CommandException { try { - Type listType = new TypeToken<ArrayList<GroupBean>>() { + Type listType = new TypeToken<ArrayList<CartridgeGroupBean>>() { }.getType(); - List<GroupBean> cartridgeGroupList = (List<GroupBean>) restClient.listEntity(ENDPOINT_LIST_CARTRIDGE_GROUPS, + List<CartridgeGroupBean> cartridgeGroupList = (List<CartridgeGroupBean>) restClient.listEntity(ENDPOINT_LIST_CARTRIDGE_GROUPS, listType, "Cartridge Groups"); if ((cartridgeGroupList == null) || (cartridgeGroupList.size() == 0)) { @@ -374,8 +374,8 @@ public class RestCommandLineService { return; } - RowMapper<GroupBean> cartridgeGroupMapper = new RowMapper<GroupBean>() { - public String[] getData(GroupBean cartridgeGroup) { + RowMapper<CartridgeGroupBean> cartridgeGroupMapper = new RowMapper<CartridgeGroupBean>() { + public String[] getData(CartridgeGroupBean cartridgeGroup) { String[] data = new String[3]; data[0] = cartridgeGroup.getName(); data[1] = cartridgeGroup.getCartridges() == null ? "" : String.valueOf(cartridgeGroup.getCartridges().size()); @@ -383,7 +383,7 @@ public class RestCommandLineService { return data; } }; - GroupBean[] cartridgeGroups = new GroupBean[cartridgeGroupList.size()]; + CartridgeGroupBean[] cartridgeGroups = new CartridgeGroupBean[cartridgeGroupList.size()]; cartridgeGroups = cartridgeGroupList.toArray(cartridgeGroups); System.out.println("Cartridge Groups found:"); @@ -1479,8 +1479,8 @@ public class RestCommandLineService { */ public void describeServiceGroup(String groupDefinitionName) throws CommandException { try { - GroupBean bean = (GroupBean) restClient.listEntity(ENDPOINT_LIST_SERVICE_GROUP.replace("{groupDefinitionName}", groupDefinitionName), - GroupBean.class, "serviceGroup"); + CartridgeGroupBean bean = (CartridgeGroupBean) restClient.listEntity(ENDPOINT_LIST_SERVICE_GROUP.replace("{groupDefinitionName}", groupDefinitionName), + CartridgeGroupBean.class, "serviceGroup"); if (bean == null) { System.out.println("Cartridge group not found: " + groupDefinitionName); http://git-wip-us.apache.org/repos/asf/stratos/blob/2b617820/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java index 648aeed..7090c82 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java @@ -18,6 +18,7 @@ */ package org.apache.stratos.common.beans.application; +import org.apache.stratos.common.beans.cartridge.CartridgeGroupReferenceBean; import org.apache.stratos.common.beans.cartridge.CartridgeReferenceBean; import javax.xml.bind.annotation.XmlRootElement; @@ -29,15 +30,15 @@ public class ComponentBean implements Serializable { private static final long serialVersionUID = -5932265453191494386L; - private List<GroupReferenceBean> groups; + private List<CartridgeGroupReferenceBean> groups; private DependencyBean dependencies; private List<CartridgeReferenceBean> cartridges; - public List<GroupReferenceBean> getGroups() { + public List<CartridgeGroupReferenceBean> getGroups() { return groups; } - public void setGroups(List<GroupReferenceBean> groups) { + public void setGroups(List<CartridgeGroupReferenceBean> groups) { this.groups = groups; } http://git-wip-us.apache.org/repos/asf/stratos/blob/2b617820/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/VolumeBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/VolumeBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/VolumeBean.java index aaf0be6..8c869d8 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/VolumeBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/VolumeBean.java @@ -32,9 +32,10 @@ public class VolumeBean { private String volumeId; public String toString() { - return " [ Persistence Required : " + ", Size: " + getSize() + ", device: " + - getDevice() + " remove on termination " + isRemoveOnTermination() + - ", mappingPath : " + getMappingPath() + "] "; + return " [id: " + getId() + ", size: " + getSize() + ", device: " + + getDevice() + ", removeOnTermination: " + isRemoveOnTermination() + + ", mappingPath: " + getMappingPath() + ", snapshotId" + getSnapshotId() + + "volumeId: " + getVolumeId() + "]"; } public String getId() { http://git-wip-us.apache.org/repos/asf/stratos/blob/2b617820/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 3c5b5a0..d7b2841 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 @@ -21,12 +21,11 @@ package org.apache.stratos.rest.endpoint.api; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.stub.*; -import org.apache.stratos.autoscaler.stub.exception.InvalidServiceGroupException; import org.apache.stratos.cloud.controller.stub.*; import org.apache.stratos.common.beans.*; import org.apache.stratos.common.beans.application.ApplicationBean; import org.apache.stratos.common.beans.application.ApplicationNetworkPartitionIdListBean; -import org.apache.stratos.common.beans.application.GroupBean; +import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean; import org.apache.stratos.common.beans.application.domain.mapping.ApplicationDomainMappingsBean; import org.apache.stratos.common.beans.application.domain.mapping.DomainMappingBean; import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean; @@ -443,7 +442,7 @@ public class StratosApiV41 extends AbstractApi { @AuthorizationAction("/permission/protected/manage/addServiceGroup") @SuperTenantService(true) public Response addServiceGroup( - GroupBean serviceGroupDefinition) throws RestAPIException { + CartridgeGroupBean serviceGroupDefinition) throws RestAPIException { try { StratosApiV41Utils.addServiceGroup(serviceGroupDefinition); URI url = uriInfo.getAbsolutePathBuilder().path(serviceGroupDefinition.getName()).build(); @@ -480,7 +479,7 @@ public class StratosApiV41 extends AbstractApi { @Consumes("application/json") @AuthorizationAction("/permission/protected/manage/updateServiceGroup") public Response updateServiceGroup( - GroupBean cartridgeGroup) throws RestAPIException { + CartridgeGroupBean cartridgeGroup) throws RestAPIException { try { StratosApiV41Utils.updateServiceGroup(cartridgeGroup); @@ -514,7 +513,7 @@ public class StratosApiV41 extends AbstractApi { @AuthorizationAction("/permission/protected/manage/getServiceGroupDefinition") public Response getServiceGroupDefinition( @PathParam("groupDefinitionName") String groupDefinitionName) throws RestAPIException { - GroupBean serviceGroupDefinition = StratosApiV41Utils.getServiceGroupDefinition(groupDefinitionName); + CartridgeGroupBean serviceGroupDefinition = StratosApiV41Utils.getServiceGroupDefinition(groupDefinitionName); if (serviceGroupDefinition != null) { return Response.ok().entity(serviceGroupDefinition).build(); @@ -537,7 +536,7 @@ public class StratosApiV41 extends AbstractApi { @AuthorizationAction("/permission/protected/manage/getServiceGroupDefinition") public Response getServiceGroups() throws RestAPIException { - GroupBean[] serviceGroups = StratosApiV41Utils.getServiceGroupDefinitions(); + CartridgeGroupBean[] serviceGroups = StratosApiV41Utils.getServiceGroupDefinitions(); if (serviceGroups != null) { return Response.ok().entity(serviceGroups).build(); http://git-wip-us.apache.org/repos/asf/stratos/blob/2b617820/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 bc1f257..5fbd050 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 @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.stub.*; import org.apache.stratos.autoscaler.stub.deployment.policy.ApplicationPolicy; -import org.apache.stratos.autoscaler.stub.exception.InvalidServiceGroupException; import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; import org.apache.stratos.cloud.controller.stub.*; @@ -40,10 +39,7 @@ import org.apache.stratos.common.beans.application.domain.mapping.ApplicationDom import org.apache.stratos.common.beans.application.domain.mapping.DomainMappingBean; import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean; import org.apache.stratos.common.beans.artifact.repository.GitNotificationPayloadBean; -import org.apache.stratos.common.beans.cartridge.CartridgeBean; -import org.apache.stratos.common.beans.cartridge.CartridgeReferenceBean; -import org.apache.stratos.common.beans.cartridge.PersistenceBean; -import org.apache.stratos.common.beans.cartridge.VolumeBean; +import org.apache.stratos.common.beans.cartridge.*; import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean; import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean; import org.apache.stratos.common.beans.kubernetes.KubernetesMasterBean; @@ -972,7 +968,7 @@ public class StratosApiV41Utils { * @throws InvalidCartridgeGroupDefinitionException * @throws RestAPIException */ - public static void addServiceGroup(GroupBean serviceGroupDefinition) + public static void addServiceGroup(CartridgeGroupBean serviceGroupDefinition) throws InvalidCartridgeGroupDefinitionException, RestAPIException { try { if (serviceGroupDefinition == null) { @@ -1027,11 +1023,11 @@ public class StratosApiV41Utils { log.debug("checking subGroups in cartridge group " + serviceGroupDefinition.getName()); } - List<GroupBean> groupDefinitions = serviceGroupDefinition.getGroups(); + List<CartridgeGroupBean> groupDefinitions = serviceGroupDefinition.getGroups(); groupNames = new ArrayList<String>(); cartridgeGroupNames = new String[groupDefinitions.size()]; int i = 0; - for (GroupBean groupList : groupDefinitions) { + for (CartridgeGroupBean groupList : groupDefinitions) { groupNames.add(groupList.getName()); cartridgeGroupNames[i] = groupList.getName(); i++; @@ -1077,7 +1073,7 @@ public class StratosApiV41Utils { * @param cartridgeGroup * @throws RestAPIException */ - public static void updateServiceGroup(GroupBean cartridgeGroup) throws RestAPIException, + public static void updateServiceGroup(CartridgeGroupBean cartridgeGroup) throws RestAPIException, InvalidCartridgeGroupDefinitionException { try { ServiceGroup serviceGroup = ObjectConverter.convertServiceGroupDefinitionToASStubServiceGroup( @@ -1205,7 +1201,7 @@ public class StratosApiV41Utils { * @return GroupBean * @throws RestAPIException */ - public static GroupBean getServiceGroupDefinition(String name) throws RestAPIException { + public static CartridgeGroupBean getServiceGroupDefinition(String name) throws RestAPIException { if (log.isDebugEnabled()) { log.debug("Reading cartridge group: [group-name] " + name); @@ -1232,7 +1228,7 @@ public class StratosApiV41Utils { * @return array of Group Beans * @throws RestAPIException */ - public static GroupBean[] getServiceGroupDefinitions() throws RestAPIException { + public static CartridgeGroupBean[] getServiceGroupDefinitions() throws RestAPIException { if (log.isDebugEnabled()) { log.debug("Reading cartridge groups..."); @@ -1246,7 +1242,7 @@ public class StratosApiV41Utils { return null; } - GroupBean[] serviceGroupDefinitions = new GroupBean[serviceGroups.length]; + CartridgeGroupBean[] serviceGroupDefinitions = new CartridgeGroupBean[serviceGroups.length]; for (int i = 0; i < serviceGroups.length; i++) { serviceGroupDefinitions[i] = ObjectConverter.convertStubServiceGroupToServiceGroupDefinition( serviceGroups[i]); @@ -1341,7 +1337,7 @@ public class StratosApiV41Utils { * @param groupBean groupBean * @param cartridges List of cartridges */ - private static void findCartridgesInGroupBean(GroupBean groupBean, List<String> cartridges) { + private static void findCartridgesInGroupBean(CartridgeGroupBean groupBean, List<String> cartridges) { if (groupBean == null || cartridges == null) { return; @@ -1356,7 +1352,7 @@ public class StratosApiV41Utils { } if (groupBean.getGroups() != null) { - for (GroupBean seGroup : groupBean.getGroups()) { + for (CartridgeGroupBean seGroup : groupBean.getGroups()) { findCartridgesInGroupBean(seGroup, cartridges); } } @@ -1499,9 +1495,9 @@ public class StratosApiV41Utils { ComponentBean componentBean = applicationBean.getComponents(); - List<GroupReferenceBean> groupReferenceBeans = componentBean.getGroups(); + List<CartridgeGroupReferenceBean> groupReferenceBeans = componentBean.getGroups(); if (groupReferenceBeans != null) { - for (GroupReferenceBean groupReferenceBean : groupReferenceBeans) { + for (CartridgeGroupReferenceBean groupReferenceBean : groupReferenceBeans) { findCartridgesAndGroupsInCartridgeGroup(groupReferenceBean, cartridges, cartridgeGroups); } } @@ -1517,7 +1513,7 @@ public class StratosApiV41Utils { * @param cartridgeGroups List <String> */ private static void findCartridgesAndGroupsInCartridgeGroup( - GroupReferenceBean groupReferenceBean, List<String> cartridges, List<String> cartridgeGroups) { + CartridgeGroupReferenceBean groupReferenceBean, List<String> cartridges, List<String> cartridgeGroups) { if (groupReferenceBean == null || cartridgeGroups == null) { return; @@ -1528,7 +1524,7 @@ public class StratosApiV41Utils { } if (groupReferenceBean.getGroups() != null) { - for (GroupReferenceBean grReferenceBean : groupReferenceBean.getGroups()) { + for (CartridgeGroupReferenceBean grReferenceBean : groupReferenceBean.getGroups()) { findCartridgesAndGroupsInCartridgeGroup(grReferenceBean, cartridges, cartridgeGroups); findCartridgeNamesInCartridges(groupReferenceBean.getCartridges(), cartridges); } @@ -1579,13 +1575,13 @@ public class StratosApiV41Utils { */ private static void validateGroupAliasesInApplicationDefinition(ApplicationBean applicationDefinition) throws RestAPIException { - ConcurrentHashMap<String, GroupReferenceBean> groupsInApplicationDefinition = new ConcurrentHashMap<String, GroupReferenceBean>(); + ConcurrentHashMap<String, CartridgeGroupReferenceBean> groupsInApplicationDefinition = new ConcurrentHashMap<String, CartridgeGroupReferenceBean>(); if ((applicationDefinition.getComponents().getGroups() != null) && (!applicationDefinition.getComponents().getGroups().isEmpty())) { //This is to validate the top level groups in the application definition - for (GroupReferenceBean group : applicationDefinition.getComponents().getGroups()) { + for (CartridgeGroupReferenceBean group : applicationDefinition.getComponents().getGroups()) { if (groupsInApplicationDefinition.get(group.getAlias()) != null) { String message = "Cartridge group alias exists more than once: [group-alias] " + group.getAlias(); @@ -1609,9 +1605,9 @@ public class StratosApiV41Utils { * @throws RestAPIException */ - private static void validateGroupsRecursively(ConcurrentHashMap<String, GroupReferenceBean> groupsSet, - Collection<GroupReferenceBean> groups) throws RestAPIException { - for (GroupReferenceBean group : groups) { + private static void validateGroupsRecursively(ConcurrentHashMap<String, CartridgeGroupReferenceBean> groupsSet, + Collection<CartridgeGroupReferenceBean> groups) throws RestAPIException { + for (CartridgeGroupReferenceBean group : groups) { if (groupsSet.get(group.getAlias()) != null) { String message = "Cartridge group alias exists more than once: [group-alias] " + group.getAlias(); @@ -3345,7 +3341,7 @@ public class StratosApiV41Utils { * @param groupBean - cartridge group definition * @throws InvalidCartridgeGroupDefinitionException - throws when the group definition is invalid */ - private static void validateCartridgeDuplicationInGroupDefinition(GroupBean groupBean) + private static void validateCartridgeDuplicationInGroupDefinition(CartridgeGroupBean groupBean) throws InvalidCartridgeGroupDefinitionException { if (groupBean == null) { return; @@ -3359,7 +3355,7 @@ public class StratosApiV41Utils { } if (groupBean.getGroups() != null) { //Recursive because to check groups inside groups - for (GroupBean group : groupBean.getGroups()) { + for (CartridgeGroupBean group : groupBean.getGroups()) { validateCartridgeDuplicationInGroupDefinition(group); } } @@ -3394,7 +3390,7 @@ public class StratosApiV41Utils { * @param groupBean - cartridge group definition * @throws InvalidCartridgeGroupDefinitionException */ - private static void validateGroupDuplicationInGroupDefinition(GroupBean groupBean) + private static void validateGroupDuplicationInGroupDefinition(CartridgeGroupBean groupBean) throws InvalidCartridgeGroupDefinitionException { validateGroupDuplicationInGroupDefinition(groupBean, new ArrayList<String>()); } @@ -3406,7 +3402,7 @@ public class StratosApiV41Utils { * @param parentGroups - list of string which holds the parent group names (all parents in the hierarchy) * @throws InvalidCartridgeGroupDefinitionException - throws when the group definition is invalid */ - private static void validateGroupDuplicationInGroupDefinition(GroupBean groupBean, List<String> parentGroups) + private static void validateGroupDuplicationInGroupDefinition(CartridgeGroupBean groupBean, List<String> parentGroups) throws InvalidCartridgeGroupDefinitionException { if (groupBean == null) { return; @@ -3415,7 +3411,7 @@ public class StratosApiV41Utils { parentGroups.add(groupBean.getName()); if (groupBean.getGroups() != null) { if (!groupBean.getGroups().isEmpty()) { - for (GroupBean g : groupBean.getGroups()) { + for (CartridgeGroupBean g : groupBean.getGroups()) { groups.add(g.getName()); } validateGroupDuplicationInGroup(groups, parentGroups); @@ -3423,7 +3419,7 @@ public class StratosApiV41Utils { } if (groupBean.getGroups() != null) { //Recursive because to check groups inside groups - for (GroupBean group : groupBean.getGroups()) { + for (CartridgeGroupBean group : groupBean.getGroups()) { validateGroupDuplicationInGroupDefinition(group, parentGroups); parentGroups.remove(group.getName()); } http://git-wip-us.apache.org/repos/asf/stratos/blob/2b617820/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java index ef80291..dbb83e5 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java @@ -1060,12 +1060,12 @@ public class ObjectConverter { return applicationDefinition; } - private static List<GroupReferenceBean> convertStubGroupContextsToGroupDefinitions(GroupContext[] groupContexts) { - List<GroupReferenceBean> groupDefinitions = new ArrayList<GroupReferenceBean>(); + private static List<CartridgeGroupReferenceBean> convertStubGroupContextsToGroupDefinitions(GroupContext[] groupContexts) { + List<CartridgeGroupReferenceBean> groupDefinitions = new ArrayList<CartridgeGroupReferenceBean>(); if (groupContexts != null) { for (GroupContext groupContext : groupContexts) { if (groupContext != null) { - GroupReferenceBean groupDefinition = new GroupReferenceBean(); + CartridgeGroupReferenceBean groupDefinition = new CartridgeGroupReferenceBean(); groupDefinition.setAlias(groupContext.getAlias()); groupDefinition.setGroupMaxInstances(groupContext.getGroupMaxInstances()); groupDefinition.setGroupMinInstances(groupContext.getGroupMinInstances()); @@ -1369,7 +1369,7 @@ public class ObjectConverter { } private static org.apache.stratos.autoscaler.stub.pojo.GroupContext[] - convertGroupDefinitionsToStubGroupContexts(List<GroupReferenceBean> groupDefinitions) { + convertGroupDefinitionsToStubGroupContexts(List<CartridgeGroupReferenceBean> groupDefinitions) { if (groupDefinitions == null) { return null; @@ -1377,7 +1377,7 @@ public class ObjectConverter { GroupContext[] groupContexts = new GroupContext[groupDefinitions.size()]; int i = 0; - for (GroupReferenceBean groupDefinition : groupDefinitions) { + for (CartridgeGroupReferenceBean groupDefinition : groupDefinitions) { GroupContext groupContext = new GroupContext(); groupContext.setName(groupDefinition.getName()); groupContext.setAlias(groupDefinition.getAlias()); @@ -1533,7 +1533,7 @@ public class ObjectConverter { return carbonTenantInfoBean; } - public static ServiceGroup convertServiceGroupDefinitionToASStubServiceGroup(GroupBean groupBean) + public static ServiceGroup convertServiceGroupDefinitionToASStubServiceGroup(CartridgeGroupBean groupBean) throws ServiceGroupDefinitionException { if (groupBean == null) { @@ -1541,13 +1541,13 @@ public class ObjectConverter { } ServiceGroup servicegroup = new ServiceGroup(); - List<GroupBean> groupsDefinitions = groupBean.getGroups(); + List<CartridgeGroupBean> groupsDefinitions = groupBean.getGroups(); List<String> cartridgesDefinitions = groupBean.getCartridges(); servicegroup.setName(groupBean.getName()); if (groupsDefinitions == null) { - groupsDefinitions = new ArrayList<GroupBean>(0); + groupsDefinitions = new ArrayList<CartridgeGroupBean>(0); } if (cartridgesDefinitions == null) { @@ -1558,7 +1558,7 @@ public class ObjectConverter { String[] cartridges = new String[cartridgesDefinitions.size()]; int i = 0; - for (GroupBean groupDefinition : groupsDefinitions) { + for (CartridgeGroupBean groupDefinition : groupsDefinitions) { subGroups[i] = convertServiceGroupDefinitionToASStubServiceGroup(groupDefinition); ++i; } @@ -1605,18 +1605,18 @@ public class ObjectConverter { return startupOrders; } - public static GroupBean convertStubServiceGroupToServiceGroupDefinition(ServiceGroup serviceGroup) { + public static CartridgeGroupBean convertStubServiceGroupToServiceGroupDefinition(ServiceGroup serviceGroup) { if (serviceGroup == null) { return null; } - GroupBean serviceGroupDefinition = new GroupBean(); + CartridgeGroupBean serviceGroupDefinition = new CartridgeGroupBean(); serviceGroupDefinition.setName(serviceGroup.getName()); String[] cartridges = serviceGroup.getCartridges(); ServiceGroup[] groups = serviceGroup.getGroups(); org.apache.stratos.autoscaler.stub.pojo.Dependencies dependencies = serviceGroup.getDependencies(); - List<GroupBean> groupDefinitions = new ArrayList<GroupBean>(groups.length); + List<CartridgeGroupBean> groupDefinitions = new ArrayList<CartridgeGroupBean>(groups.length); for (ServiceGroup group : groups) { if (group != null) { groupDefinitions.add(convertStubServiceGroupToServiceGroupDefinition(group));
