Updated Branches: refs/heads/master a46827c92 -> 6c1312313
changing persistance mappings to fileds instead of an object since it is easy for UI Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8e0b3ee8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8e0b3ee8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8e0b3ee8 Branch: refs/heads/master Commit: 8e0b3ee8fd83dcb830238da3c9f18b22bfc70428 Parents: 55c4306 Author: Udara Liyanage <[email protected]> Authored: Thu Feb 13 10:00:32 2014 -0500 Committer: Udara Liyanage <[email protected]> Committed: Thu Feb 13 10:00:32 2014 -0500 ---------------------------------------------------------------------- .../manager/CartridgeSubscriptionManager.java | 2 +- .../rest/endpoint/bean/CartridgeInfoBean.java | 38 ++++++++++++++++---- .../rest/endpoint/services/ServiceUtils.java | 24 +++++++------ 3 files changed, 47 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8e0b3ee8/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index 0fc44cc..25f1a77 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java @@ -165,7 +165,7 @@ public class CartridgeSubscriptionManager { autoscalingPolicyName); - // Publish tenant subscribed event to message broker + // Publish tenant subscribed envent to message broker CartridgeSubscriptionUtils.publishTenantSubscribedEvent(cartridgeSubscription.getSubscriber().getTenantId(), cartridgeSubscription.getCartridgeInfo().getType()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8e0b3ee8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java index 498bf55..a72d18f 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/CartridgeInfoBean.java @@ -33,9 +33,11 @@ public class CartridgeInfoBean { String repoPassword; String dataCartridgeType; String dataCartridgeAlias; - PersistanceMappingBean persistanceMappingBean; - + private boolean persistanceRequired; + private int size; + private String device; + private boolean removeOnTermination; public String getCartridgeType() { return cartridgeType; @@ -117,11 +119,35 @@ public class CartridgeInfoBean { this.deploymentPolicy = deploymentPolicy; } - public PersistanceMappingBean getPersistanceMappingBean() { - return persistanceMappingBean; + public boolean isPersistanceRequired() { + return persistanceRequired; + } + + public void setPersistanceRequired(boolean persistanceRequired) { + this.persistanceRequired = persistanceRequired; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + + public String getDevice() { + return device; + } + + public void setDevice(String device) { + this.device = device; + } + + public boolean isRemoveOnTermination() { + return removeOnTermination; } - public void setPersistanceMappingBean(PersistanceMappingBean persistanceMappingBean) { - this.persistanceMappingBean = persistanceMappingBean; + public void setRemoveOnTermination(boolean removeOnTermination) { + this.removeOnTermination = removeOnTermination; } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8e0b3ee8/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index 7a3cd33..f1d5d31 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -58,6 +58,11 @@ import java.util.*; import java.util.regex.Pattern; public class ServiceUtils { + public static final String IS_VOLUME_REQUIRED = "volume.required"; + public static final String SHOULD_DELETE_VOLUME = "volume.delete.on.unsubscription"; + public static final String VOLUME_SIZE = "volume.size.gb"; + public static final String DEVICE_NAME = "volume.device.name"; + private static Log log = LogFactory.getLog(ServiceUtils.class); private static CartridgeSubscriptionManager cartridgeSubsciptionManager = new CartridgeSubscriptionManager(); private static ServiceDeploymentManager serviceDeploymentManager = new ServiceDeploymentManager(); @@ -794,8 +799,7 @@ public class ServiceUtils { subscriptionData.setRepositoryPassword(cartridgeInfoBean.getRepoPassword()); Properties properties = new Properties(); - if(cartridgeInfoBean.getPersistanceMappingBean() != null){ - PersistanceMappingBean persistanceMappingBean = cartridgeInfoBean.getPersistanceMappingBean(); + if(cartridgeInfoBean.isPersistanceRequired()){ /* PersistanceMapping persistanceMapping = new PersistanceMapping(); persistanceMapping.setPersistanceRequired(persistanceMappingBean.persistanceRequired); @@ -807,20 +811,20 @@ public class ServiceUtils { // Add persistance mapping properties to the subscription. Property persistanceRequiredProperty = new Property(); - persistanceRequiredProperty.setName("is-required"); - persistanceRequiredProperty.setValue(String.valueOf(persistanceMappingBean.persistanceRequired)); + persistanceRequiredProperty.setName(IS_VOLUME_REQUIRED); + persistanceRequiredProperty.setValue(String.valueOf(cartridgeInfoBean.isPersistanceRequired())); Property sizeProperty = new Property(); - persistanceRequiredProperty.setName("is-required"); - persistanceRequiredProperty.setValue(String.valueOf(persistanceMappingBean.size)); + persistanceRequiredProperty.setName(VOLUME_SIZE); + persistanceRequiredProperty.setValue(String.valueOf(cartridgeInfoBean.getSize())); Property deviceProperty = new Property(); - persistanceRequiredProperty.setName("is-required"); - persistanceRequiredProperty.setValue(String.valueOf(persistanceMappingBean.device)); + persistanceRequiredProperty.setName(DEVICE_NAME); + persistanceRequiredProperty.setValue(String.valueOf(cartridgeInfoBean.getDevice())); Property deleteOnTerminationProperty = new Property(); - persistanceRequiredProperty.setName("is-required"); - persistanceRequiredProperty.setValue(String.valueOf(persistanceMappingBean.removeOnTermination)); + persistanceRequiredProperty.setName(SHOULD_DELETE_VOLUME); + persistanceRequiredProperty.setValue(String.valueOf(cartridgeInfoBean.isRemoveOnTermination())); Properties props = new Properties(); props.setProperties(new Property[]{persistanceRequiredProperty,sizeProperty, deviceProperty, deleteOnTerminationProperty});
