Repository: stratos Updated Branches: refs/heads/master 7978da463 -> 4ebb9d899
s/convetToCCDeploymentPolicyPojo/convetToASDeploymentPolicyPojo Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4ebb9d89 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4ebb9d89 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4ebb9d89 Branch: refs/heads/master Commit: 4ebb9d8996ece5c84d785d93ba241fc067f5449d Parents: 7978da4 Author: Nirmal Fernando <[email protected]> Authored: Tue Dec 2 11:09:40 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Dec 2 11:09:40 2014 +0530 ---------------------------------------------------------------------- .../rest/endpoint/api/StratosApiV40Utils.java | 2 +- .../rest/endpoint/api/StratosApiV41Utils.java | 4 ++-- .../bean/util/converter/PojoConverter.java | 19 +++++++++---------- 3 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4ebb9d89/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java index e5fa7be..496e170 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java @@ -236,7 +236,7 @@ public class StratosApiV40Utils { if (autoscalerServiceClient != null) { DeploymentPolicy deploymentPolicy = - PojoConverter.convetToCCDeploymentPolicyPojo(deploymentPolicyBean); + PojoConverter.convetToASDeploymentPolicyPojo(deploymentPolicyBean); try { autoscalerServiceClient http://git-wip-us.apache.org/repos/asf/stratos/blob/4ebb9d89/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 d8a6c3f..5e0c7bf 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 @@ -397,7 +397,7 @@ public class StratosApiV41Utils { if (autoscalerServiceClient != null) { org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy = - PojoConverter.convetToCCDeploymentPolicyPojo(deploymentPolicyBean); + PojoConverter.convetToASDeploymentPolicyPojo(deploymentPolicyBean); try { autoscalerServiceClient.deployDeploymentPolicy(deploymentPolicy); @@ -423,7 +423,7 @@ public class StratosApiV41Utils { if (autoscalerServiceClient != null) { org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy = - PojoConverter.convetToCCDeploymentPolicyPojo(deploymentPolicyBean); + PojoConverter.convetToASDeploymentPolicyPojo(deploymentPolicyBean); try { http://git-wip-us.apache.org/repos/asf/stratos/blob/4ebb9d89/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 1dbff3a..0f218ba 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 @@ -375,21 +375,20 @@ public class PojoConverter { return autoscalePolicy; } - public static org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy - convetToCCDeploymentPolicyPojo(DeploymentPolicy - deploymentPolicyBean) { + public static org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy convetToASDeploymentPolicyPojo( + DeploymentPolicy deploymentPolicyBean) { - org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy = new - org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy(); + org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy = + new org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy(); deploymentPolicy.setId(deploymentPolicyBean.id); deploymentPolicy.setDescription(deploymentPolicyBean.description); deploymentPolicy.setIsPublic(deploymentPolicyBean.isPublic); - if (deploymentPolicyBean.applicationPolicy != null && - deploymentPolicyBean.applicationPolicy.networkPartition != null && - !deploymentPolicyBean.applicationPolicy.networkPartition.isEmpty()) { - deploymentPolicy.setApplicationLevelNetworkPartitions( - convertToCCPartitionGroup(deploymentPolicyBean.applicationPolicy.networkPartition)); + if (deploymentPolicyBean.applicationPolicy != null + && deploymentPolicyBean.applicationPolicy.networkPartition != null + && !deploymentPolicyBean.applicationPolicy.networkPartition.isEmpty()) { + deploymentPolicy + .setApplicationLevelNetworkPartitions(convertToCCPartitionGroup(deploymentPolicyBean.applicationPolicy.networkPartition)); deploymentPolicy.setApplicationId(deploymentPolicyBean.applicationPolicy.applicationId); }
