Messaging - Move initialized flag to TopologyManager from Topology
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a760c069 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a760c069 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a760c069 Branch: refs/heads/master Commit: a760c0694ff23a9de65bd86e35628c7674c98f2d Parents: 9770643 Author: Chamila de Alwis <[email protected]> Authored: Mon Dec 21 17:28:51 2015 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Mon Dec 21 17:28:51 2015 +0530 ---------------------------------------------------------------------- .../cartridge/agent/util/ExtensionUtils.java | 4 ++-- .../messaging/domain/topology/Topology.java | 19 +++---------------- ...plicationClustersCreatedMessageProcessor.java | 3 ++- ...plicationClustersRemovedMessageProcessor.java | 3 ++- .../topology/ClusterCreatedMessageProcessor.java | 3 ++- .../ClusterInstanceActivatedProcessor.java | 3 ++- .../ClusterInstanceCreatedMessageProcessor.java | 3 ++- .../ClusterInstanceInactivateProcessor.java | 3 ++- .../ClusterInstanceTerminatedProcessor.java | 3 ++- .../ClusterInstanceTerminatingProcessor.java | 3 ++- .../topology/ClusterRemovedMessageProcessor.java | 3 ++- .../topology/ClusterResetMessageProcessor.java | 3 ++- .../CompleteTopologyMessageProcessor.java | 5 +++-- .../MemberActivatedMessageProcessor.java | 3 ++- .../topology/MemberCreatedMessageProcessor.java | 3 ++- .../MemberInitializedMessageProcessor.java | 3 ++- .../topology/MemberMaintenanceModeProcessor.java | 3 ++- .../MemberReadyToShutdownMessageProcessor.java | 3 ++- .../topology/MemberStartedMessageProcessor.java | 3 ++- .../MemberSuspendedMessageProcessor.java | 3 ++- .../MemberTerminatedMessageProcessor.java | 3 ++- .../topology/ServiceCreatedMessageProcessor.java | 3 ++- .../topology/ServiceRemovedMessageProcessor.java | 3 ++- .../receiver/topology/TopologyManager.java | 10 ++++++++++ .../extension/FaultHandlingWindowProcessor.java | 2 +- .../extension/FaultHandlingWindowProcessor.java | 2 +- .../integration/common/TopologyHandler.java | 6 +++--- 27 files changed, 63 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java index 66612e8..58c79e9 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java @@ -94,7 +94,7 @@ public class ExtensionUtils { envParameters.put("STRATOS_LB_PUBLIC_IP", lbPublicIp); Topology topology = TopologyManager.getTopology(); - if (topology.isInitialized()) { + if (TopologyManager.isInitialized()) { Service service = topology.getService(CartridgeAgentConfiguration.getInstance().getServiceName()); Cluster cluster = service.getCluster(CartridgeAgentConfiguration.getInstance().getClusterId()); String memberIdInPayload = CartridgeAgentConfiguration.getInstance().getMemberId(); @@ -473,7 +473,7 @@ public class ExtensionUtils { public static boolean isTopologyInitialized() { TopologyManager.acquireReadLock(); - boolean active = TopologyManager.getTopology().isInitialized(); + boolean active = TopologyManager.isInitialized(); TopologyManager.releaseReadLock(); return active; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java index 9f641ec..94f9d83 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Topology.java @@ -19,8 +19,6 @@ package org.apache.stratos.messaging.domain.topology; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.domain.topology.locking.TopologyLockHierarchy; import java.io.Serializable; @@ -37,12 +35,9 @@ public class Topology implements Serializable { // Key: Service.serviceName private Map<String, Service> serviceMap; - private boolean initialized; - private static Log log = LogFactory.getLog(Topology.class); - public Topology() { - this.serviceMap = new HashMap<String, Service>(); - this.clusterMap = new HashMap<String, Cluster>(); + this.serviceMap = new HashMap<>(); + this.clusterMap = new HashMap<>(); } public Collection<Service> getServices() { @@ -92,16 +87,8 @@ public class Topology implements Serializable { this.clusterMap.clear(); } - public void setInitialized(boolean initialized) { - this.initialized = initialized; - } - - public boolean isInitialized() { - return initialized; - } - @Override public String toString() { - return "Topology [serviceMap=" + serviceMap + ", initialized=" + initialized + "]"; + return "Topology [serviceMap=" + serviceMap + "]"; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java index dcae73e..dc0e7ad 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersCreatedMessageProcessor.java @@ -29,6 +29,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; import java.util.List; @@ -50,7 +51,7 @@ public class ApplicationClustersCreatedMessageProcessor extends MessageProcessor Topology topology = (Topology) object; if (ApplicationClustersCreatedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersRemovedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersRemovedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersRemovedMessageProcessor.java index 6c7f45a..07e8134 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersRemovedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationClustersRemovedMessageProcessor.java @@ -27,6 +27,7 @@ import org.apache.stratos.messaging.domain.topology.Topology; import org.apache.stratos.messaging.event.topology.ApplicationClustersRemovedEvent; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; import java.util.Set; @@ -47,7 +48,7 @@ public class ApplicationClustersRemovedMessageProcessor extends MessageProcessor Topology topology = (Topology) object; if (ApplicationClustersRemovedEvent.class.getName().equals(type)) { - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/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 0e14bcd..2e5475f 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 @@ -29,6 +29,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class ClusterCreatedMessageProcessor extends MessageProcessor { @@ -47,7 +48,7 @@ public class ClusterCreatedMessageProcessor extends MessageProcessor { Topology topology = (Topology) object; if (ClusterCreatedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java index a1448cb..0969f7c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceActivatedProcessor.java @@ -31,6 +31,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; /** @@ -52,7 +53,7 @@ public class ClusterInstanceActivatedProcessor extends MessageProcessor { if (ClusterInstanceActivatedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java index ae84a67..d8129e2 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceCreatedMessageProcessor.java @@ -30,6 +30,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class ClusterInstanceCreatedMessageProcessor extends MessageProcessor { @@ -48,7 +49,7 @@ public class ClusterInstanceCreatedMessageProcessor extends MessageProcessor { Topology topology = (Topology) object; if (ClusterInstanceCreatedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInactivateProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInactivateProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInactivateProcessor.java index c86efe3..42f1959 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInactivateProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInactivateProcessor.java @@ -31,6 +31,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; /** @@ -52,7 +53,7 @@ public class ClusterInstanceInactivateProcessor extends MessageProcessor { if (ClusterInstanceInactivateEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatedProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatedProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatedProcessor.java index e307bd8..f581705 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatedProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatedProcessor.java @@ -31,6 +31,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; /** @@ -52,7 +53,7 @@ public class ClusterInstanceTerminatedProcessor extends MessageProcessor { if (ClusterInstanceTerminatedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java index 158d10f..bb3f921 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceTerminatingProcessor.java @@ -31,6 +31,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; /** @@ -52,7 +53,7 @@ public class ClusterInstanceTerminatingProcessor extends MessageProcessor { if (ClusterInstanceTerminatingEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java index f84cece..5099418 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterRemovedMessageProcessor.java @@ -29,6 +29,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class ClusterRemovedMessageProcessor extends MessageProcessor { @@ -47,7 +48,7 @@ public class ClusterRemovedMessageProcessor extends MessageProcessor { if (ClusterRemovedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java index dc94a2a..123bc1f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterResetMessageProcessor.java @@ -31,6 +31,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class ClusterResetMessageProcessor extends MessageProcessor { @@ -49,7 +50,7 @@ public class ClusterResetMessageProcessor extends MessageProcessor { Topology topology = (Topology) object; if (ClusterResetEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java index 6172654..c3d778a 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/CompleteTopologyMessageProcessor.java @@ -31,6 +31,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; import java.util.ArrayList; @@ -54,7 +55,7 @@ public class CompleteTopologyMessageProcessor extends MessageProcessor { // Parse complete message and build event CompleteTopologyEvent event = (CompleteTopologyEvent) MessagingUtil.jsonToObject(message, CompleteTopologyEvent.class); - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { TopologyUpdater.acquireWriteLock(); try { @@ -141,6 +142,6 @@ public class CompleteTopologyMessageProcessor extends MessageProcessor { } // Set topology initialized - topology.setInitialized(true); + TopologyManager.setInitialized(true); } } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/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 6e1d9d8..d618575 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 @@ -28,6 +28,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class MemberActivatedMessageProcessor extends MessageProcessor { @@ -46,7 +47,7 @@ public class MemberActivatedMessageProcessor extends MessageProcessor { if (MemberActivatedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberCreatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberCreatedMessageProcessor.java index d6bfd4d..4d52bc1 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberCreatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberCreatedMessageProcessor.java @@ -30,6 +30,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyClusterFilte import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class MemberCreatedMessageProcessor extends MessageProcessor { @@ -48,7 +49,7 @@ public class MemberCreatedMessageProcessor extends MessageProcessor { if (MemberCreatedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java index 82b0caa..e138341 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberInitializedMessageProcessor.java @@ -28,6 +28,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class MemberInitializedMessageProcessor extends MessageProcessor { @@ -46,7 +47,7 @@ public class MemberInitializedMessageProcessor extends MessageProcessor { if (MemberInitializedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java index f0b53ff..f57806f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberMaintenanceModeProcessor.java @@ -29,6 +29,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class MemberMaintenanceModeProcessor extends MessageProcessor { @@ -46,7 +47,7 @@ public class MemberMaintenanceModeProcessor extends MessageProcessor { if (MemberMaintenanceModeEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java index 628123f..48525fa 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberReadyToShutdownMessageProcessor.java @@ -28,6 +28,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class MemberReadyToShutdownMessageProcessor extends MessageProcessor { @@ -45,7 +46,7 @@ public class MemberReadyToShutdownMessageProcessor extends MessageProcessor { if (MemberReadyToShutdownEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/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 990d337..6ea9b16 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 @@ -28,6 +28,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class MemberStartedMessageProcessor extends MessageProcessor { @@ -46,7 +47,7 @@ public class MemberStartedMessageProcessor extends MessageProcessor { if (MemberStartedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/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 a8b3ac9..5911876 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 @@ -28,6 +28,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class MemberSuspendedMessageProcessor extends MessageProcessor { @@ -46,7 +47,7 @@ public class MemberSuspendedMessageProcessor extends MessageProcessor { if (MemberSuspendedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java index ee33269..286fbcd 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberTerminatedMessageProcessor.java @@ -31,6 +31,7 @@ import org.apache.stratos.messaging.message.filter.topology.TopologyMemberFilter import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class MemberTerminatedMessageProcessor extends MessageProcessor { @@ -49,7 +50,7 @@ public class MemberTerminatedMessageProcessor extends MessageProcessor { if (MemberTerminatedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java index 9460ea6..32a8858 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceCreatedMessageProcessor.java @@ -26,6 +26,7 @@ import org.apache.stratos.messaging.event.topology.ServiceCreatedEvent; import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class ServiceCreatedMessageProcessor extends MessageProcessor { @@ -44,7 +45,7 @@ public class ServiceCreatedMessageProcessor extends MessageProcessor { if (ServiceCreatedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) { + if (!TopologyManager.isInitialized()) { return false; } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java index 8fc3376..eea4e6d 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ServiceRemovedMessageProcessor.java @@ -26,6 +26,7 @@ import org.apache.stratos.messaging.event.topology.ServiceRemovedEvent; import org.apache.stratos.messaging.message.filter.topology.TopologyServiceFilter; import org.apache.stratos.messaging.message.processor.MessageProcessor; import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater; +import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; import org.apache.stratos.messaging.util.MessagingUtil; public class ServiceRemovedMessageProcessor extends MessageProcessor { @@ -44,7 +45,7 @@ public class ServiceRemovedMessageProcessor extends MessageProcessor { if (ServiceRemovedEvent.class.getName().equals(type)) { // Return if topology has not been initialized - if (!topology.isInitialized()) + if (!TopologyManager.isInitialized()) return false; // Parse complete message and build event http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java index 7d38620..d7a3368 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyManager.java @@ -65,6 +65,8 @@ public class TopologyManager { private static volatile TopologyLockHierarchy topologyLockHierarchy = TopologyLockHierarchy.getInstance(); + private static boolean initialized = false; + /** * Acquires read lock for the Complete Topology */ @@ -221,4 +223,12 @@ public class TopologyManager { } return topology; } + + public static void setInitialized(boolean initialized){ + TopologyManager.initialized = initialized; + } + + public static boolean isInitialized(){ + return TopologyManager.initialized; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java ---------------------------------------------------------------------- diff --git a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java index 0526f6a..8d16b33 100644 --- a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java +++ b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java @@ -176,7 +176,7 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run if (StringUtils.isEmpty(memberId)) { return null; } - if (TopologyManager.getTopology().isInitialized()) { + if (TopologyManager.isInitialized()) { try { TopologyManager.acquireReadLock(); if (TopologyManager.getTopology().getServices() == null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java ---------------------------------------------------------------------- diff --git a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java index 2fdce19..eb07dd9 100644 --- a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java +++ b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java @@ -170,7 +170,7 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run if (StringUtils.isEmpty(memberId)) { return null; } - if (TopologyManager.getTopology().isInitialized()) { + if (TopologyManager.isInitialized()) { try { TopologyManager.acquireReadLock(); if (TopologyManager.getTopology().getServices() == null) { http://git-wip-us.apache.org/repos/asf/stratos/blob/a760c069/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java index a0cc928..3af9866 100644 --- a/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java +++ b/products/stratos/modules/integration/test-common/src/main/java/org/apache/stratos/integration/common/TopologyHandler.java @@ -237,18 +237,18 @@ public class TopologyHandler { private void assertTopologyInitialized() { log.info(String.format("Asserting topology initialization within %d ms", TOPOLOGY_INIT_TIMEOUT)); long startTime = System.currentTimeMillis(); - while (!TopologyManager.getTopology().isInitialized()) { + while (!TopologyManager.isInitialized()) { log.info("Waiting for topology to be initialized..."); sleep(1000); if ((System.currentTimeMillis() - startTime) > TOPOLOGY_INIT_TIMEOUT) { break; } } - if (TopologyManager.getTopology().isInitialized()) { + if (TopologyManager.isInitialized()) { log.info(String.format("Topology initialized under %d ms", (System.currentTimeMillis() - startTime))); } assertTrue(String.format("Topology didn't get initialized within %d ms", TOPOLOGY_INIT_TIMEOUT), - TopologyManager.getTopology().isInitialized()); + TopologyManager.isInitialized()); } private void assertTenantInitialized() {
