Remove UUID and tenantId from NetworkPartitionReferenceBean and remove tenantId from PartitinReferenceBean
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4fdd431f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4fdd431f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4fdd431f Branch: refs/heads/tenant-isolation Commit: 4fdd431f09a9aa731f57af00bec72325b9fd9206 Parents: 98b7744 Author: Dinithi <[email protected]> Authored: Wed Aug 19 11:27:11 2015 +0530 Committer: Dinithi <[email protected]> Committed: Wed Aug 19 11:27:11 2015 +0530 ---------------------------------------------------------------------- .../common/beans/partition/PartitionReferenceBean.java | 9 --------- .../stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 -- .../rest/endpoint/util/converter/ObjectConverter.java | 4 ++-- 3 files changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4fdd431f/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java index 8b54a11..c63862f 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/partition/PartitionReferenceBean.java @@ -32,7 +32,6 @@ public class PartitionReferenceBean { private String description; private List<PropertyBean> property; private int partitionMax; - private int tenantId; public String getUuid() { return uuid; @@ -73,12 +72,4 @@ public class PartitionReferenceBean { public void setId(String id) { this.id = id; } - - public int getTenantId() { - return tenantId; - } - - public void setTenantId(int tenantId) { - this.tenantId = tenantId; - } } http://git-wip-us.apache.org/repos/asf/stratos/blob/4fdd431f/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 37fa158..d1cad44 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 @@ -3024,7 +3024,6 @@ public class StratosApiV41Utils { if (partition.getTenantId() == tenantId && partitionReferenceBean.getId().equals(partition.getId())) { partitionReferenceBean.setUuid(partition.getUuid()); - partitionReferenceBean.setTenantId(tenantId); } } } @@ -3132,7 +3131,6 @@ public class StratosApiV41Utils { if (existingPartition.getTenantId() == tenantId && partition.getId().equals(existingPartition.getId())) { partition.setUuid(existingPartition.getUuid()); - partition.setTenantId(tenantId); } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/4fdd431f/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 02d2c3a..0301b2b 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 @@ -2176,11 +2176,11 @@ public class ObjectConverter { if (partitionReferenceBean == null) { return null; } - + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); PartitionRef stubPartition = new PartitionRef(); stubPartition.setUuid(partitionReferenceBean.getUuid()); stubPartition.setId(partitionReferenceBean.getId()); - stubPartition.setTenantId(partitionReferenceBean.getTenantId()); + stubPartition.setTenantId(carbonContext.getTenantId()); stubPartition.setPartitionMax(partitionReferenceBean.getPartitionMax()); return stubPartition; }
