Optimize imports in messaging component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/661e8ad8 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/661e8ad8 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/661e8ad8 Branch: refs/heads/master Commit: 661e8ad88201cdfefc5463b7352625ba92066dcc Parents: 8d4dcd2 Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Apr 29 23:32:06 2015 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Apr 29 23:32:06 2015 +0530 ---------------------------------------------------------------------- .../messaging/broker/connect/amqp/AmqpTopicSubscriber.java | 4 +++- .../messaging/broker/connect/mqtt/MqttTopicPublisher.java | 2 +- .../apache/stratos/messaging/domain/application/Group.java | 5 ++++- .../messaging/domain/instance/ApplicationInstance.java | 2 +- .../stratos/messaging/domain/instance/ClusterInstance.java | 2 +- .../stratos/messaging/domain/instance/GroupInstance.java | 2 +- .../apache/stratos/messaging/domain/topology/Cluster.java | 2 +- .../org/apache/stratos/messaging/domain/topology/Member.java | 2 +- .../application/signup/ApplicationSignUpAddedEvent.java | 1 - .../event/instance/notifier/ArtifactUpdatedEvent.java | 2 -- .../event/instance/status/InstanceActivatedEvent.java | 2 -- .../messaging/event/tenant/TenantSubscribedEvent.java | 3 ++- .../messaging/event/topology/MemberActivatedEvent.java | 8 ++------ .../messaging/message/processor/MessageProcessor.java | 1 - .../signup/ApplicationSignUpMessageProcessorChain.java | 2 -- .../cluster/status/ClusterStatusMessageProcessorChain.java | 1 - .../instance/status/InstanceStatusMessageProcessorChain.java | 6 ------ .../processor/tenant/TenantMessageProcessorChain.java | 5 ++++- .../processor/topology/ClusterCreatedMessageProcessor.java | 4 +++- .../processor/topology/MemberActivatedMessageProcessor.java | 6 +----- .../processor/topology/MemberStartedMessageProcessor.java | 6 +----- .../processor/topology/MemberSuspendedMessageProcessor.java | 6 +----- .../cluster/status/ClusterStatusEventMessageListener.java | 2 -- .../cluster/status/ClusterStatusEventMessageQueue.java | 1 - .../health/stat/HealthStatEventMessageDelegator.java | 2 -- .../receiver/health/stat/HealthStatEventMessageQueue.java | 1 - .../instance/notifier/InstanceNotifierEventMessageQueue.java | 1 - .../instance/status/InstanceStatusEventMessageQueue.java | 1 - .../message/receiver/tenant/TenantEventMessageQueue.java | 1 - .../message/receiver/topology/TopologyEventMessageQueue.java | 1 - .../org/apache/stratos/messaging/util/MessagingUtil.java | 2 +- .../messaging/topology/locking/TopologyLockingTest.java | 2 +- 32 files changed, 29 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicSubscriber.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicSubscriber.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicSubscriber.java index 79d58a3..adc598b 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicSubscriber.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/amqp/AmqpTopicSubscriber.java @@ -28,7 +28,9 @@ import org.apache.stratos.messaging.broker.connect.TopicSubscriber; import org.apache.stratos.messaging.broker.subscribe.MessageListener; import org.apache.stratos.messaging.domain.exception.MessagingException; -import javax.jms.*; +import javax.jms.Message; +import javax.jms.Topic; +import javax.jms.TopicSession; /** * AMQP topic subscriber. http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/mqtt/MqttTopicPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/mqtt/MqttTopicPublisher.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/mqtt/MqttTopicPublisher.java index 486ea69..0c66334 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/mqtt/MqttTopicPublisher.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/broker/connect/mqtt/MqttTopicPublisher.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.connect.TopicPublisher; import org.apache.stratos.messaging.domain.exception.MessagingException; import org.apache.stratos.messaging.util.MessagingConstants; -import org.eclipse.paho.client.mqttv3.*; +import org.eclipse.paho.client.mqttv3.MqttMessage; /** * Mqtt topic connector http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Group.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Group.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Group.java index 2ba1fd5..4db77a9 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Group.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/application/Group.java @@ -21,7 +21,10 @@ package org.apache.stratos.messaging.domain.application; import org.apache.stratos.messaging.domain.instance.GroupInstance; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; +import java.util.Stack; /** * Represents a Group/nested Group in an Application/Group http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ApplicationInstance.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ApplicationInstance.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ApplicationInstance.java index a1185b0..b7d97a9 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ApplicationInstance.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ApplicationInstance.java @@ -20,8 +20,8 @@ package org.apache.stratos.messaging.domain.instance; import org.apache.stratos.messaging.domain.application.ApplicationStatus; -import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateTransitionBehavior; import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateManager; +import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateTransitionBehavior; import java.util.Stack; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java index 588d95c..eb744ca 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/ClusterInstance.java @@ -20,8 +20,8 @@ package org.apache.stratos.messaging.domain.instance; import org.apache.stratos.messaging.domain.topology.ClusterStatus; -import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateTransitionBehavior; import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateManager; +import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateTransitionBehavior; import java.util.Stack; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/GroupInstance.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/GroupInstance.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/GroupInstance.java index a1b0026..9c20fd8 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/GroupInstance.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/instance/GroupInstance.java @@ -20,8 +20,8 @@ package org.apache.stratos.messaging.domain.instance; import org.apache.stratos.messaging.domain.application.GroupStatus; -import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateTransitionBehavior; import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateManager; +import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateTransitionBehavior; import java.util.Stack; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java index f82c5a3..babf38c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java @@ -20,9 +20,9 @@ package org.apache.stratos.messaging.domain.topology; import org.apache.commons.lang.StringUtils; +import org.apache.stratos.messaging.adapters.MapAdapter; import org.apache.stratos.messaging.domain.instance.ClusterInstance; import org.apache.stratos.messaging.util.MessagingUtil; -import org.apache.stratos.messaging.adapters.MapAdapter; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java index 2c3529f..2242075 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java @@ -20,8 +20,8 @@ package org.apache.stratos.messaging.domain.topology; import org.apache.stratos.common.domain.LoadBalancingIPType; -import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateManager; import org.apache.stratos.messaging.adapters.MapAdapter; +import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateManager; import org.apache.stratos.messaging.domain.topology.lifecycle.LifeCycleStateTransitionBehavior; import javax.xml.bind.annotation.XmlRootElement; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/application/signup/ApplicationSignUpAddedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/application/signup/ApplicationSignUpAddedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/application/signup/ApplicationSignUpAddedEvent.java index 543dd11..fec2b2e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/application/signup/ApplicationSignUpAddedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/application/signup/ApplicationSignUpAddedEvent.java @@ -19,7 +19,6 @@ package org.apache.stratos.messaging.event.application.signup; -import org.apache.stratos.messaging.domain.application.signup.ArtifactRepository; import org.apache.stratos.messaging.event.Event; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/ArtifactUpdatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/ArtifactUpdatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/ArtifactUpdatedEvent.java index fea2558..32e3153 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/ArtifactUpdatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/notifier/ArtifactUpdatedEvent.java @@ -18,8 +18,6 @@ */ package org.apache.stratos.messaging.event.instance.notifier; -import org.apache.stratos.messaging.event.tenant.TenantEvent; - import java.io.Serializable; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java index 3207a04..58c731a 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java @@ -19,8 +19,6 @@ package org.apache.stratos.messaging.event.instance.status; -import org.apache.stratos.messaging.event.topology.TopologyEvent; - import java.io.Serializable; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/TenantSubscribedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/TenantSubscribedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/TenantSubscribedEvent.java index d89de12..3947738 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/TenantSubscribedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/tenant/TenantSubscribedEvent.java @@ -20,7 +20,8 @@ package org.apache.stratos.messaging.event.tenant; import java.io.Serializable; -import java.util.*; +import java.util.Collections; +import java.util.Set; /** * This event is fired when a tenant is subscribed to a service. http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java index a14cd51..05c0ca8 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java @@ -19,14 +19,10 @@ package org.apache.stratos.messaging.event.topology; -import java.io.Serializable; -import java.util.*; - import org.apache.stratos.messaging.domain.topology.Port; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; +import java.io.Serializable; +import java.util.*; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/MessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/MessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/MessageProcessor.java index e44bcaf..64078d4 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/MessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/MessageProcessor.java @@ -19,7 +19,6 @@ package org.apache.stratos.messaging.message.processor; -import org.apache.stratos.messaging.domain.topology.Topology; import org.apache.stratos.messaging.event.EventObservable; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/signup/ApplicationSignUpMessageProcessorChain.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/signup/ApplicationSignUpMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/signup/ApplicationSignUpMessageProcessorChain.java index 85be672..c1a63f7 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/signup/ApplicationSignUpMessageProcessorChain.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/signup/ApplicationSignUpMessageProcessorChain.java @@ -25,8 +25,6 @@ import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.listener.application.signup.ApplicationSignUpAddedEventListener; import org.apache.stratos.messaging.listener.application.signup.ApplicationSignUpRemovedEventListener; import org.apache.stratos.messaging.listener.application.signup.CompleteApplicationSignUpsEventListener; -import org.apache.stratos.messaging.listener.domain.mapping.DomainMappingAddedEventListener; -import org.apache.stratos.messaging.listener.domain.mapping.DomainMappingRemovedEventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusMessageProcessorChain.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusMessageProcessorChain.java index eabb620..720dcee 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusMessageProcessorChain.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/cluster/status/ClusterStatusMessageProcessorChain.java @@ -20,7 +20,6 @@ package org.apache.stratos.messaging.message.processor.cluster.status; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.messaging.event.cluster.status.ClusterStatusClusterCreatedEvent; import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.listener.cluster.status.*; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/status/InstanceStatusMessageProcessorChain.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/status/InstanceStatusMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/status/InstanceStatusMessageProcessorChain.java index 8b493b8..8e6a7de 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/status/InstanceStatusMessageProcessorChain.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/instance/status/InstanceStatusMessageProcessorChain.java @@ -22,17 +22,11 @@ package org.apache.stratos.messaging.message.processor.instance.status; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.listener.instance.notifier.ArtifactUpdateEventListener; -import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupClusterEventListener; -import org.apache.stratos.messaging.listener.instance.notifier.InstanceCleanupMemberEventListener; import org.apache.stratos.messaging.listener.instance.status.InstanceActivatedEventListener; import org.apache.stratos.messaging.listener.instance.status.InstanceMaintenanceListener; import org.apache.stratos.messaging.listener.instance.status.InstanceReadyToShutdownEventListener; import org.apache.stratos.messaging.listener.instance.status.InstanceStartedEventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; -import org.apache.stratos.messaging.message.processor.instance.notifier.ArtifactUpdateMessageProcessor; -import org.apache.stratos.messaging.message.processor.instance.notifier.InstanceCleanupClusterNotifierMessageProcessor; -import org.apache.stratos.messaging.message.processor.instance.notifier.InstanceCleanupMemberNotifierMessageProcessor; /** * Defines default instance notifier message processor chain. http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java index 0382f4e..53c6085 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/tenant/TenantMessageProcessorChain.java @@ -22,7 +22,10 @@ package org.apache.stratos.messaging.message.processor.tenant; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.listener.tenant.*; +import org.apache.stratos.messaging.listener.tenant.CompleteTenantEventListener; +import org.apache.stratos.messaging.listener.tenant.TenantCreatedEventListener; +import org.apache.stratos.messaging.listener.tenant.TenantRemovedEventListener; +import org.apache.stratos.messaging.listener.tenant.TenantUpdatedEventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java index 8a083cc..036fe19 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterCreatedMessageProcessor.java @@ -20,7 +20,9 @@ package org.apache.stratos.messaging.message.processor.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.messaging.domain.topology.*; +import org.apache.stratos.messaging.domain.topology.Cluster; +import org.apache.stratos.messaging.domain.topology.Service; +import org.apache.stratos.messaging.domain.topology.Topology; import org.apache.stratos.messaging.event.topology.ClusterCreatedEvent; import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilter; import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java index cb83343..99ca9b8 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java @@ -20,11 +20,7 @@ package org.apache.stratos.messaging.message.processor.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.messaging.domain.topology.Cluster; -import org.apache.stratos.messaging.domain.topology.Member; -import org.apache.stratos.messaging.domain.topology.MemberStatus; -import org.apache.stratos.messaging.domain.topology.Service; -import org.apache.stratos.messaging.domain.topology.Topology; +import org.apache.stratos.messaging.domain.topology.*; import org.apache.stratos.messaging.event.topology.MemberActivatedEvent; import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilter; import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java index 20e44f2..51345e9 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberStartedMessageProcessor.java @@ -20,11 +20,7 @@ package org.apache.stratos.messaging.message.processor.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.messaging.domain.topology.Cluster; -import org.apache.stratos.messaging.domain.topology.Member; -import org.apache.stratos.messaging.domain.topology.MemberStatus; -import org.apache.stratos.messaging.domain.topology.Service; -import org.apache.stratos.messaging.domain.topology.Topology; +import org.apache.stratos.messaging.domain.topology.*; import org.apache.stratos.messaging.event.topology.MemberStartedEvent; import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilter; import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java index 4e0021a..da56970 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberSuspendedMessageProcessor.java @@ -20,11 +20,7 @@ package org.apache.stratos.messaging.message.processor.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.messaging.domain.topology.Cluster; -import org.apache.stratos.messaging.domain.topology.Member; -import org.apache.stratos.messaging.domain.topology.MemberStatus; -import org.apache.stratos.messaging.domain.topology.Service; -import org.apache.stratos.messaging.domain.topology.Topology; +import org.apache.stratos.messaging.domain.topology.*; import org.apache.stratos.messaging.event.topology.MemberSuspendedEvent; import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilter; import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java index 8df6277..2abfc71 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageListener.java @@ -24,8 +24,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.broker.subscribe.MessageListener; import org.apache.stratos.messaging.domain.Message; -import javax.jms.JMSException; - /** * Implements functionality for receiving text based event messages from the * instance notifier http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageQueue.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageQueue.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageQueue.java index 4441a54..a0f2878 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageQueue.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventMessageQueue.java @@ -21,7 +21,6 @@ package org.apache.stratos.messaging.message.receiver.cluster.status; import org.apache.stratos.messaging.domain.Message; -import javax.jms.TextMessage; import java.util.concurrent.LinkedBlockingQueue; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageDelegator.java index 58f5a76..2cde2a9 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageDelegator.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageDelegator.java @@ -26,8 +26,6 @@ import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; import org.apache.stratos.messaging.message.processor.health.stat.HealthStatMessageProcessorChain; -import javax.jms.TextMessage; - /** * Implements logic for processing health stat event messages based on a given http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageQueue.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageQueue.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageQueue.java index 7ed9b09..387c614 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageQueue.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageQueue.java @@ -22,7 +22,6 @@ package org.apache.stratos.messaging.message.receiver.health.stat; import org.apache.stratos.messaging.domain.Message; -import javax.jms.TextMessage; import java.util.concurrent.LinkedBlockingQueue; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageQueue.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageQueue.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageQueue.java index e22edf8..bd23400 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageQueue.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageQueue.java @@ -21,7 +21,6 @@ package org.apache.stratos.messaging.message.receiver.instance.notifier; import org.apache.stratos.messaging.domain.Message; -import javax.jms.TextMessage; import java.util.concurrent.LinkedBlockingQueue; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageQueue.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageQueue.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageQueue.java index 1e67815..93802a4 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageQueue.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventMessageQueue.java @@ -21,7 +21,6 @@ package org.apache.stratos.messaging.message.receiver.instance.status; import org.apache.stratos.messaging.domain.Message; -import javax.jms.TextMessage; import java.util.concurrent.LinkedBlockingQueue; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageQueue.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageQueue.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageQueue.java index 112473b..f0788e2 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageQueue.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageQueue.java @@ -21,7 +21,6 @@ package org.apache.stratos.messaging.message.receiver.tenant; import org.apache.stratos.messaging.domain.Message; -import javax.jms.TextMessage; import java.util.concurrent.LinkedBlockingQueue; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageQueue.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageQueue.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageQueue.java index 1e6b8fa..59d2871 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageQueue.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventMessageQueue.java @@ -21,7 +21,6 @@ package org.apache.stratos.messaging.message.receiver.topology; import org.apache.stratos.messaging.domain.Message; -import javax.jms.TextMessage; import java.util.concurrent.LinkedBlockingQueue; /** http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/MessagingUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/MessagingUtil.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/MessagingUtil.java index 158950f..c4bfb9d 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/MessagingUtil.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/MessagingUtil.java @@ -19,11 +19,11 @@ package org.apache.stratos.messaging.util; import com.google.gson.Gson; +import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.event.Event; import org.apache.stratos.messaging.message.JsonMessage; -import org.apache.commons.lang.math.NumberUtils; import java.io.File; import java.io.FileInputStream; http://git-wip-us.apache.org/repos/asf/stratos/blob/661e8ad8/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/topology/locking/TopologyLockingTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/topology/locking/TopologyLockingTest.java b/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/topology/locking/TopologyLockingTest.java index a3c6950..2fd3cfc 100644 --- a/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/topology/locking/TopologyLockingTest.java +++ b/components/org.apache.stratos.messaging/src/test/java/org/apache/stratos/messaging/topology/locking/TopologyLockingTest.java @@ -19,7 +19,7 @@ package org.apache.stratos.messaging.topology.locking; -import org.apache.stratos.messaging.domain.topology.*; +import org.apache.stratos.messaging.domain.topology.Topology; public class TopologyLockingTest {
