remove UUID and tenantId from AutoscalingPolicyBean
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0f6b228b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0f6b228b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0f6b228b Branch: refs/heads/tenant-isolation Commit: 0f6b228bcbdfabd8c009863076d38604af645774 Parents: 573c5a8 Author: Dinithi <[email protected]> Authored: Wed Aug 12 10:37:55 2015 +0530 Committer: Dinithi <[email protected]> Committed: Wed Aug 12 10:37:55 2015 +0530 ---------------------------------------------------------------------- .../policy/autoscale/AutoscalePolicyBean.java | 18 ------------------ .../stratos/rest/endpoint/api/StratosApiV41.java | 14 ++++++-------- .../rest/endpoint/api/StratosApiV41Utils.java | 14 +++++++------- .../endpoint/util/converter/ObjectConverter.java | 6 ++---- 4 files changed, 15 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0f6b228b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java index bb3de10..5dc025d 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/autoscale/AutoscalePolicyBean.java @@ -25,28 +25,10 @@ import javax.xml.bind.annotation.XmlRootElement; public class AutoscalePolicyBean { private String id; - private String uuid; - private int tenantId; private String displayName; private String description; private LoadThresholdsBean loadThresholds; - 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; - } - public String getId() { return id; } http://git-wip-us.apache.org/repos/asf/stratos/blob/0f6b228b/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 16c2b35..a682c9e 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 @@ -161,8 +161,8 @@ public class StratosApiV41 extends AbstractApi { } URI url = uriInfo.getAbsolutePathBuilder().path(deploymentPolicyId).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Deployment policy added successfully: [deployment-policy-uuid] %s " + - "[deployment-policy-uuid] %s", deploymentPolicyUuid, deploymentPolicyId))).build(); + String.format("Deployment policy added successfully: [deployment-policy-id] %s ", + deploymentPolicyId))).build(); } /** @@ -1453,13 +1453,12 @@ public class StratosApiV41 extends AbstractApi { public Response addAutoscalingPolicy( AutoscalePolicyBean autoscalePolicy) throws RestAPIException { String autoscalingPolicyId = autoscalePolicy.getId(); - autoscalePolicy.setUuid(UUID.randomUUID().toString()); - String autoscalingPolicyUuid = autoscalePolicy.getUuid(); + String autoscalingPolicyUuid = UUID.randomUUID().toString(); PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); - autoscalePolicy.setTenantId(carbonContext.getTenantId()); + int tenantId = carbonContext.getTenantId(); try { - StratosApiV41Utils.addAutoscalingPolicy(autoscalePolicy); + StratosApiV41Utils.addAutoscalingPolicy(autoscalePolicy, autoscalingPolicyUuid, tenantId); URI url = uriInfo.getAbsolutePathBuilder().path(autoscalePolicy.getId()).build(); return Response.created(url).entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, String.format("Autoscaling policy added successfully: [autoscale-policy-uuid] %s " + @@ -1497,8 +1496,7 @@ public class StratosApiV41 extends AbstractApi { ResponseMessageBean.ERROR, "Autoscaling policy is invalid")).build(); } return Response.ok().entity(new ResponseMessageBean(ResponseMessageBean.SUCCESS, - String.format("Autoscaling policy updated successfully: [autoscale-policy-uuid] %s " + - "[autoscale-policy-id] %s", autoscalePolicy.getUuid(), + String.format("Autoscaling policy updated successfully: [autoscale-policy-id] %s", autoscalePolicy.getId()))).build(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/0f6b228b/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 025c010..6e354ee 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 @@ -674,18 +674,18 @@ public class StratosApiV41Utils { * @param autoscalePolicyBean autoscalePolicyBean * @throws RestAPIException */ - public static void addAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean) throws RestAPIException, + public static void addAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean, String autoscalingPolicyUuid, + int tenantId) throws RestAPIException, AutoscalerServiceInvalidPolicyExceptionException, AutoscalerServiceAutoScalingPolicyAlreadyExistExceptionException { log.info(String.format("Adding autoscaling policy: [autoscaling-policy-uuid] %s [autoscaling-policy-id] %s", - autoscalePolicyBean.getUuid(), autoscalePolicyBean.getId())); + autoscalingPolicyUuid, autoscalePolicyBean.getId())); AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { - org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = ObjectConverter. - convertToCCAutoscalerPojo(autoscalePolicyBean,autoscalePolicyBean.getUuid(),autoscalePolicyBean.getTenantId()); + convertToCCAutoscalerPojo(autoscalePolicyBean, autoscalingPolicyUuid, tenantId); try { autoscalerServiceClient.addAutoscalingPolicy(autoscalePolicy); @@ -890,8 +890,7 @@ public class StratosApiV41Utils { public static void updateAutoscalingPolicy(AutoscalePolicyBean autoscalePolicyBean) throws RestAPIException, AutoscalerServiceInvalidPolicyExceptionException { - log.info(String.format("Updating autoscaling policy: [autoscaling-policy-uuid] %s [autoscaling-policy-id] %s", - autoscalePolicyBean.getUuid(), autoscalePolicyBean.getId())); + log.info(String.format("Updating autoscaling policy: [autoscaling-policy-id] %s", autoscalePolicyBean.getId())); AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient(); if (autoscalerServiceClient != null) { @@ -901,7 +900,8 @@ public class StratosApiV41Utils { .getAutoScalePolicyForTenant(autoscalePolicyBean.getId(), carbonContext.getTenantId()) .getUuid(); org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy autoscalePolicy = - ObjectConverter.convertToCCAutoscalerPojo(autoscalePolicyBean,autoscalerUuid,carbonContext.getTenantId()); + ObjectConverter.convertToCCAutoscalerPojo(autoscalePolicyBean, autoscalerUuid, + carbonContext.getTenantId()); autoscalerServiceClient.updateAutoscalingPolicy(autoscalePolicy); } catch (RemoteException e) { log.error(e.getMessage(), e); http://git-wip-us.apache.org/repos/asf/stratos/blob/0f6b228b/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 fbb0039..03f14d3 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 @@ -421,7 +421,7 @@ public class ObjectConverter { } public static org.apache.stratos.autoscaler.stub.autoscale.policy.AutoscalePolicy convertToCCAutoscalerPojo( - AutoscalePolicyBean autoscalePolicyBean,String uuid,int tenantId) { + AutoscalePolicyBean autoscalePolicyBean, String uuid, int tenantId) { if (autoscalePolicyBean == null) { return null; @@ -432,7 +432,7 @@ public class ObjectConverter { autoscalePolicy.setId(autoscalePolicyBean.getId()); autoscalePolicy.setUuid(uuid); - autoscalePolicy.setTenantId(autoscalePolicyBean.getTenantId()); + autoscalePolicy.setTenantId(tenantId); autoscalePolicy.setDescription(autoscalePolicyBean.getDescription()); autoscalePolicy.setDisplayName(autoscalePolicyBean.getDisplayName()); autoscalePolicy.setTenantId(tenantId); @@ -886,8 +886,6 @@ public class ObjectConverter { AutoscalePolicyBean autoscalePolicyBean = new AutoscalePolicyBean(); autoscalePolicyBean.setId(autoscalePolicy.getId()); - autoscalePolicyBean.setUuid(autoscalePolicy.getUuid()); - autoscalePolicyBean.setTenantId(autoscalePolicy.getTenantId()); autoscalePolicyBean.setDescription(autoscalePolicy.getDescription()); autoscalePolicyBean.setDisplayName(autoscalePolicy.getDisplayName()); if (autoscalePolicy.getLoadThresholds() != null) {
