Introducing new rest api method GET
/applications/{applicationId}/deploymentPolicy
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/117d702b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/117d702b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/117d702b
Branch: refs/heads/master
Commit: 117d702b279831b95d51b10fbeaf237c63ff9cd6
Parents: a91b4f8
Author: Imesh Gunaratne <[email protected]>
Authored: Wed Dec 17 14:29:16 2014 +0530
Committer: Udara Liyanage <[email protected]>
Committed: Thu Dec 18 12:06:58 2014 +0530
----------------------------------------------------------------------
.../autoscaler/api/AutoScalerServiceImpl.java | 2 +-
.../autoscaler/pojo/policy/PolicyManager.java | 41 +----
.../rest/endpoint/api/StratosApiV41.java | 14 ++
.../rest/endpoint/api/StratosApiV41Utils.java | 45 ++---
.../endpoint/util/converter/PojoConverter.java | 178 ++++++++++++++++---
5 files changed, 196 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/117d702b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
----------------------------------------------------------------------
diff --git
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
index b0e34cb..f5ac2e8 100644
---
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
+++
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/api/AutoScalerServiceImpl.java
@@ -203,7 +203,7 @@ public class AutoScalerServiceImpl implements
AutoScalerServiceInterface {
ApplicationBuilder.handleApplicationCreated(application,
applicationParser.getApplicationClusterContexts());
try {
- String policyId =
PolicyManager.getInstance().deployDeploymentPolicy(policy);
+ PolicyManager.getInstance().addDeploymentPolicy(policy);
} catch (InvalidPolicyException e) {
String message = "Could not deploy application: [application-id] "
+ policy.getApplicationId();
log.error(message, e);
http://git-wip-us.apache.org/repos/asf/stratos/blob/117d702b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java
----------------------------------------------------------------------
diff --git
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java
index f4ad47f..d4ab989 100644
---
a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java
+++
b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/PolicyManager.java
@@ -70,7 +70,7 @@ public class PolicyManager {
this.addASPolicyToInformationModel(policy);
RegistryManager.getInstance().persistAutoscalerPolicy(policy);
if (log.isInfoEnabled()) {
- log.info(String.format("Autoscaling policy is deployed
successfully: [id] %s", policy.getId()));
+ log.info(String.format("Autoscaling policy is added successfully:
[id] %s", policy.getId()));
}
return true;
}
@@ -88,37 +88,14 @@ public class PolicyManager {
}
// Add the deployment policy to information model and persist.
- public String deployDeploymentPolicy(DeploymentPolicy policy) throws
InvalidPolicyException {
- String policyId = addDeploymentPolicyToInformationModel(policy);
+ public void addDeploymentPolicy(DeploymentPolicy policy) throws
InvalidPolicyException {
+ addDeploymentPolicyToInformationModel(policy);
RegistryManager.getInstance().persistDeploymentPolicy(policy);
if (log.isInfoEnabled()) {
- log.info(String.format("Deployment policy is deployed
successfully: [id] %s", policyId));
+ log.info(String.format("Deployment policy is added successfully:
[application-id] %s",
+ policy.getApplicationId()));
}
- return policyId;
- }
-
- public boolean updateDeploymentPolicy(DeploymentPolicy policy) throws
InvalidPolicyException {
- if(StringUtils.isEmpty(policy.getApplicationId())){
- throw new AutoScalerException("Deploying policy id cannot be
empty");
- }
- try {
- if(log.isInfoEnabled()) {
- log.info(String.format("Updating deployment policy: [id] %s",
policy.getApplicationId()));
- }
- fillPartitions(policy);
- } catch (InvalidPartitionException e) {
- log.error(e);
- throw new InvalidPolicyException(String.format("Deployment policy
is invalid: [id] %s", policy.getApplicationId()), e);
- }
-
- updateDeploymentPolicyToInformationModel(policy);
- RegistryManager.getInstance().persistDeploymentPolicy(policy);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Deployment policy is updated successfully:
[id] %s", policy.getApplicationId()));
- }
- return true;
}
private void fillPartitions(DeploymentPolicy deploymentPolicy) throws
InvalidPartitionException {
@@ -211,11 +188,9 @@ public class PolicyManager {
}
// Add the deployment policy to As in memmory information model. Does not
persist.
- public String addDeploymentPolicyToInformationModel(DeploymentPolicy
policy) throws InvalidPolicyException {
+ public void addDeploymentPolicyToInformationModel(DeploymentPolicy policy)
throws InvalidPolicyException {
if (StringUtils.isEmpty(policy.getApplicationId())) {
- // id = application id + random string
- String id = policy.getApplicationId() +
UUID.randomUUID().getLeastSignificantBits();
- policy.setApplicationId(id);
+ throw new RuntimeException("Application id is not defined in
deployment policy");
}
if (!deploymentPolicyListMap.containsKey(policy.getApplicationId())) {
if (log.isDebugEnabled()) {
@@ -227,8 +202,6 @@ public class PolicyManager {
log.error(errMsg);
throw new InvalidPolicyException(errMsg);
}
-
- return policy.getApplicationId();
}
public void updateDeploymentPolicyToInformationModel(DeploymentPolicy
policy) throws InvalidPolicyException {
http://git-wip-us.apache.org/repos/asf/stratos/blob/117d702b/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 8c12dd8..a336ea1 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
@@ -404,6 +404,20 @@ public class StratosApiV41 extends AbstractApi {
StratosApiV41Utils.deployApplication(applicationId, deploymentPolicy);
return Response.accepted().build();
}
+
+ @GET
+ @Path("/applications/{applicationId}/deploymentPolicy")
+ @Produces("application/json")
+ @Consumes("application/json")
+ @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+ public Response getApplicationDeploymentPolicy(@PathParam("applicationId")
String applicationId)
+ throws RestAPIException {
+ DeploymentPolicy deploymentPolicy =
StratosApiV41Utils.getDeploymentPolicy(applicationId);
+ if(deploymentPolicy == null) {
+ return Response.status(Response.Status.NOT_FOUND).build();
+ }
+ return Response.ok(deploymentPolicy).build();
+ }
/**
* Undeploy application.
http://git-wip-us.apache.org/repos/asf/stratos/blob/117d702b/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 db099b8..66c5af4 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
@@ -509,10 +509,8 @@ public class StratosApiV41Utils {
}
private static AutoscalerServiceClient getAutoscalerServiceClient() throws
RestAPIException {
-
try {
return AutoscalerServiceClient.getServiceClient();
-
} catch (AxisFault axisFault) {
String errorMsg = "Error while getting AutoscalerServiceClient
instance to connect to the "
+ "Autoscaler. Cause: " + axisFault.getMessage();
@@ -607,31 +605,18 @@ public class StratosApiV41Utils {
return PojoConverter.populateAutoscalePojo(autoscalePolicy);
}
- // Util methods for Deployment policies
public static
org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy
- getDeploymentPolicy(String deploymentPolicyId) throws RestAPIException {
-
- DeploymentPolicy deploymentPolicy = null;
- AutoscalerServiceClient autoscalerServiceClient =
getAutoscalerServiceClient();
- if (autoscalerServiceClient != null) {
- try {
- deploymentPolicy =
autoscalerServiceClient.getDeploymentPolicy(deploymentPolicyId);
-
- } catch (RemoteException e) {
- String errorMsg = "Error while getting deployment policy with
id " +
- deploymentPolicyId + ". Cause: " + e.getMessage();
- log.error(errorMsg, e);
- throw new RestAPIException(errorMsg, e);
- }
- }
+ getDeploymentPolicy(String applicationId) throws RestAPIException {
- if (deploymentPolicy == null) {
- String errorMsg = "Cannot find a matching deployment policy for
[id] " + deploymentPolicyId;
- log.error(errorMsg);
- throw new RestAPIException(errorMsg);
+ try {
+ AutoscalerServiceClient autoscalerServiceClient =
getAutoscalerServiceClient();
+ DeploymentPolicy deploymentPolicy =
autoscalerServiceClient.getDeploymentPolicy(applicationId);
+ return
PojoConverter.convertStubDeploymentPolicyToDeploymentPolicy(deploymentPolicy);
+ } catch (RemoteException e) {
+ String errorMsg = "Could not read deployment policy:
[application-id] " + applicationId;
+ log.error(errorMsg, e);
+ throw new RestAPIException(errorMsg, e);
}
-
- return PojoConverter.populateDeploymentPolicyPojo(deploymentPolicy);
}
public static ApplicationLevelNetworkPartition[] getPartitionGroups(String
deploymentPolicyId)
@@ -1060,10 +1045,14 @@ public class StratosApiV41Utils {
try {
List<ApplicationDefinition> applicationDefinitions = new
ArrayList<ApplicationDefinition>();
ApplicationContext[] applicationContexts =
AutoscalerServiceClient.getServiceClient().getApplications();
- for(ApplicationContext applicationContext : applicationContexts) {
- ApplicationDefinition applicationDefinition =
-
PojoConverter.convertApplicationContextToApplicationDefinition(applicationContext);
- applicationDefinitions.add(applicationDefinition);
+ if(applicationContexts != null) {
+ for (ApplicationContext applicationContext :
applicationContexts) {
+ if(applicationContext != null) {
+ ApplicationDefinition applicationDefinition =
+
PojoConverter.convertApplicationContextToApplicationDefinition(applicationContext);
+ applicationDefinitions.add(applicationDefinition);
+ }
+ }
}
return applicationDefinitions;
} catch (RemoteException e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/117d702b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --git
a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java
b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java
index f95636b..a13c26e 100644
---
a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java
+++
b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/PojoConverter.java
@@ -33,6 +33,7 @@ import org.apache.stratos.common.beans.GroupBean;
import
org.apache.stratos.common.beans.autoscaler.partition.ApplicationLevelNetworkPartition;
import org.apache.stratos.common.beans.autoscaler.partition.Partition;
import org.apache.stratos.common.beans.autoscaler.policy.autoscale.*;
+import
org.apache.stratos.common.beans.autoscaler.policy.deployment.ApplicationPolicy;
import
org.apache.stratos.common.beans.autoscaler.policy.deployment.DeploymentPolicy;
import org.apache.stratos.common.beans.cartridge.definition.*;
import org.apache.stratos.common.beans.cartridge.definition.PropertyBean;
@@ -417,6 +418,151 @@ public class PojoConverter {
return deploymentPolicy;
}
+ public static DeploymentPolicy
convertStubDeploymentPolicyToDeploymentPolicy(
+
org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy
stubDeploymentPolicy) {
+
+ DeploymentPolicy deploymentPolicy = new DeploymentPolicy();
+
+
deploymentPolicy.setApplicationId(stubDeploymentPolicy.getApplicationId());
+ deploymentPolicy.setDescription(stubDeploymentPolicy.getDescription());
+ deploymentPolicy.setPublic(stubDeploymentPolicy.getIsPublic());
+ if (stubDeploymentPolicy.getApplicationLevelNetworkPartitions() !=
null) {
+
org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition[]
+ networkPartitions =
stubDeploymentPolicy.getApplicationLevelNetworkPartitions();
+ if(networkPartitions != null) {
+ deploymentPolicy.setApplicationPolicy(new ApplicationPolicy());
+ List<ApplicationLevelNetworkPartition> networkPartitionList =
new ArrayList<ApplicationLevelNetworkPartition>();
+
for(org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition
+ networkPartition : networkPartitions) {
+ if(networkPartition != null) {
+
networkPartitionList.add(convertStubNetworkPartitionToNetworkPartition(networkPartition));
+ }
+ }
+
deploymentPolicy.getApplicationPolicy().setNetworkPartition(networkPartitionList);
+ }
+ }
+
+ if (stubDeploymentPolicy.getChildPolicies() != null) {
+
List<org.apache.stratos.common.beans.autoscaler.policy.deployment.ChildPolicy>
childPolicyList =
+ new
ArrayList<org.apache.stratos.common.beans.autoscaler.policy.deployment.ChildPolicy>();
+
for(org.apache.stratos.autoscaler.stub.deployment.policy.ChildPolicy
stubChildDeploymentPolicy :
+ stubDeploymentPolicy.getChildPolicies()) {
+ if(stubChildDeploymentPolicy != null) {
+
childPolicyList.add(convertStubChildPolicyToChildPolicy(stubChildDeploymentPolicy));
+ }
+ }
+ deploymentPolicy.setChildPolicies(childPolicyList);
+ }
+ return deploymentPolicy;
+ }
+
+ private static
org.apache.stratos.common.beans.autoscaler.policy.deployment.ChildPolicy
+ convertStubChildPolicyToChildPolicy(ChildPolicy stubChildDeploymentPolicy)
{
+ if(stubChildDeploymentPolicy == null) {
+ return null;
+ }
+
org.apache.stratos.common.beans.autoscaler.policy.deployment.ChildPolicy
childPolicy = new
+
org.apache.stratos.common.beans.autoscaler.policy.deployment.ChildPolicy();
+ childPolicy.setChildId(stubChildDeploymentPolicy.getId());
+ if(stubChildDeploymentPolicy.getChildLevelNetworkPartitions() != null)
{
+
List<org.apache.stratos.common.beans.autoscaler.partition.ChildLevelNetworkPartition>
networkPartitionList
+ = new
ArrayList<org.apache.stratos.common.beans.autoscaler.partition.ChildLevelNetworkPartition>();
+
for(org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelNetworkPartition
+ stubChildLevelNetworkPartition :
stubChildDeploymentPolicy.getChildLevelNetworkPartitions()) {
+
networkPartitionList.add(convertStubChildLevelNetworkPartitionToChildLevelNetworkPartition(stubChildLevelNetworkPartition));
+ }
+ childPolicy.setNetworkPartition(networkPartitionList);
+ }
+ return childPolicy;
+ }
+
+ private static
org.apache.stratos.common.beans.autoscaler.partition.ChildLevelNetworkPartition
+ convertStubChildLevelNetworkPartitionToChildLevelNetworkPartition(
+ ChildLevelNetworkPartition stubChildLevelNetworkPartition) {
+ if(stubChildLevelNetworkPartition == null) {
+ return null;
+ }
+
org.apache.stratos.common.beans.autoscaler.partition.ChildLevelNetworkPartition
childLevelNetworkPartition =
+ new
org.apache.stratos.common.beans.autoscaler.partition.ChildLevelNetworkPartition();
+
childLevelNetworkPartition.setId(stubChildLevelNetworkPartition.getId());
+
childLevelNetworkPartition.setPartitionAlgo(stubChildLevelNetworkPartition.getPartitionAlgo());
+ if(stubChildLevelNetworkPartition.getChildLevelPartitions() != null) {
+
List<org.apache.stratos.common.beans.autoscaler.partition.ChildLevelPartition>
partitionList =
+ new
ArrayList<org.apache.stratos.common.beans.autoscaler.partition.ChildLevelPartition>();
+
for(org.apache.stratos.autoscaler.stub.deployment.partition.ChildLevelPartition
stubChildLevelPartition :
stubChildLevelNetworkPartition.getChildLevelPartitions()) {
+
partitionList.add(convertStubChildLevelPartitionToChildLevelPartition(stubChildLevelPartition));
+ }
+ childLevelNetworkPartition.setPartitions(partitionList);
+ }
+ return childLevelNetworkPartition;
+ }
+
+ private static
org.apache.stratos.common.beans.autoscaler.partition.ChildLevelPartition
+ convertStubChildLevelPartitionToChildLevelPartition(ChildLevelPartition
stubChildLevelPartition) {
+ if(stubChildLevelPartition == null) {
+ return null;
+ }
+
org.apache.stratos.common.beans.autoscaler.partition.ChildLevelPartition
childLevelPartition =
+ new
org.apache.stratos.common.beans.autoscaler.partition.ChildLevelPartition();
+ childLevelPartition.setId(stubChildLevelPartition.getPartitionId());
+ childLevelPartition.setMax(stubChildLevelPartition.getMax());
+ return childLevelPartition;
+ }
+
+ private static ApplicationLevelNetworkPartition
convertStubNetworkPartitionToNetworkPartition(
+
org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition
stubNetworkPartition) {
+ if(stubNetworkPartition == null) {
+ return null;
+ }
+
+ ApplicationLevelNetworkPartition networkPartition = new
ApplicationLevelNetworkPartition();
+ networkPartition.setId(stubNetworkPartition.getId());
+
networkPartition.setActiveByDefault(stubNetworkPartition.getActiveByDefault());
+ if(stubNetworkPartition.getPartitions() != null) {
+ List<Partition> partitionList = new ArrayList<Partition>();
+
for(org.apache.stratos.autoscaler.stub.deployment.partition.Partition
stubPartition :
+ stubNetworkPartition.getPartitions()) {
+ if(stubPartition != null) {
+
partitionList.add(convertStubPartitionToPartition(stubPartition));
+ }
+ }
+ networkPartition.setPartitions(partitionList);
+ }
+ return networkPartition;
+ }
+
+ private static Partition
convertStubPartitionToPartition(org.apache.stratos.autoscaler.stub.deployment.partition.Partition
stubPartition) {
+ if(stubPartition == null) {
+ return null;
+ }
+ Partition partition = new Partition();
+ partition.setId(stubPartition.getId());
+ partition.setPublic(stubPartition.getIsPublic());
+ partition.setDescription(stubPartition.getDescription());
+ partition.setProvider(stubPartition.getProvider());
+ if(stubPartition.getProperties() != null) {
+ List<PropertyBean> propertyBeanList = new
ArrayList<PropertyBean>();
+ for(org.apache.stratos.autoscaler.stub.Property stubProperty :
stubPartition.getProperties().getProperties()) {
+ if(stubProperty != null) {
+
propertyBeanList.add(convertStubPropertyToPropertyBean(stubProperty));
+ }
+ }
+ partition.setProperty(propertyBeanList);
+ }
+ return partition;
+ }
+
+ private static PropertyBean
convertStubPropertyToPropertyBean(org.apache.stratos.autoscaler.stub.Property
stubProperty) {
+ if(stubProperty == null) {
+ return null;
+ }
+
+ PropertyBean propertyBean = new PropertyBean();
+ propertyBean.setName(stubProperty.getName());
+ propertyBean.setValue(stubProperty.getValue());
+ return propertyBean;
+ }
+
private static
org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition[]
convertToCCPartitionGroup(List<ApplicationLevelNetworkPartition>
networkPartitionBeans) {
org.apache.stratos.autoscaler.stub.deployment.partition.ApplicationLevelNetworkPartition[]
@@ -751,22 +897,14 @@ public class PojoConverter {
public static DeploymentPolicy
populateDeploymentPolicyPojo(org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy
deploymentPolicy) {
- DeploymentPolicy deploymentPolicyBean = new DeploymentPolicy();
if (deploymentPolicy == null) {
- return deploymentPolicyBean;
+ return null;
}
+ DeploymentPolicy deploymentPolicyBean = new DeploymentPolicy();
deploymentPolicyBean.setDescription(deploymentPolicy.getDescription());
deploymentPolicyBean.setPublic(deploymentPolicy.getIsPublic());
-//TODO populate the Network partition based on new policy structure
-// if (deploymentPolicy.getApplicationLevelNetworkPartition() != null
&& deploymentPolicy.getApplicationLevelNetworkPartition().length > 0) {
-//
deploymentPolicyBean.setPartitionGroup(Arrays.asList(populatePartitionGroupPojos(deploymentPolicy.getApplicationLevelNetworkPartition())));
-// }
-
- /*if (deploymentPolicy.getAllPartitions() != null &&
deploymentPolicy.getAllPartitions().length > 0) {
- deploymentPolicyBean.partition =
Arrays.asList(populatePartitionPojos(deploymentPolicy.getAllPartitions()));
- }*/
-
+
deploymentPolicyBean.setApplicationId(deploymentPolicy.getApplicationId());
return deploymentPolicyBean;
}
@@ -1051,7 +1189,7 @@ public class PojoConverter {
// top level Groups
if (applicationDefinition.getComponents().getGroups() != null) {
componentContext.setGroupContexts(
-
convertGroupDefinitionsToGroupContexts(applicationDefinition.getComponents().getGroups()));
+
convertGroupDefinitionsToStubGroupContexts(applicationDefinition.getComponents().getGroups()));
}
// top level dependency information
if (applicationDefinition.getComponents().getDependencies() !=
null) {
@@ -1174,7 +1312,7 @@ public class PojoConverter {
subscribableInfo.setMinMembers(subscribableInfoContext.getMinMembers());
subscribableInfo.setMaxMembers(subscribableInfoContext.getMaxMembers());
subscribableInfo.setPrivateRepo(subscribableInfoContext.getPrivateRepo());
-
subscribableInfo.setProperty(convertPropertiesToPropertyBeansList(subscribableInfoContext.getProperties()));
+
subscribableInfo.setProperty(convertStubPropertiesToPropertyBeanList(subscribableInfoContext.getProperties()));
subscribableInfo.setRepoPassword(subscribableInfoContext.getRepoPassword());
subscribableInfo.setRepoUsername(subscribableInfoContext.getRepoUsername());
subscribableInfo.setRepoUrl(subscribableInfoContext.getRepoUrl());
@@ -1182,7 +1320,8 @@ public class PojoConverter {
}
private static
List<org.apache.stratos.manager.composite.application.beans.PropertyBean>
-
convertPropertiesToPropertyBeansList(org.apache.stratos.autoscaler.stub.Properties
properties) {
+
convertStubPropertiesToPropertyBeanList(org.apache.stratos.autoscaler.stub.Properties
properties) {
+
List<org.apache.stratos.manager.composite.application.beans.PropertyBean>
propertyBeanList =
new
ArrayList<org.apache.stratos.manager.composite.application.beans.PropertyBean>();
if((properties != null) && (properties.getProperties() != null)) {
@@ -1225,16 +1364,15 @@ public class PojoConverter {
infoContext.setDeploymentPolicy(subscribableInfo.getDeploymentPolicy());
infoContext.setMaxMembers(subscribableInfo.getMaxMembers());
infoContext.setMinMembers(subscribableInfo.getMinMembers());
- //infoContext.setPrivateRepo(subscribableInfo.getpr);
infoContext.setRepoPassword(subscribableInfo.getRepoPassword());
infoContext.setRepoUrl(subscribableInfo.getRepoUrl());
infoContext.setRepoUsername(subscribableInfo.getRepoUsername());
-
infoContext.setProperties(convertProperties(subscribableInfo.getProperty()));
+
infoContext.setProperties(convertPropertyBeansToStubProperties(subscribableInfo.getProperty()));
return infoContext;
}
- private static org.apache.stratos.autoscaler.stub.Properties
convertProperties(
+ private static org.apache.stratos.autoscaler.stub.Properties
convertPropertyBeansToStubProperties(
List<org.apache.stratos.manager.composite.application.beans.PropertyBean>
property) {
org.apache.stratos.autoscaler.stub.Properties prop = new
org.apache.stratos.autoscaler.stub.Properties();
if (property != null) {
@@ -1269,7 +1407,7 @@ public class PojoConverter {
}
private static org.apache.stratos.autoscaler.stub.pojo.GroupContext[]
- convertGroupDefinitionsToGroupContexts(List<GroupDefinition>
groupDefinitions) {
+ convertGroupDefinitionsToStubGroupContexts(List<GroupDefinition>
groupDefinitions) {
GroupContext[] groupContexts = new
GroupContext[groupDefinitions.size()];
int i = 0;
@@ -1283,7 +1421,7 @@ public class PojoConverter {
// Groups
if (groupDefinition.getGroups() != null) {
-
groupContext.setGroupContexts(convertGroupDefinitionsToGroupContexts(groupDefinition.getGroups()));
+
groupContext.setGroupContexts(convertGroupDefinitionsToStubGroupContexts(groupDefinition.getGroups()));
}
groupContext.setCartridgeContexts(convertCartridgeDefinitionsToCartridgeContexts(groupDefinition.getCartridges()));
@@ -1350,8 +1488,6 @@ public class PojoConverter {
instanceList.add(instance);
}
}
-
return instanceList;
}
-
}
