Removing unused variables and cleaning up the code.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/36ffe220 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/36ffe220 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/36ffe220 Branch: refs/heads/4.0.0-grouping Commit: 36ffe2209d84122bf085a247c6af2eae3a07c629 Parents: acec548 Author: Nirmal Fernando <[email protected]> Authored: Wed Aug 20 08:53:49 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Aug 20 08:53:49 2014 +0530 ---------------------------------------------------------------------- .../receiver/health/AutoscalerHealthStatEventReceiver.java | 1 - .../receiver/topology/AutoscalerTopologyEventReceiver.java | 7 ++----- .../apache/stratos/autoscaler/monitor/LbClusterMonitor.java | 2 -- .../autoscaler/partition/deployers/PartitionDeployer.java | 5 +++-- .../autoscaler/policy/deployers/DeploymentPolicyDeployer.java | 5 +++-- .../stratos/autoscaler/rule/AutoscalerRuleEvaluator.java | 1 + .../org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 1 - 7 files changed, 9 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/36ffe220/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java index 59b00b1..52952c3 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java @@ -29,7 +29,6 @@ import org.apache.stratos.autoscaler.exception.TerminationException; import org.apache.stratos.autoscaler.monitor.AbstractMonitor; import org.apache.stratos.autoscaler.policy.model.LoadAverage; import org.apache.stratos.autoscaler.policy.model.MemoryConsumption; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.domain.topology.Service; http://git-wip-us.apache.org/repos/asf/stratos/blob/36ffe220/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java index 390d112..fed35bc 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java @@ -23,7 +23,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.*; import org.apache.stratos.autoscaler.client.cloud.controller.CloudControllerClient; -import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy; import org.apache.stratos.autoscaler.exception.PartitionValidationException; import org.apache.stratos.autoscaler.exception.PolicyValidationException; @@ -136,7 +135,6 @@ public class AutoscalerTopologyEventReceiver implements Runnable { // start a new member in the same Partition String partitionId = monitor.getPartitionOfMember(memberId); - Partition partition = monitor.getDeploymentPolicy().getPartitionById(partitionId); PartitionContext partitionCtxt = nwPartitionCtxt.getPartitionCtxt(partitionId); @@ -209,7 +207,6 @@ public class AutoscalerTopologyEventReceiver implements Runnable { ClusterRemovedEvent e = (ClusterRemovedEvent) event; TopologyManager.acquireReadLock(); - String serviceName = e.getServiceName(); String clusterId = e.getClusterId(); String deploymentPolicy = e.getDeploymentPolicy(); @@ -387,7 +384,6 @@ public class AutoscalerTopologyEventReceiver implements Runnable { // start a new member in the same Partition String partitionId = monitor.getPartitionOfMember(memberId); - Partition partition = monitor.getDeploymentPolicy().getPartitionById(partitionId); PartitionContext partitionCtxt = nwPartitionCtxt.getPartitionCtxt(partitionId); @@ -568,7 +564,8 @@ public class AutoscalerTopologyEventReceiver implements Runnable { } } - private void runTerminateAllRule(AbstractMonitor monitor) { + @SuppressWarnings("unused") + private void runTerminateAllRule(AbstractMonitor monitor) { FactHandle terminateAllFactHandle = null; http://git-wip-us.apache.org/repos/asf/stratos/blob/36ffe220/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java index 5774461..8d6c40b 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/LbClusterMonitor.java @@ -29,8 +29,6 @@ import org.apache.stratos.autoscaler.policy.model.AutoscalePolicy; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.messaging.domain.topology.ClusterStatus; -import java.util.concurrent.ConcurrentHashMap; - /** * Is responsible for monitoring a service cluster. This runs periodically * and perform minimum instance check and scaling check using the underlying http://git-wip-us.apache.org/repos/asf/stratos/blob/36ffe220/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionDeployer.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionDeployer.java index f27c44e..635fd09 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionDeployer.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/partition/deployers/PartitionDeployer.java @@ -40,7 +40,8 @@ public class PartitionDeployer extends AbstractDeployer { private static final Log log = LogFactory.getLog(PartitionDeployer.class); - private static String fileExt="xml"; //default + @SuppressWarnings("unused") + private String extension="xml"; //default private static String deployDirectory=null; @Override @@ -65,7 +66,7 @@ public class PartitionDeployer extends AbstractDeployer { @Override public void setExtension(String ext) { - fileExt = ext; + extension = ext; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/36ffe220/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyDeployer.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyDeployer.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyDeployer.java index 1a1a00a..a402915 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyDeployer.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/policy/deployers/DeploymentPolicyDeployer.java @@ -38,7 +38,8 @@ public class DeploymentPolicyDeployer extends AbstractDeployer { private static final Log log = LogFactory.getLog(DeploymentPolicyDeployer.class); - private static String fileExt="xml"; //default + @SuppressWarnings("unused") + private String extension ="xml"; //default private static String deployDirectory=null; @Override @@ -63,7 +64,7 @@ public class DeploymentPolicyDeployer extends AbstractDeployer { @Override public void setExtension(String ext) { - fileExt = ext; + extension = ext; } @Override http://git-wip-us.apache.org/repos/asf/stratos/blob/36ffe220/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java index b0b7f60..4bf9207 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/AutoscalerRuleEvaluator.java @@ -50,6 +50,7 @@ public class AutoscalerRuleEvaluator { private static KnowledgeBase minCheckKbase; private static KnowledgeBase scaleCheckKbase; + @SuppressWarnings("unused") private static KnowledgeBase terminateAllKbase; public AutoscalerRuleEvaluator(){ http://git-wip-us.apache.org/repos/asf/stratos/blob/36ffe220/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java index 69b5acf..8eaf1dd 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java @@ -40,7 +40,6 @@ import org.apache.stratos.cloud.controller.stub.deployment.partition.Partition; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.cloud.controller.stub.pojo.Properties; -import org.apache.stratos.cloud.controller.stub.pojo.Property; import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.ClusterStatus; import org.apache.stratos.messaging.domain.topology.Member;
