Organize imports and formatting
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/478c3139 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/478c3139 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/478c3139 Branch: refs/heads/master Commit: 478c3139bc1060c380dc89aa8118438fed859550 Parents: e87e7af Author: Lahiru Sandaruwan <[email protected]> Authored: Fri May 15 18:03:02 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Fri May 15 18:41:12 2015 +0530 ---------------------------------------------------------------------- .../networkpartition/NetworkPartitionAlgorithmContext.java | 2 -- .../autoscaler/context/cluster/AbstractClusterContext.java | 1 - .../stratos/autoscaler/monitor/cluster/ClusterMonitor.java | 5 ++++- .../processor/cluster/ClusterStatusActiveProcessor.java | 2 +- .../processor/cluster/ClusterStatusTerminatedProcessor.java | 2 +- .../agent/event/publisher/CartridgeAgentEventPublisher.java | 2 +- .../java/org/apache/stratos/cli/RestCommandLineService.java | 2 +- .../stratos/cli/commands/RemoveDomainMappingCommand.java | 7 +------ .../org/apache/stratos/common/beans/topology/MemberBean.java | 2 +- .../apache/stratos/common/client/AutoscalerServiceClient.java | 1 - .../receivers/LoadBalancerCommonTopologyEventReceiver.java | 4 ---- 11 files changed, 10 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java index b605d4f..fc29b22 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/NetworkPartitionAlgorithmContext.java @@ -18,8 +18,6 @@ */ package org.apache.stratos.autoscaler.algorithms.networkpartition; -import org.apache.stratos.autoscaler.pojo.policy.deployment.ApplicationPolicy; - import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java index 4a1c117..ae12c7e 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/AbstractClusterContext.java @@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.domain.instance.ClusterInstance; import java.io.Serializable; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java index 6f9cbe4..4cb2deb 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java @@ -63,7 +63,10 @@ import org.apache.stratos.messaging.domain.topology.ClusterStatus; import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.event.health.stat.*; -import org.apache.stratos.messaging.event.topology.*; +import org.apache.stratos.messaging.event.topology.MemberActivatedEvent; +import org.apache.stratos.messaging.event.topology.MemberMaintenanceModeEvent; +import org.apache.stratos.messaging.event.topology.MemberReadyToShutdownEvent; +import org.apache.stratos.messaging.event.topology.MemberTerminatedEvent; import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.drools.runtime.StatefulKnowledgeSession; import org.drools.runtime.rule.FactHandle; http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java index 5c5ce94..978f742 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusActiveProcessor.java @@ -54,7 +54,7 @@ public class ClusterStatusActiveProcessor extends ClusterStatusProcessor { return nextProcessor.process(type, clusterId, instanceId); } else { log.warn(String.format("No possible state change found for [type] %s [cluster] %s " + - "[instance] %s", type, clusterId, instanceId)); + "[instance] %s", type, clusterId, instanceId)); } } return false; http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java index 21de1e2..e6495af 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java @@ -60,7 +60,7 @@ public class ClusterStatusTerminatedProcessor extends ClusterStatusProcessor { } else { log.warn(String.format("No possible state change found for [type] %s " + - "[cluster] %s [instance] %s", type, clusterId, instanceId)); + "[cluster] %s [instance] %s", type, clusterId, instanceId)); } } return false; http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java index 07c4dbb..82c0b1a 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java @@ -69,7 +69,7 @@ public class CartridgeAgentEventPublisher { CartridgeAgentConfiguration.getInstance().getPartitionId()); /* - * + * public InstanceStartedEvent(String applicationId, String serviceName, String clusterId, String memberId, String clusterInstanceId, String networkPartitionId, String partitionId) http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java index 97eb728..3e60294 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java @@ -37,10 +37,10 @@ import org.apache.stratos.cli.utils.RowMapper; import org.apache.stratos.common.beans.TenantInfoBean; import org.apache.stratos.common.beans.UserInfoBean; import org.apache.stratos.common.beans.application.ApplicationBean; -import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean; import org.apache.stratos.common.beans.application.domain.mapping.DomainMappingBean; import org.apache.stratos.common.beans.application.signup.ApplicationSignUpBean; import org.apache.stratos.common.beans.cartridge.CartridgeBean; +import org.apache.stratos.common.beans.cartridge.CartridgeGroupBean; import org.apache.stratos.common.beans.cartridge.IaasProviderBean; import org.apache.stratos.common.beans.kubernetes.KubernetesClusterBean; import org.apache.stratos.common.beans.kubernetes.KubernetesHostBean; http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java index 6bb0437..8142b58 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java @@ -19,12 +19,7 @@ package org.apache.stratos.cli.commands; -import org.apache.commons.cli.GnuParser; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.*; import org.apache.stratos.cli.Command; import org.apache.stratos.cli.RestCommandLineService; import org.apache.stratos.cli.StratosCommandContext; http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java index 53e4d6e..95c3d97 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/MemberBean.java @@ -18,8 +18,8 @@ */ package org.apache.stratos.common.beans.topology; -import org.apache.stratos.common.beans.cartridge.PortMappingBean; import org.apache.stratos.common.beans.PropertyBean; +import org.apache.stratos.common.beans.cartridge.PortMappingBean; import javax.xml.bind.annotation.XmlRootElement; import java.util.List; http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java index ccc89d6..cbf0183 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/AutoscalerServiceClient.java @@ -29,7 +29,6 @@ import org.apache.stratos.autoscaler.stub.deployment.policy.ApplicationPolicy; import org.apache.stratos.autoscaler.stub.deployment.policy.DeploymentPolicy; import org.apache.stratos.autoscaler.stub.pojo.ApplicationContext; import org.apache.stratos.autoscaler.stub.pojo.ServiceGroup; -import org.apache.stratos.cloud.controller.stub.exception.CartridgeNotFoundException; import org.apache.stratos.common.constants.StratosConstants; import java.rmi.RemoteException; http://git-wip-us.apache.org/repos/asf/stratos/blob/478c3139/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java index 1202db2..faac524 100644 --- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java +++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java @@ -25,10 +25,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.common.domain.LoadBalancingIPType; import org.apache.stratos.load.balancer.common.topology.TopologyProvider; import org.apache.stratos.messaging.domain.topology.*; -import org.apache.stratos.messaging.domain.topology.Cluster; -import org.apache.stratos.messaging.domain.topology.Member; -import org.apache.stratos.messaging.domain.topology.Port; -import org.apache.stratos.messaging.domain.topology.Service; import org.apache.stratos.messaging.event.Event; import org.apache.stratos.messaging.event.topology.*; import org.apache.stratos.messaging.listener.topology.*;
