Remove UUID and tenantId from deploymentPolicy Bean
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3f59113c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3f59113c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3f59113c Branch: refs/heads/tenant-isolation Commit: 3f59113c1604a99f763fb035441a00d2f2ad5be7 Parents: 169ae46 Author: Dinithi <[email protected]> Authored: Wed Jul 29 22:03:11 2015 +0530 Committer: Dinithi <[email protected]> Committed: Wed Jul 29 22:03:11 2015 +0530 ---------------------------------------------------------------------- .../policy/deployment/DeploymentPolicyBean.java | 18 ----------- .../rest/endpoint/api/StratosApiV41.java | 11 +++---- .../rest/endpoint/api/StratosApiV41Utils.java | 32 +++++++++++--------- .../util/converter/ObjectConverter.java | 10 ++---- 4 files changed, 25 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/3f59113c/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java index 05eaa31..1837714 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/DeploymentPolicyBean.java @@ -28,24 +28,6 @@ import java.util.List; public class DeploymentPolicyBean { private String id; - private String uuid; - private int tenantId; - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public int getTenantId() { - return tenantId; - } - - public void setTenantId(int tenantId) { - this.tenantId = tenantId; - } private List<NetworkPartitionReferenceBean> networkPartitions; http://git-wip-us.apache.org/repos/asf/stratos/blob/3f59113c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java index 6b8f4a0..038973a 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java @@ -134,17 +134,15 @@ public class StratosApiV41 extends AbstractApi { DeploymentPolicyBean deploymentPolicyDefinitionBean) throws RestAPIException { String deploymentPolicyId = deploymentPolicyDefinitionBean.getId(); - deploymentPolicyDefinitionBean.setUuid(UUID.randomUUID().toString()); - String deploymentPolicyUuid = deploymentPolicyDefinitionBean.getUuid(); + String deploymentPolicyUuid = UUID.randomUUID().toString(); PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - deploymentPolicyDefinitionBean.setTenantId(carbonContext.getTenantId()); int tenantId = carbonContext.getTenantId(); List<NetworkPartitionReferenceBean> networkPartitionReferenceBeans = deploymentPolicyDefinitionBean .getNetworkPartitions(); for (NetworkPartitionReferenceBean networkPartitionReferenceBeans1 : networkPartitionReferenceBeans) { - networkPartitionReferenceBeans1.setTenantId(deploymentPolicyDefinitionBean.getTenantId()); + networkPartitionReferenceBeans1.setTenantId(tenantId); } try { @@ -222,7 +220,6 @@ public class StratosApiV41 extends AbstractApi { DeploymentPolicyBean deploymentPolicyDefinitionBean) throws RestAPIException { String deploymentPolicyId = deploymentPolicyDefinitionBean.getId(); - String deploymentPolicyUuid = deploymentPolicyDefinitionBean.getUuid(); // TODO :: Deployment policy validation try { @@ -243,8 +240,8 @@ public class StratosApiV41 extends AbstractApi { } URI url = uriInfo.getAbsolutePathBuilder().path(deploymentPolicyId).build(); return Response.ok(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Deployment policy updated successfully: [deployment-policy-uuid] %s " + - "[deployment-policy-id] %s", deploymentPolicyUuid, deploymentPolicyId))).build(); + String.format("Deployment policy updated successfully: [deployment-policy-id] %s", + deploymentPolicyId))).build(); } /** http://git-wip-us.apache.org/repos/asf/stratos/blob/3f59113c/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 c2d7365..3cb0d9c 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 @@ -2947,8 +2947,7 @@ public class StratosApiV41Utils { try { if (log.isDebugEnabled()) { log.debug(String.format("Adding deployment policy: [deployment-policy-uuid] %s [deployment-policy-id]" + - " %s ", deploymentPolicyDefinitionBean.getUuid(), deploymentPolicyDefinitionBean.getId - ())); + " %s ", deploymentPolicyUuid, deploymentPolicyDefinitionBean.getId())); } NetworkPartitionBean[] networkPartitions = getNetworkPartitions(); @@ -2973,11 +2972,12 @@ public class StratosApiV41Utils { } } AutoscalerServiceClient.getInstance().addDeploymentPolicy(ObjectConverter - .convertDeploymentPolicyBeanToASDeploymentPolicy(deploymentPolicyDefinitionBean)); + .convertDeploymentPolicyBeanToASDeploymentPolicy(deploymentPolicyDefinitionBean, + deploymentPolicyUuid, tenantId)); if (log.isDebugEnabled()) { log.debug(String.format("Successfully added deploymentPolicy: [deployment-policy-uuid] %s " + - "[deployment-policy-id] %s", deploymentPolicyDefinitionBean.getUuid(), + "[deployment-policy-id] %s", deploymentPolicyUuid, deploymentPolicyDefinitionBean.getId())); } } catch (RemoteException e) { @@ -3047,20 +3047,22 @@ public class StratosApiV41Utils { AutoscalerServiceInvalidDeploymentPolicyExceptionException, AutoscalerServiceDeploymentPolicyNotExistsExceptionException { try { + AutoscalerServiceClient serviceClient = AutoscalerServiceClient.getInstance(); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + DeploymentPolicy deploymentPolicy = serviceClient.getDeploymentPolicyByTenant + (deploymentPolicyDefinitionBean.getId(), carbonContext.getTenantId()); if (log.isDebugEnabled()) { log.debug(String.format("Updating deployment policy: [deployment-policy-uuid] %s " + - "[deployment-policy-id] %s ", deploymentPolicyDefinitionBean.getUuid(), + "[deployment-policy-id] %s ", deploymentPolicy.getUuid(), deploymentPolicyDefinitionBean.getId())); } - - org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy deploymentPolicy = - ObjectConverter.convertDeploymentPolicyBeanToASDeploymentPolicy(deploymentPolicyDefinitionBean); - - AutoscalerServiceClient.getInstance().updateDeploymentPolicy(deploymentPolicy); + AutoscalerServiceClient.getInstance().updateDeploymentPolicy(ObjectConverter + .convertDeploymentPolicyBeanToASDeploymentPolicy(deploymentPolicyDefinitionBean, + deploymentPolicy.getUuid(), deploymentPolicy.getTenantId())); if (log.isDebugEnabled()) { log.debug(String.format("DeploymentPolicy updated successfully : [deployment-policy-uuid] %s " + - "[deployment-policy-id] %s ", deploymentPolicyDefinitionBean.getUuid(), + "[deployment-policy-id] %s ", deploymentPolicy.getUuid(), deploymentPolicyDefinitionBean.getId())); } } catch (RemoteException e) { @@ -3091,10 +3093,12 @@ public class StratosApiV41Utils { throws RestAPIException, AutoscalerServiceDeploymentPolicyNotExistsExceptionException, AutoscalerServiceUnremovablePolicyExceptionException { - DeploymentPolicyBean deploymentPolicyBean; try { - deploymentPolicyBean = getDeploymentPolicy(deploymentPolicyId); - AutoscalerServiceClient.getInstance().removeDeploymentPolicy(deploymentPolicyBean.getUuid()); + AutoscalerServiceClient serviceClient = AutoscalerServiceClient.getInstance(); + PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); + DeploymentPolicy deploymentPolicy = serviceClient.getDeploymentPolicyByTenant + (deploymentPolicyId, carbonContext.getTenantId()); + AutoscalerServiceClient.getInstance().removeDeploymentPolicy(deploymentPolicy.getUuid()); } catch (RemoteException e) { String msg = "Could not remove deployment policy: [deployment-policy-id] " + deploymentPolicyId + e http://git-wip-us.apache.org/repos/asf/stratos/blob/3f59113c/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 af4198a..ac6f668 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 @@ -2070,8 +2070,6 @@ public class ObjectConverter { DeploymentPolicyBean deploymentPolicyBean = new DeploymentPolicyBean(); deploymentPolicyBean.setId(deploymentPolicy.getId()); - deploymentPolicyBean.setUuid(deploymentPolicy.getUuid()); - deploymentPolicyBean.setTenantId(deploymentPolicy.getTenantId()); deploymentPolicyBean.setNetworkPartitions(convertASStubNetworkPartitionsToNetworkPartitionReferences( deploymentPolicy.getNetworkPartitionRefs())); return deploymentPolicyBean; @@ -2100,7 +2098,7 @@ public class ObjectConverter { public static DeploymentPolicy convertDeploymentPolicyBeanToASDeploymentPolicy( - DeploymentPolicyBean deploymentPolicyBean) { + DeploymentPolicyBean deploymentPolicyBean, String deploymentPolicyUuid, int tenantId) { if (deploymentPolicyBean == null) { return null; @@ -2108,8 +2106,8 @@ public class ObjectConverter { DeploymentPolicy deploymentPolicy = new DeploymentPolicy(); deploymentPolicy.setId(deploymentPolicyBean.getId()); - deploymentPolicy.setUuid(deploymentPolicyBean.getUuid()); - deploymentPolicy.setTenantId(deploymentPolicyBean.getTenantId()); + deploymentPolicy.setUuid(deploymentPolicyUuid); + deploymentPolicy.setTenantId(tenantId); if (deploymentPolicyBean.getNetworkPartitions() != null) { deploymentPolicy.setNetworkPartitionRefs(convertNetworkPartitionToASStubNetworkPartition( deploymentPolicyBean.getNetworkPartitions())); @@ -2143,8 +2141,6 @@ public class ObjectConverter { DeploymentPolicyBean deploymentPolicyBean = new DeploymentPolicyBean(); deploymentPolicyBean.setId(deploymentPolicy.getId()); - deploymentPolicyBean.setUuid(deploymentPolicy.getUuid()); - deploymentPolicyBean.setTenantId(deploymentPolicy.getTenantId()); deploymentPolicyBean.setNetworkPartitions(convertASStubNetworkPartitionRefsToNetworkPartitions( deploymentPolicy.getNetworkPartitionRefs())); return deploymentPolicyBean;
