revert the code formatting
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/545e657b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/545e657b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/545e657b Branch: refs/heads/docker-integration Commit: 545e657bb3b73b939f8e7fe0596d845a0bba293c Parents: d07c9e8 Author: gayan <[email protected]> Authored: Tue Sep 23 12:09:08 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Sep 23 18:30:17 2014 +0530 ---------------------------------------------------------------------- .../publisher/CartridgeAgentEventPublisher.java | 100 ++++++++----------- 1 file changed, 41 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/545e657b/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 938d1f7..aa6dbed 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 @@ -37,7 +37,8 @@ import org.apache.stratos.messaging.util.Util; * Cartridge agent event publisher. */ public class CartridgeAgentEventPublisher { - private static final Log log = LogFactory.getLog(CartridgeAgentEventPublisher.class); + private static final Log log = LogFactory + .getLog(CartridgeAgentEventPublisher.class); private static boolean started; private static boolean activated; private static boolean readyToShutdown; @@ -48,17 +49,16 @@ public class CartridgeAgentEventPublisher { if (log.isInfoEnabled()) { log.info("Publishing instance started event"); } - InstanceStartedEvent event = - new InstanceStartedEvent( - CartridgeAgentConfiguration.getInstance().getServiceName(), - CartridgeAgentConfiguration.getInstance().getClusterId(), - CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(), - CartridgeAgentConfiguration.getInstance().getPartitionId(), - CartridgeAgentConfiguration.getInstance().getMemberId()); - - EventPublisher eventPublisher = - EventPublisherPool.getPublisher( - Constants.INSTANCE_STATUS_TOPIC); + InstanceStartedEvent event = new InstanceStartedEvent( + CartridgeAgentConfiguration.getInstance().getServiceName(), + CartridgeAgentConfiguration.getInstance().getClusterId(), + CartridgeAgentConfiguration.getInstance() + .getNetworkPartitionId(), + CartridgeAgentConfiguration.getInstance().getPartitionId(), + CartridgeAgentConfiguration.getInstance().getMemberId()); + + EventPublisher eventPublisher = EventPublisherPool + .getPublisher(Constants.INSTANCE_STATUS_TOPIC); eventPublisher.publish(event); setStarted(true); if (log.isInfoEnabled()) { @@ -77,23 +77,17 @@ public class CartridgeAgentEventPublisher { if (log.isInfoEnabled()) { log.info("Publishing instance activated event"); } - InstanceActivatedEvent event = - new InstanceActivatedEvent( - CartridgeAgentConfiguration.getInstance() - .getServiceName(), - CartridgeAgentConfiguration.getInstance() - .getClusterId(), - CartridgeAgentConfiguration.getInstance() - .getNetworkPartitionId(), - CartridgeAgentConfiguration.getInstance() - .getPartitionId(), - CartridgeAgentConfiguration.getInstance() - .getMemberId()); + InstanceActivatedEvent event = new InstanceActivatedEvent( + CartridgeAgentConfiguration.getInstance().getServiceName(), + CartridgeAgentConfiguration.getInstance().getClusterId(), + CartridgeAgentConfiguration.getInstance() + .getNetworkPartitionId(), + CartridgeAgentConfiguration.getInstance().getPartitionId(), + CartridgeAgentConfiguration.getInstance().getMemberId()); // Event publisher connection will - EventPublisher eventPublisher = - EventPublisherPool.getPublisher( - Constants.INSTANCE_STATUS_TOPIC); + EventPublisher eventPublisher = EventPublisherPool + .getPublisher(Constants.INSTANCE_STATUS_TOPIC); eventPublisher.publish(event); if (log.isInfoEnabled()) { log.info("Instance activated event published"); @@ -120,22 +114,16 @@ public class CartridgeAgentEventPublisher { if (log.isInfoEnabled()) { log.info("Publishing instance activated event"); } - InstanceReadyToShutdownEvent event = - new InstanceReadyToShutdownEvent( - CartridgeAgentConfiguration.getInstance() - .getServiceName(), - CartridgeAgentConfiguration.getInstance() - .getClusterId(), - CartridgeAgentConfiguration.getInstance() - .getNetworkPartitionId(), - CartridgeAgentConfiguration.getInstance() - .getPartitionId(), - CartridgeAgentConfiguration.getInstance() - .getMemberId()); - - EventPublisher eventPublisher = - EventPublisherPool.getPublisher( - Util.getMessageTopicName(event)); + InstanceReadyToShutdownEvent event = new InstanceReadyToShutdownEvent( + CartridgeAgentConfiguration.getInstance().getServiceName(), + CartridgeAgentConfiguration.getInstance().getClusterId(), + CartridgeAgentConfiguration.getInstance() + .getNetworkPartitionId(), + CartridgeAgentConfiguration.getInstance().getPartitionId(), + CartridgeAgentConfiguration.getInstance().getMemberId()); + + EventPublisher eventPublisher = EventPublisherPool + .getPublisher(Util.getMessageTopicName(event)); eventPublisher.publish(event); setReadyToShutdown(true); if (log.isInfoEnabled()) { @@ -153,22 +141,16 @@ public class CartridgeAgentEventPublisher { if (log.isInfoEnabled()) { log.info("Publishing instance maintenance mode event"); } - InstanceMaintenanceModeEvent event = - new InstanceMaintenanceModeEvent( - CartridgeAgentConfiguration.getInstance() - .getServiceName(), - CartridgeAgentConfiguration.getInstance() - .getClusterId(), - CartridgeAgentConfiguration.getInstance() - .getNetworkPartitionId(), - CartridgeAgentConfiguration.getInstance() - .getPartitionId(), - CartridgeAgentConfiguration.getInstance() - .getMemberId()); - - EventPublisher eventPublisher = - EventPublisherPool.getPublisher( - Constants.INSTANCE_STATUS_TOPIC); + InstanceMaintenanceModeEvent event = new InstanceMaintenanceModeEvent( + CartridgeAgentConfiguration.getInstance().getServiceName(), + CartridgeAgentConfiguration.getInstance().getClusterId(), + CartridgeAgentConfiguration.getInstance() + .getNetworkPartitionId(), + CartridgeAgentConfiguration.getInstance().getPartitionId(), + CartridgeAgentConfiguration.getInstance().getMemberId()); + + EventPublisher eventPublisher = EventPublisherPool + .getPublisher(Constants.INSTANCE_STATUS_TOPIC); eventPublisher.publish(event); setMaintenance(true); if (log.isInfoEnabled()) {
