Some simple formatting
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/71a5ec1c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/71a5ec1c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/71a5ec1c Branch: refs/heads/tenant-isolation-feature Commit: 71a5ec1c37955bb3c2f13a2c93a604094aabb5cd Parents: 5669725 Author: Shiro <[email protected]> Authored: Fri Oct 3 10:59:18 2014 +0530 Committer: Shiro <[email protected]> Committed: Fri Oct 3 10:59:18 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/partition/PartitionManager.java | 43 +++++++------- .../autoscaler/policy/PolicyManager.java | 60 ++++++++++---------- .../autoscaler/registry/RegistryManager.java | 18 +++--- 3 files changed, 59 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/71a5ec1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java index 5b60805..0e55e98 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/PartitionManager.java @@ -77,14 +77,14 @@ public class PartitionManager { return (partitions.containsKey(tenantId)); } - public boolean partitionExist(String partitionId){ + public boolean partitionExist(String partitionId) { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(partitions.containsKey(StratosConstants.PUBLIC_DEFINITION)){ + if (partitions.containsKey(StratosConstants.PUBLIC_DEFINITION)) { if ((partitions.get(StratosConstants.PUBLIC_DEFINITION)).containsKey(partitionId)) return true; } - if(partitions.containsKey(tenantId)){ + if(partitions.containsKey(tenantId)) { return (partitions.get(tenantId)).containsKey(partitionId); } @@ -95,7 +95,7 @@ public class PartitionManager { * Deploy a new partition to Auto Scaler. */ public boolean addNewPartition(Partition partition) throws InvalidPartitionException { - if (StringUtils.isEmpty(partition.getId())){ + if (StringUtils.isEmpty(partition.getId())) { throw new InvalidPartitionException("Partition id can not be empty"); } if (this.partitionExist(partition.getId())) { @@ -123,10 +123,10 @@ public class PartitionManager { Iterator<Partition> partitionIterator = partitions.iterator(); while (partitionIterator.hasNext()) { Partition partition = partitionIterator.next(); - try{ + try { addPartitionToInformationModel(partition); } - catch(InvalidPolicyException e){ + catch(InvalidPolicyException e) { // ignore and move on } } @@ -156,14 +156,14 @@ public class PartitionManager { * @param partition the partition * @throws InvalidPolicyException the invalid policy exception */ - public void addPartitionToInformationModel(Partition partition) throws InvalidPolicyException { + private void addPartitionToInformationModel(Partition partition) throws InvalidPolicyException { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(partition.getIsPublic()){ - addPartitionToSpecificContainer(partition, StratosConstants.PUBLIC_DEFINITION); + if (partition.getIsPublic()) { + addToSpecificContainer(partition, StratosConstants.PUBLIC_DEFINITION); } - else{ - addPartitionToSpecificContainer(partition, tenantId); + else { + addToSpecificContainer(partition, tenantId); } } @@ -174,11 +174,10 @@ public class PartitionManager { * @param tenantId the tenant id * @throws InvalidPolicyException the invalid policy exception */ - private void addPartitionToSpecificContainer(Partition partition, int tenantId) throws InvalidPolicyException { + private void addToSpecificContainer(Partition partition, int tenantId) throws InvalidPolicyException { Map<String, Partition> partitionDefinitions; - if(!partitions.containsKey(tenantId)) - { + if (!partitions.containsKey(tenantId)) { partitionDefinitions = new HashMap<String, Partition>(); partitions.put(tenantId, partitionDefinitions); } @@ -201,12 +200,12 @@ public class PartitionManager { public Partition getPartitionById(String partitionId) { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(partitions.containsKey(StratosConstants.PUBLIC_DEFINITION)){ + if (partitions.containsKey(StratosConstants.PUBLIC_DEFINITION)) { if ((partitions.get(StratosConstants.PUBLIC_DEFINITION)).containsKey(partitionId)) return (partitions.get(StratosConstants.PUBLIC_DEFINITION)).get(partitionId); } - if(partitions.containsKey(tenantId)){ + if (partitions.containsKey(tenantId)) { if ((partitions.get(tenantId)).containsKey(partitionId)) return (partitions.get(tenantId)).get(partitionId); } @@ -215,16 +214,16 @@ public class PartitionManager { } public Partition[] getAllPartitions() { - List<Partition> policyList = new ArrayList<Partition>(); + List<Partition> partitionList = new ArrayList<Partition>(); int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(partitions.containsKey(tenantId)) - policyList.addAll(partitions.get(tenantId).values()); + if (partitions.containsKey(tenantId)) + partitionList.addAll(partitions.get(tenantId).values()); - if(partitions.containsKey(StratosConstants.PUBLIC_DEFINITION)) - policyList.addAll(partitions.get(StratosConstants.PUBLIC_DEFINITION).values()); + if (partitions.containsKey(StratosConstants.PUBLIC_DEFINITION)) + partitionList.addAll(partitions.get(StratosConstants.PUBLIC_DEFINITION).values()); - return policyList.toArray(new Partition[0]); + return partitionList.toArray(new Partition[0]); } public boolean validatePartitionViaCloudController(Partition partition) throws PartitionValidationException { http://git-wip-us.apache.org/repos/asf/stratos/blob/71a5ec1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java index 95055ca..eb79d1f 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/PolicyManager.java @@ -86,10 +86,10 @@ public class PolicyManager { Iterator<AutoscalePolicy> asPolicyIterator = asPolicies.iterator(); while (asPolicyIterator.hasNext()) { AutoscalePolicy asPolicy = asPolicyIterator.next(); - try{ + try { addASPolicyToInformationModel(asPolicy); } - catch (InvalidPolicyException e){ + catch (InvalidPolicyException e) { log.warn("Unable to load Autoscalar policy to information Model ["+ asPolicy.getTenantId() + "]"); } } @@ -104,10 +104,10 @@ public class PolicyManager { Iterator<DeploymentPolicy> depPolicyIterator = depPolicies.iterator(); while (depPolicyIterator.hasNext()) { DeploymentPolicy depPolicy = depPolicyIterator.next(); - try{ + try { addDeploymentPolicyToInformationModel(depPolicy); } - catch (InvalidPolicyException e){ + catch (InvalidPolicyException e) { log.warn("Unable to load Deployment policy to information Model ["+ depPolicy.getTenantId() + "]"); } } @@ -120,7 +120,7 @@ public class PolicyManager { * @throws InvalidPolicyException */ public boolean deployAutoscalePolicy(AutoscalePolicy policy) throws InvalidPolicyException { - if(StringUtils.isEmpty(policy.getId())){ + if(StringUtils.isEmpty(policy.getId())) { throw new AutoScalerException("AutoScaling policy id can not be empty"); } this.addASPolicyToInformationModel(policy); @@ -142,10 +142,10 @@ public class PolicyManager { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(asPolicy.getIsPublic()){ + if(asPolicy.getIsPublic()) { addASPolicyToSpecificContainer(asPolicy, StratosConstants.PUBLIC_DEFINITION); } - else{ + else { addASPolicyToSpecificContainer(asPolicy, tenantId); } } @@ -160,8 +160,7 @@ public class PolicyManager { private void addASPolicyToSpecificContainer(AutoscalePolicy asPolicy, int tenantId) throws InvalidPolicyException { Map<String, AutoscalePolicy> policies; - if(!autoscalePolicyListMap.containsKey(tenantId)) - { + if(!autoscalePolicyListMap.containsKey(tenantId)) { policies = new HashMap<String, AutoscalePolicy>(); autoscalePolicyListMap.put(tenantId, policies); } @@ -191,7 +190,7 @@ public class PolicyManager { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); AutoscalePolicy policyToDelete = getAutoscalePolicy(policy); - if((policyToDelete == null) || (policyToDelete.getTenantId() != tenantId)) + if ((policyToDelete == null) || (policyToDelete.getTenantId() != tenantId)) throw new InvalidPolicyException("No such policy [" + policy + "] exists"); if (log.isDebugEnabled()) { @@ -199,7 +198,7 @@ public class PolicyManager { } RegistryManager.getInstance(tenantId).removeAutoscalerPolicy(policyToDelete); - if(policyToDelete.getIsPublic()){ + if (policyToDelete.getIsPublic()) { (autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).remove(policy); } else { @@ -217,10 +216,10 @@ public class PolicyManager { List<AutoscalePolicy> policyList = new ArrayList<AutoscalePolicy>(); int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(autoscalePolicyListMap.containsKey(tenantId)) + if (autoscalePolicyListMap.containsKey(tenantId)) policyList.addAll(autoscalePolicyListMap.get(tenantId).values()); - if(autoscalePolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)) + if (autoscalePolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)) policyList.addAll(autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION).values()); return policyList.toArray(new AutoscalePolicy[0]); @@ -234,13 +233,13 @@ public class PolicyManager { */ public AutoscalePolicy getAutoscalePolicy(String id) { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(autoscalePolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)){ - if((autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).containsKey(id)) + if (autoscalePolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)) { + if ((autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).containsKey(id)) return (autoscalePolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).get(id); } - if(autoscalePolicyListMap.containsKey(tenantId)){ - if((autoscalePolicyListMap.get(tenantId)).containsKey(id)) + if (autoscalePolicyListMap.containsKey(tenantId)) { + if ((autoscalePolicyListMap.get(tenantId)).containsKey(id)) return (autoscalePolicyListMap.get(tenantId)).get(id); } @@ -263,11 +262,11 @@ public class PolicyManager { * @throws InvalidPolicyException */ public boolean deployDeploymentPolicy(DeploymentPolicy policy) throws InvalidPolicyException { - if(StringUtils.isEmpty(policy.getId())){ + if (StringUtils.isEmpty(policy.getId())) { throw new AutoScalerException("Deploying policy id can not be empty"); } try { - if(log.isInfoEnabled()) { + if (log.isInfoEnabled()) { log.info(String.format("Deploying deployment policy: [id] %s", policy.getId())); } fillPartitions(policy); @@ -294,10 +293,10 @@ public class PolicyManager { public void addDeploymentPolicyToInformationModel(DeploymentPolicy policy) throws InvalidPolicyException { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(policy.getIsPublic()){ + if (policy.getIsPublic()) { addDeploymentPolicyToSpecificContainer(policy, StratosConstants.PUBLIC_DEFINITION); } - else{ + else { addDeploymentPolicyToSpecificContainer(policy, tenantId); } } @@ -312,8 +311,7 @@ public class PolicyManager { private void addDeploymentPolicyToSpecificContainer(DeploymentPolicy deploymentPolicy, int tenantId) throws InvalidPolicyException { Map<String, DeploymentPolicy> policies; - if(!deploymentPolicyListMap.containsKey(tenantId)) - { + if (!deploymentPolicyListMap.containsKey(tenantId)) { policies = new HashMap<String, DeploymentPolicy>(); deploymentPolicyListMap.put(tenantId, policies); } @@ -373,7 +371,7 @@ public class PolicyManager { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); DeploymentPolicy policyToDelete = getDeploymentPolicy(policy); - if((policyToDelete == null) || (policyToDelete.getTenantId() != tenantId)) + if ((policyToDelete == null) || (policyToDelete.getTenantId() != tenantId)) throw new InvalidPolicyException("No such policy [" + policy + "] exists"); if (log.isDebugEnabled()) { @@ -381,7 +379,7 @@ public class PolicyManager { } RegistryManager.getInstance(tenantId).removeDeploymentPolicy(policyToDelete); - if(policyToDelete.getIsPublic()){ + if (policyToDelete.getIsPublic()) { (deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).remove(policy); } else { @@ -398,10 +396,10 @@ public class PolicyManager { List<DeploymentPolicy> policyList = new ArrayList<DeploymentPolicy>(); int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(deploymentPolicyListMap.containsKey(tenantId)) + if (deploymentPolicyListMap.containsKey(tenantId)) policyList.addAll(deploymentPolicyListMap.get(CarbonContext.getThreadLocalCarbonContext().getTenantId()).values()); - if(deploymentPolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)) + if (deploymentPolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)) policyList.addAll(deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION).values()); return policyList.toArray(new DeploymentPolicy[0]); @@ -415,13 +413,13 @@ public class PolicyManager { */ public DeploymentPolicy getDeploymentPolicy(String id) { int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId(); - if(deploymentPolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)){ - if((deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).containsKey(id)) + if (deploymentPolicyListMap.containsKey(StratosConstants.PUBLIC_DEFINITION)) { + if ((deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).containsKey(id)) return (deploymentPolicyListMap.get(StratosConstants.PUBLIC_DEFINITION)).get(id); } - if(deploymentPolicyListMap.containsKey(tenantId)){ - if((deploymentPolicyListMap.get(tenantId)).containsKey(id)) + if (deploymentPolicyListMap.containsKey(tenantId)) { + if ((deploymentPolicyListMap.get(tenantId)).containsKey(id)) return (deploymentPolicyListMap.get(tenantId)).get(id); } http://git-wip-us.apache.org/repos/asf/stratos/blob/71a5ec1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java index 943ac9e..81dc45e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java @@ -125,7 +125,7 @@ public class RegistryManager { public void persistPartition(Partition partition) { String resourcePath; - if(!partition.getIsPublic()) { + if (!partition.getIsPublic()) { resourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.PARTITION_RESOURCE + "/" + AutoScalerConstants.TENANT_RESOURCE + "/" + partition.getId(); } else { resourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.PARTITION_RESOURCE + "/" + AutoScalerConstants.PUBLIC_RESOURCE + "/" + partition.getId(); @@ -148,7 +148,7 @@ public class RegistryManager { public void persistAutoscalerPolicy(AutoscalePolicy autoscalePolicy) { String resourcePath; - if(!autoscalePolicy.getIsPublic()) { + if (!autoscalePolicy.getIsPublic()) { resourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.AS_POLICY_RESOURCE + "/" + AutoScalerConstants.TENANT_RESOURCE + "/" + autoscalePolicy.getId(); } else { resourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.AS_POLICY_RESOURCE + "/" + AutoScalerConstants.PUBLIC_RESOURCE + "/" + autoscalePolicy.getId(); @@ -162,7 +162,7 @@ public class RegistryManager { public void persistDeploymentPolicy(DeploymentPolicy deploymentPolicy) { String resourcePath; - if(!deploymentPolicy.getIsPublic()) { + if (!deploymentPolicy.getIsPublic()) { resourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.DEPLOYMENT_POLICY_RESOURCE + "/" + AutoScalerConstants.TENANT_RESOURCE + "/" + deploymentPolicy.getId(); } else { resourcePath = AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.DEPLOYMENT_POLICY_RESOURCE + "/" + AutoScalerConstants.PUBLIC_RESOURCE + "/" + deploymentPolicy.getId(); @@ -196,9 +196,9 @@ public class RegistryManager { String[] publicPartitionsResourceList = (String[]) registryManager.retrieve(AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.PARTITION_RESOURCE + AutoScalerConstants.PUBLIC_RESOURCE); ArrayList<String> allPartitions = new ArrayList<String>(); - if(partitionsResourceList != null) + if (partitionsResourceList != null) allPartitions.addAll(Arrays.asList(partitionsResourceList)); - if(publicPartitionsResourceList != null) + if (publicPartitionsResourceList != null) allPartitions.addAll(Arrays.asList(publicPartitionsResourceList)); if (allPartitions != null) { @@ -269,9 +269,9 @@ public class RegistryManager { String[] publicAsPolicyResourceList = (String[]) registryManager.retrieve(AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.AS_POLICY_RESOURCE + AutoScalerConstants.PUBLIC_RESOURCE); ArrayList<String> allAsPolicies = new ArrayList<String>(); - if(asPolicyResourceList != null) + if (asPolicyResourceList != null) allAsPolicies.addAll(Arrays.asList(asPolicyResourceList)); - if(publicAsPolicyResourceList != null) + if (publicAsPolicyResourceList != null) allAsPolicies.addAll(Arrays.asList(publicAsPolicyResourceList)); if (allAsPolicies != null) { @@ -308,9 +308,9 @@ public class RegistryManager { String[] publicDepPolicyResourceList = (String[]) registryManager.retrieve(AutoScalerConstants.AUTOSCALER_RESOURCE + AutoScalerConstants.DEPLOYMENT_POLICY_RESOURCE + AutoScalerConstants.PUBLIC_RESOURCE); ArrayList<String> allDepPolicies = new ArrayList<String>(); - if(depPolicyResourceList != null) + if (depPolicyResourceList != null) allDepPolicies.addAll(Arrays.asList(depPolicyResourceList)); - if(publicDepPolicyResourceList != null) + if (publicDepPolicyResourceList != null) allDepPolicies.addAll(Arrays.asList(publicDepPolicyResourceList)); if (allDepPolicies != null) {
