Removing unused imports and adding serialVersionUID.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2d175860 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2d175860 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2d175860 Branch: refs/heads/master Commit: 2d1758600c6c5f7e78ffd76e67b25afbb1189cb1 Parents: efc3bab Author: Udara Liyanage <[email protected]> Authored: Mon Dec 2 14:04:28 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Mon Dec 2 14:04:28 2013 -0500 ---------------------------------------------------------------------- .../client/cloud/controller/CloudControllerClient.java | 1 - .../autoscaler/event/AverageRequestsInFlightEvent.java | 4 ++-- .../event/GradientOfRequestsInFlightEvent.java | 4 ++-- .../event/SecondDerivativeOfRequestsInFlightEvent.java | 6 +++--- .../autoscaler/internal/AutoscalerServerComponent.java | 3 --- .../message/receiver/health/HealthEventQueue.java | 4 +++- .../stratos/autoscaler/rule/ExecutorTaskScheduler.java | 12 ++++-------- .../topology/processors/AutoscalerTopologyReceiver.java | 1 - .../topology/processors/TopologyReceiver.java | 1 - .../org/apache/stratos/autoscaler/util/ConfUtil.java | 11 ++--------- 10 files changed, 16 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java index 1fb9a45..6eed713 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.exception.PartitionValidationException; -import org.apache.stratos.autoscaler.exception.PolicyValidationException; import org.apache.stratos.autoscaler.exception.SpawningException; import org.apache.stratos.autoscaler.exception.TerminationException; import org.apache.stratos.autoscaler.util.ConfUtil; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/AverageRequestsInFlightEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/AverageRequestsInFlightEvent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/AverageRequestsInFlightEvent.java index 1f03f76..37edcf6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/AverageRequestsInFlightEvent.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/AverageRequestsInFlightEvent.java @@ -26,8 +26,8 @@ import java.io.Serializable; */ public class AverageRequestsInFlightEvent implements Serializable { - - private String clusterId; + private static final long serialVersionUID = 7178667274015434275L; + private String clusterId; private float value; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/GradientOfRequestsInFlightEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/GradientOfRequestsInFlightEvent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/GradientOfRequestsInFlightEvent.java index a198a1d..ad55619 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/GradientOfRequestsInFlightEvent.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/GradientOfRequestsInFlightEvent.java @@ -26,8 +26,8 @@ import java.io.Serializable; */ public class GradientOfRequestsInFlightEvent implements Serializable { - - private String clusterId; + private static final long serialVersionUID = 6140723469565274572L; + private String clusterId; private float value; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/SecondDerivativeOfRequestsInFlightEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/SecondDerivativeOfRequestsInFlightEvent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/SecondDerivativeOfRequestsInFlightEvent.java index c9881f9..ae4ca7a 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/SecondDerivativeOfRequestsInFlightEvent.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/SecondDerivativeOfRequestsInFlightEvent.java @@ -25,9 +25,9 @@ import java.io.Serializable; * This event is fired by Event processing engine to send second derivative of requests in flight */ public class SecondDerivativeOfRequestsInFlightEvent implements Serializable { - - - private String clusterId; + + private static final long serialVersionUID = 8857808689466762084L; + private String clusterId; private float value; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java index 4969670..a02411d 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServerComponent.java @@ -24,10 +24,7 @@ import org.apache.stratos.autoscaler.message.receiver.health.HealthEventMessageD import org.apache.stratos.autoscaler.message.receiver.health.HealthEventMessageReceiver; import org.apache.stratos.autoscaler.rule.ExecutorTaskScheduler; import org.apache.stratos.autoscaler.topology.processors.AutoscalerTopologyReceiver; -import org.apache.stratos.autoscaler.topology.processors.TopologyReceiver; import org.apache.stratos.messaging.broker.subscribe.TopicSubscriber; -import org.apache.stratos.messaging.message.receiver.topology.TopologyEventMessageDelegator; -import org.apache.stratos.messaging.message.receiver.topology.TopologyEventMessageReceiver; import org.apache.stratos.messaging.util.Constants; import org.osgi.service.component.ComponentContext; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventQueue.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventQueue.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventQueue.java index 6544d4f..f26efd5 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventQueue.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventQueue.java @@ -26,7 +26,9 @@ import java.util.concurrent.LinkedBlockingQueue; * Implements topology event queue. */ public class HealthEventQueue extends LinkedBlockingQueue<TextMessage>{ - private static volatile HealthEventQueue instance; + + private static final long serialVersionUID = 2556240855574421561L; + private static volatile HealthEventQueue instance; private HealthEventQueue(){ } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/ExecutorTaskScheduler.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/ExecutorTaskScheduler.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/ExecutorTaskScheduler.java index fe79a59..869058e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/ExecutorTaskScheduler.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/ExecutorTaskScheduler.java @@ -19,19 +19,15 @@ package org.apache.stratos.autoscaler.rule; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.autoscaler.AutoscalerContext; import org.apache.stratos.autoscaler.Constants; import org.apache.stratos.autoscaler.util.ConfUtil; -import org.apache.stratos.messaging.domain.topology.Cluster; -import org.apache.stratos.messaging.domain.topology.Service; -import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; - -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; /** * This class is responsible for scheduling the task of evaluating the current details of topology, statistics, and health http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/AutoscalerTopologyReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/AutoscalerTopologyReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/AutoscalerTopologyReceiver.java index 221daa6..9c91cf3 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/AutoscalerTopologyReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/AutoscalerTopologyReceiver.java @@ -28,7 +28,6 @@ import org.apache.stratos.autoscaler.exception.PolicyValidationException; import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator; import org.apache.stratos.autoscaler.util.AutoscalerUtil; import org.apache.stratos.messaging.domain.topology.Cluster; -import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.event.Event; import org.apache.stratos.messaging.listener.topology.ClusterCreatedEventListener; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/TopologyReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/TopologyReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/TopologyReceiver.java index 09c4a30..4809208 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/TopologyReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/processors/TopologyReceiver.java @@ -22,7 +22,6 @@ package org.apache.stratos.autoscaler.topology.processors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.TopicSubscriber; -import org.apache.stratos.messaging.message.processor.MessageProcessorChain; import org.apache.stratos.messaging.message.receiver.topology.TopologyEventMessageDelegator; import org.apache.stratos.messaging.message.receiver.topology.TopologyEventMessageReceiver; import org.apache.stratos.messaging.util.Constants; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2d175860/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java index ddc3cb5..8a5c597 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/ConfUtil.java @@ -19,22 +19,15 @@ package org.apache.stratos.autoscaler.util; -import org.apache.axiom.om.OMElement; +import java.io.File; + import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.autoscaler.Constants; -import org.apache.stratos.cloud.controller.pojo.Properties; -import org.apache.stratos.cloud.controller.pojo.Property; import org.wso2.carbon.utils.CarbonUtils; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; - -import javax.xml.namespace.QName; - /** * This class contains utility methods for read Autoscaler configuration file. */
