You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/01/29 11:10:41 UTC
git commit: Revert "refactoring to avoid duplication in variable
names when converting to json"
Updated Branches:
refs/heads/master e76a7599c -> 9049618dc
Revert "refactoring to avoid duplication in variable names when converting to json"
This reverts commit e76a7599c69baa3119e040021842b7ed527b144e.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9049618d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9049618d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9049618d
Branch: refs/heads/master
Commit: 9049618dcffa53b79a9f8ceb8255361f383bf7ff
Parents: e76a759
Author: rekathiru <rt...@gmail.com>
Authored: Wed Jan 29 15:40:56 2014 +0530
Committer: rekathiru <rt...@gmail.com>
Committed: Wed Jan 29 15:40:56 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/9049618d/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 ebfc539..4d817d8 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> partitions;
+ public List<Partition> partition;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9049618d/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 bf126e1..b251a6d 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).partitions != null && !partitionGroupBeans.get(i).partitions.isEmpty()) {
- partitionGroup.setPartitions(convertToCCPartitionPojos(partitionGroupBeans.get(i).partitions));
+ if(partitionGroupBeans.get(i).partition != null && !partitionGroupBeans.get(i).partition.isEmpty()) {
+ partitionGroup.setPartitions(convertToCCPartitionPojos(partitionGroupBeans.get(i).partition));
}
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.partitions = getPartitionList(partitionGroup.getPartitions());
+ partitionGroupBean.partition = getPartitionList(partitionGroup.getPartitions());
}
return partitionGroupBean;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9049618d/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 dda6cc1..b3897ce 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.partitions.toArray(new Partition[0]);
+ return partitionGroup.partition.toArray(new Partition[0]);
}
}
return new Partition[0];
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9049618d/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 677aaef..11947f4 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>partitionGroups</value>
- <value>partitions</value>
+ <value>partitionGroup</value>
+ <value>partition</value>
</list>
</property>
</bean>