Fixed group deployment changes V2
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1b3087c0 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1b3087c0 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1b3087c0 Branch: refs/heads/master Commit: 1b3087c049d33976394e40bb642ed220b0f9f039 Parents: 4460668 Author: Manula Thantriwatte <[email protected]> Authored: Tue Dec 2 11:06:30 2014 +0000 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Dec 2 11:28:39 2014 +0000 ---------------------------------------------------------------------- .../deployer/DefaultServiceGroupDeployer.java | 52 +----------------- .../bean/util/converter/PojoConverter.java | 57 ++------------------ 2 files changed, 6 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1b3087c0/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java index 20e4a4c..286768a 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/grouping/deployer/DefaultServiceGroupDeployer.java @@ -291,55 +291,11 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { for (ServiceGroupDefinition groupDefinition : groupsDef) { int i = 0; - subGroups[i] = pojoConversion(groupDefinition); + subGroups[i] = populateServiceGroupPojo(groupDefinition); ++i; } - //subGroups = groupsDef.toArray(subGroups); - cartridges = cartridgesDef.toArray(cartridges); - servicegroup.setGroups(subGroups); - servicegroup.setCartridges(cartridges); - - DependencyDefinitions depDefs = serviceGroupDefinition.getDependencies(); - - if (depDefs != null) { - Dependencies deps = new Dependencies(); - List<String> startupOrdersDef = depDefs.getStartupOrders(); - if (startupOrdersDef != null) { - String[] startupOrders = new String[startupOrdersDef.size()]; - startupOrders = startupOrdersDef.toArray(startupOrders); - deps.setStartupOrders(startupOrders); - } - // validate termination behavior - validateTerminationBehavior(depDefs.getTerminationBehaviour()); - deps.setTerminationBehaviour(depDefs.getTerminationBehaviour()); - servicegroup.setDependencies(deps); - } - - return servicegroup; - } - - private ServiceGroup pojoConversion (ServiceGroupDefinition serviceGroupDefinition) { - ServiceGroup servicegroup = new ServiceGroup(); - - servicegroup.setGroupscalingEnabled(serviceGroupDefinition.isGroupScalingEnabled()); - List<String> cartridgesDef = serviceGroupDefinition.getCartridges(); - List<ServiceGroupDefinition> groupsDef = serviceGroupDefinition.getGroups(); - - servicegroup.setName(serviceGroupDefinition.getName()); - - if (cartridgesDef == null) { - cartridgesDef = new ArrayList<String>(0); - } - - if (groupsDef == null) { - groupsDef = new ArrayList<ServiceGroupDefinition>(0); - } - - ServiceGroup[] subGroups = new ServiceGroup[groupsDef.size()]; - String[] cartridges = new String[cartridgesDef.size()]; - cartridges = cartridgesDef.toArray(cartridges); servicegroup.setCartridges(cartridges); @@ -354,15 +310,11 @@ public class DefaultServiceGroupDeployer implements ServiceGroupDeployer { deps.setStartupOrders(startupOrders); } // validate termination behavior - //validateTerminationBehavior(depDefs.getTerminationBehaviour()); + validateTerminationBehavior(depDefs.getTerminationBehaviour()); deps.setTerminationBehaviour(depDefs.getTerminationBehaviour()); servicegroup.setDependencies(deps); } - for (ServiceGroupDefinition groupDefinition : groupsDef) { - pojoConversion(groupDefinition); - } - return servicegroup; } http://git-wip-us.apache.org/repos/asf/stratos/blob/1b3087c0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 605fa91..13e69dd 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@ -23,7 +23,10 @@ import org.apache.commons.lang.StringUtils; import org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelPartition; import org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelNetworkPartition; import org.apache.stratos.autoscaler.stub.deployment.policy.ChildPolicy; -import org.apache.stratos.autoscaler.stub.pojo.*; +import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; +import org.apache.stratos.autoscaler.stub.pojo.DependencyContext; +import org.apache.stratos.autoscaler.stub.pojo.GroupContext; +import org.apache.stratos.autoscaler.stub.pojo.SubscribableInfoContext; import org.apache.stratos.cloud.controller.stub.domain.*; import org.apache.stratos.common.Properties; import org.apache.stratos.common.Property; @@ -32,7 +35,6 @@ import org.apache.stratos.manager.composite.application.beans.GroupDefinition; import org.apache.stratos.manager.composite.application.beans.SubscribableDefinition; import org.apache.stratos.manager.composite.application.beans.SubscribableInfo; import org.apache.stratos.manager.deploy.service.Service; -import org.apache.stratos.manager.exception.ServiceGroupDefinitioException; import org.apache.stratos.manager.grouping.definitions.DependencyDefinitions; import org.apache.stratos.manager.grouping.definitions.ServiceGroupDefinition; import org.apache.stratos.manager.subscription.SubscriptionDomain; @@ -123,60 +125,9 @@ public class PojoConverter { public static ServiceGroup populateServiceGroupPojo(ServiceGroupDefinition serviceGroupDefinition) { ServiceGroup servicegroup = new ServiceGroup(); - servicegroup.setGroupscalingEnabled(serviceGroupDefinition.isGroupScalingEnabled()); - List<String> cartridgesDef = serviceGroupDefinition.getCartridges(); - List<ServiceGroupDefinition> groupsDef = serviceGroupDefinition.getGroups(); - - servicegroup.setName(serviceGroupDefinition.getName()); - - if (cartridgesDef == null) { - cartridgesDef = new ArrayList<String>(0); - } - - if (groupsDef == null) { - groupsDef = new ArrayList<ServiceGroupDefinition>(0); - } - - ServiceGroup[] subGroups = new ServiceGroup[groupsDef.size()]; - String[] cartridges = new String[cartridgesDef.size()]; - - cartridges = cartridgesDef.toArray(cartridges); - servicegroup.setCartridges(cartridges); - - DependencyDefinitions depDefs = serviceGroupDefinition.getDependencies(); - - if (depDefs != null) { - Dependencies deps = new Dependencies(); - List<String> startupOrdersDef = depDefs.getStartupOrders(); - if (startupOrdersDef != null) { - String[] startupOrders = new String[startupOrdersDef.size()]; - startupOrders = startupOrdersDef.toArray(startupOrders); - deps.setStartupOrders(startupOrders); - } - // validate termination behavior - //validateTerminationBehavior(depDefs.getTerminationBehaviour()); - deps.setTerminationBehaviour(depDefs.getTerminationBehaviour()); - servicegroup.setDependencies(deps); - } - - for (ServiceGroupDefinition groupDefinition : groupsDef) { - populateServiceGroupPojo(groupDefinition); - } - return servicegroup; } - private static void validateTerminationBehavior(String terminationBehavior) throws ServiceGroupDefinitioException { - - if (!(terminationBehavior == null || "terminate-none".equals(terminationBehavior) || - "terminate-dependents".equals(terminationBehavior) || "terminate-all".equals(terminationBehavior))) { - throw new ServiceGroupDefinitioException("Invalid Termination Behaviour specified: [ " + - terminationBehavior + " ], should be one of 'terminate-none', 'terminate-dependents', " + - " 'terminate-all' "); - } - } - - private static Container getContainer(ContainerBean container) { Container cn = new Container(); cn.setDockerFileRepo(container.dockerfileRepo);
