You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/11/20 06:57:38 UTC
stratos git commit: adding statuses and aliases to application
structure returned by rest API
Repository: stratos
Updated Branches:
refs/heads/master 0890013d8 -> 77d1a7be6
adding statuses and aliases to application structure returned by rest API
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/77d1a7be
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/77d1a7be
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/77d1a7be
Branch: refs/heads/master
Commit: 77d1a7be66a8e1e5702d01a0ad1b1dd651d10571
Parents: 0890013
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Thu Nov 20 11:26:46 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Thu Nov 20 11:26:46 2014 +0530
----------------------------------------------------------------------
.../stratos/rest/endpoint/api/StratosApiV40Utils.java | 8 ++++----
.../stratos/rest/endpoint/api/StratosApiV41Utils.java | 12 ++++++------
.../apache/stratos/rest/endpoint/bean/GroupBean.java | 9 +++++++++
.../stratos/rest/endpoint/bean/topology/Cluster.java | 4 ++++
.../endpoint/bean/util/converter/PojoConverter.java | 5 ++++-
5 files changed, 27 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/77d1a7be/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 ac15faf..fec4c1e 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
@@ -981,7 +981,7 @@ public class StratosApiV40Utils {
if(cluster == null) {
throw new RestAPIException("No matching cluster found for [cartridge type]: "+cartridgeType+ " [alias] "+subscriptionAlias);
} else{
- return PojoConverter.populateClusterPojos(cluster);
+ return PojoConverter.populateClusterPojos(cluster, null);
}
}
@@ -992,7 +992,7 @@ public class StratosApiV40Utils {
ArrayList<org.apache.stratos.rest.endpoint.bean.topology.Cluster> clusters =
new ArrayList<org.apache.stratos.rest.endpoint.bean.topology.Cluster>();
for(Cluster cluster : clusterSet) {
- clusters.add(PojoConverter.populateClusterPojos(cluster));
+ clusters.add(PojoConverter.populateClusterPojos(cluster, null));
}
org.apache.stratos.rest.endpoint.bean.topology.Cluster[] arrCluster =
new org.apache.stratos.rest.endpoint.bean.topology.Cluster[clusters.size()];
@@ -1009,7 +1009,7 @@ public class StratosApiV40Utils {
List<org.apache.stratos.rest.endpoint.bean.topology.Cluster> clusters =
new ArrayList<org.apache.stratos.rest.endpoint.bean.topology.Cluster>();
for(Cluster cluster : clusterSet) {
- clusters.add(PojoConverter.populateClusterPojos(cluster));
+ clusters.add(PojoConverter.populateClusterPojos(cluster, null));
}
org.apache.stratos.rest.endpoint.bean.topology.Cluster[] arrCluster =
new org.apache.stratos.rest.endpoint.bean.topology.Cluster[clusters.size()];
@@ -1025,7 +1025,7 @@ public class StratosApiV40Utils {
.getClusters(cartridgeType);
List<org.apache.stratos.rest.endpoint.bean.topology.Cluster> clusters = new ArrayList<org.apache.stratos.rest.endpoint.bean.topology.Cluster>();
for (Cluster cluster : clusterSet) {
- clusters.add(PojoConverter.populateClusterPojos(cluster));
+ clusters.add(PojoConverter.populateClusterPojos(cluster, null));
}
org.apache.stratos.rest.endpoint.bean.topology.Cluster[] arrCluster = new org.apache.stratos.rest.endpoint.bean.topology.Cluster[clusters
.size()];
http://git-wip-us.apache.org/repos/asf/stratos/blob/77d1a7be/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 b148e1d..ee6f08c 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
@@ -1184,7 +1184,7 @@ public class StratosApiV41Utils {
if (cluster == null) {
throw new RestAPIException("No matching cluster found for [cartridge type]: " + cartridgeType + " [alias] " + subscriptionAlias);
} else {
- return PojoConverter.populateClusterPojos(cluster);
+ return PojoConverter.populateClusterPojos(cluster, null);
}
}
@@ -1195,7 +1195,7 @@ public class StratosApiV41Utils {
ArrayList<org.apache.stratos.rest.endpoint.bean.topology.Cluster> clusters =
new ArrayList<org.apache.stratos.rest.endpoint.bean.topology.Cluster>();
for (Cluster cluster : clusterSet) {
- clusters.add(PojoConverter.populateClusterPojos(cluster));
+ clusters.add(PojoConverter.populateClusterPojos(cluster, null));
}
org.apache.stratos.rest.endpoint.bean.topology.Cluster[] arrCluster =
new org.apache.stratos.rest.endpoint.bean.topology.Cluster[clusters.size()];
@@ -1212,7 +1212,7 @@ public class StratosApiV41Utils {
List<org.apache.stratos.rest.endpoint.bean.topology.Cluster> clusters =
new ArrayList<org.apache.stratos.rest.endpoint.bean.topology.Cluster>();
for (Cluster cluster : clusterSet) {
- clusters.add(PojoConverter.populateClusterPojos(cluster));
+ clusters.add(PojoConverter.populateClusterPojos(cluster, null));
}
org.apache.stratos.rest.endpoint.bean.topology.Cluster[] arrCluster =
new org.apache.stratos.rest.endpoint.bean.topology.Cluster[clusters.size()];
@@ -1228,7 +1228,7 @@ public class StratosApiV41Utils {
.getClusters(cartridgeType);
List<org.apache.stratos.rest.endpoint.bean.topology.Cluster> clusters = new ArrayList<org.apache.stratos.rest.endpoint.bean.topology.Cluster>();
for (Cluster cluster : clusterSet) {
- clusters.add(PojoConverter.populateClusterPojos(cluster));
+ clusters.add(PojoConverter.populateClusterPojos(cluster, null));
}
org.apache.stratos.rest.endpoint.bean.topology.Cluster[] arrCluster = new org.apache.stratos.rest.endpoint.bean.topology.Cluster[clusters
.size()];
@@ -1561,7 +1561,7 @@ public class StratosApiV41Utils {
} finally {
TopologyManager.releaseReadLockForCluster(serviceType, clusterId);
}
- applicationBean.clusters.add(PojoConverter.populateClusterPojos(topLevelCluster));
+ applicationBean.clusters.add(PojoConverter.populateClusterPojos(topLevelCluster, entry.getKey()));
}
}
@@ -1582,7 +1582,7 @@ public class StratosApiV41Utils {
String alias = x.getKey();
ClusterDataHolder clusterHolder = x.getValue();
Cluster topLevelCluster = TopologyManager.getTopology().getService(clusterHolder.getServiceType()).getCluster(clusterHolder.getClusterId());
- groupBean.addCluster(PojoConverter.populateClusterPojos(topLevelCluster));
+ groupBean.addCluster(PojoConverter.populateClusterPojos(topLevelCluster, null));
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/77d1a7be/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/GroupBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/GroupBean.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/GroupBean.java
index b86da10..79115eb 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/GroupBean.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/GroupBean.java
@@ -29,6 +29,7 @@ public class GroupBean {
private List<GroupBean> subGroups = null;
private List<Cluster> clusters = null;
private String alias;
+ private String status;
private String deploymentPolicy;
private String autoScalingPolicy;
@@ -83,4 +84,12 @@ public class GroupBean {
public String getAutoScalingPolicy() {
return autoScalingPolicy;
}
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/77d1a7be/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/topology/Cluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/topology/Cluster.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/topology/Cluster.java
index e8a30f9..5635cc0 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/topology/Cluster.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/topology/Cluster.java
@@ -26,6 +26,8 @@ import java.util.List;
@XmlRootElement(name="clusters")
public class Cluster {
+ public String alias;
+
public String serviceName;
public String clusterId;
@@ -37,6 +39,8 @@ public class Cluster {
public List<String> hostNames;
public boolean isLbCluster;
+
+ public String status;
public List<PropertyBean> property;
http://git-wip-us.apache.org/repos/asf/stratos/blob/77d1a7be/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 d2f0fd5..bd9a025 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
@@ -417,9 +417,10 @@ public class PojoConverter {
return partitionGroups;
}
- public static org.apache.stratos.rest.endpoint.bean.topology.Cluster populateClusterPojos(Cluster cluster) {
+ public static org.apache.stratos.rest.endpoint.bean.topology.Cluster populateClusterPojos(Cluster cluster, String alias) {
org.apache.stratos.rest.endpoint.bean.topology.Cluster cluster1 = new
org.apache.stratos.rest.endpoint.bean.topology.Cluster();
+ cluster1.alias = alias;
cluster1.serviceName = cluster.getServiceName();
cluster1.clusterId = cluster.getClusterId();
cluster1.isLbCluster = cluster.isLbCluster();
@@ -427,6 +428,7 @@ public class PojoConverter {
cluster1.property = getPropertyBeans(cluster.getProperties());
cluster1.member = new ArrayList<Member>();
cluster1.hostNames = new ArrayList<String>();
+ cluster1.status = cluster.getStatus().toString();
for (org.apache.stratos.messaging.domain.topology.Member tmp : cluster.getMembers()) {
Member member = new Member();
@@ -1053,6 +1055,7 @@ public class PojoConverter {
}
GroupBean groupBean = new GroupBean();
+ groupBean.setStatus(group.getStatus().toString());
groupBean.setAlias(group.getUniqueIdentifier());
groupBean.setDeploymentPolicy(group.getDeploymentPolicy());
groupBean.setAutoScalingPolicy(group.getAutoscalingPolicy());