You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2015/01/14 13:57:14 UTC
stratos git commit: Fixed Group JSON differ on POST and GET
Repository: stratos
Updated Branches:
refs/heads/master 6caf40f62 -> 2594e3d96
Fixed Group JSON differ on POST and GET
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2594e3d9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2594e3d9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2594e3d9
Branch: refs/heads/master
Commit: 2594e3d961e34fd7baf124018235c9786168c14b
Parents: 6caf40f
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Wed Jan 14 12:55:51 2015 +0000
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Wed Jan 14 12:57:01 2015 +0000
----------------------------------------------------------------------
.../stratos/rest/endpoint/util/converter/ObjectConverter.java | 1 +
samples/group-scaling/mock/artifacts/group1.json | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2594e3d9/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index d6a2156..031d1eb 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -1577,6 +1577,7 @@ public class ObjectConverter {
GroupBean servicegroupDef = new GroupBean();
servicegroupDef.setName(serviceGroup.getName());
+ servicegroupDef.setGroupScalingEnabled(serviceGroup.getGroupscalingEnabled());
String[] cartridges = serviceGroup.getCartridges();
ServiceGroup[] groups = serviceGroup.getGroups();
org.apache.stratos.autoscaler.stub.pojo.Dependencies deps = serviceGroup.getDependencies();
http://git-wip-us.apache.org/repos/asf/stratos/blob/2594e3d9/samples/group-scaling/mock/artifacts/group1.json
----------------------------------------------------------------------
diff --git a/samples/group-scaling/mock/artifacts/group1.json b/samples/group-scaling/mock/artifacts/group1.json
index c5681cf..9acf5e6 100644
--- a/samples/group-scaling/mock/artifacts/group1.json
+++ b/samples/group-scaling/mock/artifacts/group1.json
@@ -3,7 +3,7 @@
"groups": [
{
"name": "group2",
- "isGroupScalingEnabled": "true",
+ "groupScalingEnabled": "true",
"cartridges": [
"c2",
"c3"