Repository: stratos Updated Branches: refs/heads/tenant-isolation a4da2473d -> b38a7c5e8
Add application name to the ApplicationBean Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b38a7c5e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b38a7c5e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b38a7c5e Branch: refs/heads/tenant-isolation Commit: b38a7c5e8b92e191b45615381045b7dd5e147e2b Parents: a4da247 Author: Gayan Gunarathne <[email protected]> Authored: Fri Jul 24 16:11:47 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Fri Jul 24 16:11:47 2015 +0530 ---------------------------------------------------------------------- .../beans/topology/ApplicationInstanceBean.java | 19 ++++++++++++++----- .../endpoint/util/converter/ObjectConverter.java | 5 +++-- 2 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b38a7c5e/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java index d7f651d..e7c45f5 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ApplicationInstanceBean.java @@ -29,7 +29,8 @@ public class ApplicationInstanceBean implements Serializable { private String status; private String instanceId; private String parentInstanceId; - private String applicationId; + private String applicationUuid; + private String applicationId; private List<GroupInstanceBean> groupInstances; private List<ClusterInstanceBean> clusterInstances; @@ -62,12 +63,12 @@ public class ApplicationInstanceBean implements Serializable { this.parentInstanceId = parentInstanceId; } - public String getApplicationId() { - return applicationId; + public String getApplicationUuid() { + return applicationUuid; } - public void setApplicationId(String applicationId) { - this.applicationId = applicationId; + public void setApplicationUuid(String applicationUuid) { + this.applicationUuid = applicationUuid; } public List<GroupInstanceBean> getGroupInstances() { @@ -85,4 +86,12 @@ public class ApplicationInstanceBean implements Serializable { public void setClusterInstances(List<ClusterInstanceBean> clusterInstances) { this.clusterInstances = clusterInstances; } + + public String getApplicationId() { + return applicationId; + } + + public void setApplicationId(String applicationId) { + this.applicationId = applicationId; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/b38a7c5e/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 bd4d57e..4879352 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 @@ -1730,7 +1730,7 @@ public class ObjectConverter { ApplicationInfoBean applicationBean = new ApplicationInfoBean(); applicationBean.setId(application.getUniqueIdentifier()); - applicationBean.setName(application.getName()); + applicationBean.setName(application.getId()); applicationBean.setStatus(application.getStatus().name()); applicationBean.setDescription(application.getDescription()); applicationBean.setTenantDomain(application.getTenantDomain()); @@ -1754,7 +1754,8 @@ public class ObjectConverter { for (ApplicationInstance applicationInstance : applicationInstancesInTopology) { ApplicationInstanceBean instance = new ApplicationInstanceBean(); instance.setInstanceId(applicationInstance.getInstanceId()); - instance.setApplicationId(application.getUniqueIdentifier()); + instance.setApplicationUuid(application.getUniqueIdentifier()); + instance.setApplicationId(application.getId()); instance.setParentInstanceId(applicationInstance.getParentId()); instance.setStatus(applicationInstance.getStatus().toString()); applicationInstanceList.add(instance);
