Updated Branches: refs/heads/master 2f741cb0e -> e76a7599c
refactoring to avoid duplication in variable names when converting to json Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e76a7599 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e76a7599 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e76a7599 Branch: refs/heads/master Commit: e76a7599c69baa3119e040021842b7ed527b144e Parents: 2f741cb Author: rekathiru <[email protected]> Authored: Wed Jan 29 13:49:19 2014 +0530 Committer: rekathiru <[email protected]> Committed: Wed Jan 29 13:49:19 2014 +0530 ---------------------------------------------------------------------- .../endpoint/bean/autoscaler/partition/PartitionGroup.java | 2 +- .../rest/endpoint/bean/util/converter/PojoConverter.java | 6 +++--- .../org/apache/stratos/rest/endpoint/mock/MockContext.java | 2 +- .../src/main/webapp/stratos/WEB-INF/cxf-servlet.xml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e76a7599/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java index 4d817d8..ebfc539 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/autoscaler/partition/PartitionGroup.java @@ -30,5 +30,5 @@ public class PartitionGroup { public String partitionAlgo; //partition Ids - public List<Partition> partition; + public List<Partition> partitions; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e76a7599/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 b251a6d..bf126e1 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 @@ -283,8 +283,8 @@ public class PojoConverter { partitionGroup.setId(partitionGroupBeans.get(i).id); partitionGroup.setPartitionAlgo(partitionGroupBeans.get(i).partitionAlgo); - if(partitionGroupBeans.get(i).partition != null && !partitionGroupBeans.get(i).partition.isEmpty()) { - partitionGroup.setPartitions(convertToCCPartitionPojos(partitionGroupBeans.get(i).partition)); + if(partitionGroupBeans.get(i).partitions != null && !partitionGroupBeans.get(i).partitions.isEmpty()) { + partitionGroup.setPartitions(convertToCCPartitionPojos(partitionGroupBeans.get(i).partitions)); } partitionGroups[i] = partitionGroup; @@ -501,7 +501,7 @@ public class PojoConverter { partitionGroupBean.id = partitionGroup.getId(); partitionGroupBean.partitionAlgo = partitionGroup.getPartitionAlgo(); if(partitionGroup.getPartitions() != null && partitionGroup.getPartitions().length > 0) { - partitionGroupBean.partition = getPartitionList(partitionGroup.getPartitions()); + partitionGroupBean.partitions = getPartitionList(partitionGroup.getPartitions()); } return partitionGroupBean; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e76a7599/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java index b3897ce..dda6cc1 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java @@ -227,7 +227,7 @@ public class MockContext { DeploymentPolicy deploymentPolicy = deploymentPolicyMap.get(deploymentPolicyId); for(PartitionGroup partitionGroup : deploymentPolicy.partitionGroup){ if(partitionGroup.id.equals(partitionGroupId)){ - return partitionGroup.partition.toArray(new Partition[0]); + return partitionGroup.partitions.toArray(new Partition[0]); } } return new Partition[0]; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e76a7599/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml index 11947f4..677aaef 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml +++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml @@ -55,13 +55,13 @@ <property name="serializeAsArray" value="true"/> <property name="arrayKeys"> <list> - <value>partitions</value> + <!--value>partitions</value--> <value>property</value> <value>hostNames</value> <value>memberMap</value> <value>portMap</value> - <value>partitionGroup</value> - <value>partition</value> + <value>partitionGroups</value> + <value>partitions</value> </list> </property> </bean>
