You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/03/19 06:40:29 UTC
[2/6] stratos git commit: Format org.apache.stratos.messaging
component code according to coding standards
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/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 75dfa68..067d729 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
@@ -29,7 +29,7 @@ import org.apache.stratos.messaging.message.processor.MessageProcessor;
import org.apache.stratos.messaging.message.processor.topology.updater.TopologyUpdater;
import org.apache.stratos.messaging.util.MessagingUtil;
-public class MemberReadyToShutdownMessageProcessor extends MessageProcessor{
+public class MemberReadyToShutdownMessageProcessor extends MessageProcessor {
private static final Log log = LogFactory.getLog(MemberReadyToShutdownMessageProcessor.class);
private MessageProcessor nextProcessor;
@@ -49,7 +49,7 @@ public class MemberReadyToShutdownMessageProcessor extends MessageProcessor{
// Parse complete message and build event
MemberReadyToShutdownEvent event = (MemberReadyToShutdownEvent) MessagingUtil.
- jsonToObject(message, MemberReadyToShutdownEvent.class);
+ jsonToObject(message, MemberReadyToShutdownEvent.class);
TopologyUpdater.acquireWriteLockForCluster(event.getServiceName(), event.getClusterId());
try {
@@ -69,18 +69,18 @@ public class MemberReadyToShutdownMessageProcessor extends MessageProcessor{
}
}
- private boolean doProcess (MemberReadyToShutdownEvent event,Topology topology) {
+ private boolean doProcess(MemberReadyToShutdownEvent event, Topology topology) {
String serviceName = event.getServiceName();
String clusterId = event.getClusterId();
// Apply service filter
- if(TopologyServiceFilter.apply(serviceName)) {
+ if (TopologyServiceFilter.apply(serviceName)) {
return false;
}
// Apply cluster filter
- if(TopologyClusterFilter.apply(clusterId)) {
+ if (TopologyClusterFilter.apply(clusterId)) {
return false;
}
@@ -113,14 +113,14 @@ public class MemberReadyToShutdownMessageProcessor extends MessageProcessor{
}
// Apply member filter
- if(TopologyMemberFilter.apply(member.getLbClusterId(), member.getNetworkPartitionId())) {
+ if (TopologyMemberFilter.apply(member.getLbClusterId(), member.getNetworkPartitionId())) {
return false;
}
if (member.getStatus() == MemberStatus.ReadyToShutDown) {
if (log.isDebugEnabled()) {
log.debug(String.format("Member already updated as Ready to Shutdown: " +
- "[service] %s [cluster] %s [member] %s",
+ "[service] %s [cluster] %s [member] %s",
event.getServiceName(),
event.getClusterId(),
event.getMemberId()));
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/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 a2e16d2..20e44f2 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
@@ -73,18 +73,18 @@ public class MemberStartedMessageProcessor extends MessageProcessor {
}
}
- private boolean doProcess (MemberStartedEvent event,Topology topology) {
+ private boolean doProcess(MemberStartedEvent event, Topology topology) {
String serviceName = event.getServiceName();
String clusterId = event.getClusterId();
// Apply service filter
- if(TopologyServiceFilter.apply(serviceName)) {
+ if (TopologyServiceFilter.apply(serviceName)) {
return false;
}
// Apply cluster filter
- if(TopologyClusterFilter.apply(clusterId)) {
+ if (TopologyClusterFilter.apply(clusterId)) {
return false;
}
@@ -117,7 +117,7 @@ public class MemberStartedMessageProcessor extends MessageProcessor {
}
// Apply member filter
- if(TopologyMemberFilter.apply(member.getLbClusterId(), member.getNetworkPartitionId())) {
+ if (TopologyMemberFilter.apply(member.getLbClusterId(), member.getNetworkPartitionId())) {
return false;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/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 a01441a..4e0021a 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
@@ -73,19 +73,19 @@ public class MemberSuspendedMessageProcessor extends MessageProcessor {
}
}
- private boolean doProcess (MemberSuspendedEvent event,Topology topology) {
+ private boolean doProcess(MemberSuspendedEvent event, Topology topology) {
String serviceName = event.getServiceName();
String clusterId = event.getClusterId();
String networkPartitionId = event.getNetworkPartitionId();
// Apply service filter
- if(TopologyServiceFilter.apply(serviceName)) {
+ if (TopologyServiceFilter.apply(serviceName)) {
return false;
}
// Apply cluster filter
- if(TopologyClusterFilter.apply(clusterId)) {
+ if (TopologyClusterFilter.apply(clusterId)) {
return false;
}
@@ -118,7 +118,7 @@ public class MemberSuspendedMessageProcessor extends MessageProcessor {
}
// Apply member filter
- if(TopologyMemberFilter.apply(member.getLbClusterId(), networkPartitionId)) {
+ if (TopologyMemberFilter.apply(member.getLbClusterId(), networkPartitionId)) {
return false;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/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 4ac7bb4..468be6e 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
@@ -72,18 +72,18 @@ public class MemberTerminatedMessageProcessor extends MessageProcessor {
}
}
- private boolean doProcess (MemberTerminatedEvent event,Topology topology) {
+ private boolean doProcess(MemberTerminatedEvent event, Topology topology) {
String serviceName = event.getServiceName();
String clusterId = event.getClusterId();
// Apply service filter
- if(TopologyServiceFilter.apply(serviceName)) {
+ if (TopologyServiceFilter.apply(serviceName)) {
return false;
}
// Apply cluster filter
- if(TopologyClusterFilter.apply(clusterId)) {
+ if (TopologyClusterFilter.apply(clusterId)) {
return false;
}
@@ -103,9 +103,9 @@ public class MemberTerminatedMessageProcessor extends MessageProcessor {
return false;
}
Member member = cluster.getMember(event.getMemberId());
- if(member != null) {
+ if (member != null) {
// Apply member filter
- if(TopologyMemberFilter.apply(member.getLbClusterId(), member.getNetworkPartitionId())) {
+ if (TopologyMemberFilter.apply(member.getLbClusterId(), member.getNetworkPartitionId())) {
return false;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/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 c81a12e..9460ea6 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
@@ -69,12 +69,12 @@ public class ServiceCreatedMessageProcessor extends MessageProcessor {
}
}
- private boolean doProcess (ServiceCreatedEvent event, Topology topology) {
+ private boolean doProcess(ServiceCreatedEvent event, Topology topology) {
String serviceName = event.getServiceName();
// Apply service filter
- if(TopologyServiceFilter.apply(serviceName)) {
+ if (TopologyServiceFilter.apply(serviceName)) {
return false;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/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 5a95da8..8fc3376 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
@@ -68,12 +68,12 @@ public class ServiceRemovedMessageProcessor extends MessageProcessor {
}
}
- private boolean doProcess (ServiceRemovedEvent event, Topology topology) {
+ private boolean doProcess(ServiceRemovedEvent event, Topology topology) {
String serviceName = event.getServiceName();
// Apply service filter
- if(TopologyServiceFilter.apply(serviceName)) {
+ if (TopologyServiceFilter.apply(serviceName)) {
return false;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
index 9f8c77c..a026a50 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
@@ -141,15 +141,15 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain {
clusterRemovedMessageProcessor.addEventListener(eventListener);
} else if (eventListener instanceof ClusterInstanceCreatedEventListener) {
clusterInstanceCreatedMessageProcessor.addEventListener(eventListener);
- } else if(eventListener instanceof ClusterInstanceTerminatedEventListener){
+ } else if (eventListener instanceof ClusterInstanceTerminatedEventListener) {
clusterTerminatedProcessor.addEventListener(eventListener);
- } else if(eventListener instanceof ClusterResetEventListener){
+ } else if (eventListener instanceof ClusterResetEventListener) {
clusterResetMessageProcessor.addEventListener(eventListener);
- } else if(eventListener instanceof ClusterInstanceTerminatingEventListener){
+ } else if (eventListener instanceof ClusterInstanceTerminatingEventListener) {
clusterTerminatingProcessor.addEventListener(eventListener);
} else if (eventListener instanceof MemberCreatedEventListener) {
memberCreatedMessageProcessor.addEventListener(eventListener);
- } else if (eventListener instanceof MemberInitializedEventListener) {
+ } else if (eventListener instanceof MemberInitializedEventListener) {
memberInitializedMessageProcessor.addEventListener(eventListener);
} else if (eventListener instanceof MemberActivatedEventListener) {
memberActivatedMessageProcessor.addEventListener(eventListener);
@@ -165,7 +165,7 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain {
serviceCreatedMessageProcessor.addEventListener(eventListener);
} else if (eventListener instanceof ServiceRemovedEventListener) {
serviceRemovedMessageProcessor.addEventListener(eventListener);
- } else if (eventListener instanceof MemberMaintenanceListener) {
+ } else if (eventListener instanceof MemberMaintenanceListener) {
memberMaintenanceModeProcessor.addEventListener(eventListener);
} else {
throw new RuntimeException("Unknown event listener");
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java
index bfbbc17..a112645 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/updater/TopologyUpdater.java
@@ -27,32 +27,32 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
/**
* Used to lock the Topology for writes by messaging component
- *
- * Acquire a write lock:
- *
- * From root level, acquire read lock, and acquire a write lock only for the
- * relevant sub tree.
- *
- * Example 1: Acquiring write lock for a Cluster to modify the Cluster object -
- * acquiring:
- * public static void acquireWriteLockForCluster (String serviceName, String clusterId)
- *
- * releasing:
- * public static void releaseWriteLockForCluster (String serviceName, String clusterId)
- *
- * Example 2: Acquiring write lock to add a new Cluster object -
- * acquiring:
- * public static void acquireWriteLockForService (String serviceName)
- *
- * releasing:
- * public static void releaseWriteLockForService (String serviceName)
- *
- * Example 3: Acquiring the write lock to add a deploy a Cartridge (add a new Service)
- * acquire:
- * public static void acquireWriteLockForServices()
- *
- * release:
- * public static void releaseWriteLockForServices()
+ * <p/>
+ * Acquire a write lock:
+ * <p/>
+ * From root level, acquire read lock, and acquire a write lock only for the
+ * relevant sub tree.
+ * <p/>
+ * Example 1: Acquiring write lock for a Cluster to modify the Cluster object -
+ * acquiring:
+ * public static void acquireWriteLockForCluster (String serviceName, String clusterId)
+ * <p/>
+ * releasing:
+ * public static void releaseWriteLockForCluster (String serviceName, String clusterId)
+ * <p/>
+ * Example 2: Acquiring write lock to add a new Cluster object -
+ * acquiring:
+ * public static void acquireWriteLockForService (String serviceName)
+ * <p/>
+ * releasing:
+ * public static void releaseWriteLockForService (String serviceName)
+ * <p/>
+ * Example 3: Acquiring the write lock to add a deploy a Cartridge (add a new Service)
+ * acquire:
+ * public static void acquireWriteLockForServices()
+ * <p/>
+ * release:
+ * public static void releaseWriteLockForServices()
*/
public class TopologyUpdater {
@@ -67,7 +67,7 @@ public class TopologyUpdater {
* Acquires write lock for the Complete Topology
*/
public static void acquireWriteLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock acquired for Topology");
}
topologyLockHierarchy.getCompleteTopologyLock().acquireWriteLock();
@@ -77,18 +77,19 @@ public class TopologyUpdater {
* Releases write lock for the Complete Topology
*/
public static void releaseWriteLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock released for Topology");
}
topologyLockHierarchy.getCompleteTopologyLock().releaseWriteLock();
}
// Service write locks
+
/**
* Acquires write lock for the all Services
*/
public static void acquireWriteLockForServices() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock acquired for Services");
}
topologyLockHierarchy.getServiceLock().acquireWriteLock();
@@ -98,7 +99,7 @@ public class TopologyUpdater {
* Releases write lock for the all Services
*/
public static void releaseWriteLockForServices() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock released for Services");
}
topologyLockHierarchy.getServiceLock().releaseWriteLock();
@@ -109,7 +110,7 @@ public class TopologyUpdater {
*
* @param serviceName service name to acquire write lock
*/
- public static void acquireWriteLockForService (String serviceName) {
+ public static void acquireWriteLockForService(String serviceName) {
// acquire read lock for all Applications
TopologyManager.acquireReadLockForServices();
@@ -120,7 +121,7 @@ public class TopologyUpdater {
} else {
topologyServiceLock.acquireWriteLock();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock acquired for Service " + serviceName);
}
}
@@ -131,7 +132,7 @@ public class TopologyUpdater {
*
* @param serviceName service name to release write lock
*/
- public static void releaseWriteLockForService (String serviceName) {
+ public static void releaseWriteLockForService(String serviceName) {
TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName);
if (topologyServiceLock == null) {
@@ -139,7 +140,7 @@ public class TopologyUpdater {
} else {
topologyServiceLock.releaseWriteLock();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock released for Service " + serviceName);
}
}
@@ -150,13 +151,13 @@ public class TopologyUpdater {
/**
* Acquires write lock for a Cluster. This will acquire the write lock in the following order
- * 1. for the Service
- * 2. for the Cluster
+ * 1. for the Service
+ * 2. for the Cluster
*
* @param serviceName service name to acquire write lock
- * @param clusterId cluster id to acquire write lock
+ * @param clusterId cluster id to acquire write lock
*/
- public static void acquireWriteLockForCluster (String serviceName, String clusterId) {
+ public static void acquireWriteLockForCluster(String serviceName, String clusterId) {
// acquire read lock for the relevant Services
TopologyManager.acquireReadLockForService(serviceName);
@@ -167,7 +168,7 @@ public class TopologyUpdater {
} else {
topologyClusterLock.acquireWriteLock();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock acquired for Cluster " + clusterId);
}
}
@@ -175,13 +176,13 @@ public class TopologyUpdater {
/**
* Releases write lock for a Cluster. This will release the write lock in the following order
- * 1. for the Cluster
- * 2. for the Service
+ * 1. for the Cluster
+ * 2. for the Service
*
* @param serviceName service name to release write lock
- * @param clusterId cluster id to release write lock
+ * @param clusterId cluster id to release write lock
*/
- public static void releaseWriteLockForCluster (String serviceName, String clusterId) {
+ public static void releaseWriteLockForCluster(String serviceName, String clusterId) {
TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId);
if (topologyClusterLock == null) {
@@ -189,7 +190,7 @@ public class TopologyUpdater {
} else {
topologyClusterLock.releaseWriteLock();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock released for Cluster " + clusterId);
}
}
@@ -198,7 +199,7 @@ public class TopologyUpdater {
TopologyManager.releaseReadLockForService(serviceName);
}
- private static void handleLockNotFound (String errorMsg) {
+ private static void handleLockNotFound(String errorMsg) {
log.warn(errorMsg);
//throw new RuntimeException(errorMsg);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationManager.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationManager.java
index 42021ba..1b9cd06 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationManager.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationManager.java
@@ -33,13 +33,13 @@ public class ApplicationManager {
private static volatile ApplicationLockHierarchy applicationLockHierarchy =
ApplicationLockHierarchy.getInstance();
- public static Applications getApplications () {
+ public static Applications getApplications() {
if (applications == null) {
- synchronized (ApplicationManager.class){
+ synchronized (ApplicationManager.class) {
if (applications == null) {
applications = new Applications();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Applications object created");
}
}
@@ -52,7 +52,7 @@ public class ApplicationManager {
* Acquires read lock for all Applications
*/
public static synchronized void acquireReadLockForApplications() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock acquired for applications");
}
applicationLockHierarchy.getApplicationLock().acquireReadLock();
@@ -62,7 +62,7 @@ public class ApplicationManager {
* Releases read lock for all Applications
*/
public static synchronized void releaseReadLockForApplications() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock released for applications");
}
applicationLockHierarchy.getApplicationLock().releaseReadLock();
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventMessageDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventMessageDelegator.java
index fa2f6e9..29e57cc 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventMessageDelegator.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventMessageDelegator.java
@@ -54,7 +54,7 @@ public class ApplicationsEventMessageDelegator implements Runnable {
String type = message.getEventClassName();
// Skip application signup events
- if(!type.startsWith("org.apache.stratos.messaging.event.application.signup")) {
+ if (!type.startsWith("org.apache.stratos.messaging.event.application.signup")) {
// Retrieve the actual message
String json = message.getText();
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
index 771546c..6b9085f 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java
@@ -33,7 +33,7 @@ public class ApplicationsEventReceiver {
private ApplicationsEventMessageListener messageListener;
private EventSubscriber eventSubscriber;
private boolean terminated;
- private ExecutorService executorService;
+ private ExecutorService executorService;
public ApplicationsEventReceiver() {
ApplicationsEventMessageQueue messageQueue = new ApplicationsEventMessageQueue();
@@ -50,14 +50,14 @@ public class ApplicationsEventReceiver {
try {
// Start topic subscriber thread
eventSubscriber = new EventSubscriber(MessagingUtil.Topics.APPLICATION_TOPIC.getTopicName(), messageListener);
- executorService.execute(eventSubscriber);
+ executorService.execute(eventSubscriber);
if (log.isDebugEnabled()) {
log.debug("Application status event message receiver thread started");
}
// Start Application status event message delegator thread
- executorService.execute(messageDelegator);
+ executorService.execute(messageDelegator);
if (log.isDebugEnabled()) {
log.debug("Application status event message delegator thread started");
@@ -77,11 +77,11 @@ public class ApplicationsEventReceiver {
terminated = true;
}
- public ExecutorService getExecutorService() {
- return executorService;
- }
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
+ public void setExecutorService(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpManager.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpManager.java
index beb40c7..fadbc0b 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpManager.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpManager.java
@@ -48,28 +48,28 @@ public class ApplicationSignUpManager {
}
public static void acquireReadLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock acquired");
}
lock.acquireReadLock();
}
public static void releaseReadLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock released");
}
lock.releaseReadLock();
}
public static void acquireWriteLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock acquired");
}
lock.acquireWriteLock();
}
public static void releaseWriteLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock released");
}
lock.releaseWriteLock();
@@ -77,10 +77,10 @@ public class ApplicationSignUpManager {
public static ApplicationSignUpManager getInstance() {
if (instance == null) {
- synchronized (ApplicationSignUpManager.class){
+ synchronized (ApplicationSignUpManager.class) {
if (instance == null) {
instance = new ApplicationSignUpManager();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Application signup manager instance created");
}
}
@@ -92,20 +92,20 @@ public class ApplicationSignUpManager {
public void addApplicationSignUp(ApplicationSignUp applicationSignUp) {
String applicationId = applicationSignUp.getApplicationId();
Map<Integer, ApplicationSignUp> applicationSignUpMap = applicationIdToApplicationSignUpsMap.get(applicationId);
- if(applicationSignUpMap == null) {
+ if (applicationSignUpMap == null) {
applicationSignUpMap = new HashMap<Integer, ApplicationSignUp>();
applicationIdToApplicationSignUpsMap.put(applicationId, applicationSignUpMap);
}
int tenantId = applicationSignUp.getTenantId();
- if(applicationSignUpMap.get(tenantId) == null) {
+ if (applicationSignUpMap.get(tenantId) == null) {
applicationSignUpMap.put(tenantId, applicationSignUp);
}
}
public Collection<ApplicationSignUp> getApplicationSignUps(String applicationId) {
Map<Integer, ApplicationSignUp> applicationSignUpMap = applicationIdToApplicationSignUpsMap.get(applicationId);
- if(applicationSignUpMap != null) {
+ if (applicationSignUpMap != null) {
return applicationSignUpMap.values();
}
return null;
@@ -113,8 +113,8 @@ public class ApplicationSignUpManager {
public ApplicationSignUp getApplicationSignUp(String applicationId, int tenantId) {
Map<Integer, ApplicationSignUp> applicationSignUpMap = applicationIdToApplicationSignUpsMap.get(applicationId);
- if(applicationSignUpMap != null) {
- if(applicationSignUpMap.containsKey(tenantId)) {
+ if (applicationSignUpMap != null) {
+ if (applicationSignUpMap.containsKey(tenantId)) {
return applicationSignUpMap.get(tenantId);
}
}
@@ -123,8 +123,8 @@ public class ApplicationSignUpManager {
public void removeApplicationSignUp(String applicationId, int tenantId) {
Map<Integer, ApplicationSignUp> applicationSignUpMap = applicationIdToApplicationSignUpsMap.get(applicationId);
- if(applicationSignUpMap != null) {
- if(applicationSignUpMap.containsKey(tenantId)) {
+ if (applicationSignUpMap != null) {
+ if (applicationSignUpMap.containsKey(tenantId)) {
applicationSignUpMap.remove(tenantId);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
index 39e7214..119cf49 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java
@@ -30,13 +30,13 @@ import java.util.concurrent.ExecutorService;
/**
* A thread for receiving instance notifier information from message broker.
*/
-public class ClusterStatusEventReceiver{
+public class ClusterStatusEventReceiver {
private static final Log log = LogFactory.getLog(ClusterStatusEventReceiver.class);
private final ClusterStatusEventMessageDelegator messageDelegator;
private final ClusterStatusEventMessageListener messageListener;
private EventSubscriber eventSubscriber;
private boolean terminated;
- private ExecutorService executorService;
+ private ExecutorService executorService;
public ClusterStatusEventReceiver() {
ClusterStatusEventMessageQueue messageQueue = new ClusterStatusEventMessageQueue();
@@ -60,7 +60,7 @@ public class ClusterStatusEventReceiver{
}
// Start instance notifier event message delegator thread
- executorService.execute(messageDelegator);
+ executorService.execute(messageDelegator);
if (log.isDebugEnabled()) {
log.debug("InstanceNotifier event message delegator thread started");
}
@@ -83,11 +83,11 @@ public class ClusterStatusEventReceiver{
terminated = true;
}
- public ExecutorService getExecutorService() {
- return executorService;
- }
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
+ public void setExecutorService(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageDelegator.java
index 3ebff1a..fa783a9 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageDelegator.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageDelegator.java
@@ -63,7 +63,7 @@ class DomainMappingEventMessageDelegator implements Runnable {
if (log.isDebugEnabled()) {
log.debug(String.format("Domain mapping event message received from queue: [event-class-name] %s " +
- "[message-queue] %s", type, messageQueue.getClass()));
+ "[message-queue] %s", type, messageQueue.getClass()));
}
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageQueue.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageQueue.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageQueue.java
index fb37429..24d9913 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageQueue.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventMessageQueue.java
@@ -20,6 +20,7 @@
package org.apache.stratos.messaging.message.receiver.domain.mapping;
import org.apache.stratos.messaging.domain.Message;
+
import java.util.concurrent.LinkedBlockingQueue;
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingManager.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingManager.java
index 23f3c3b..71e99c0 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingManager.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingManager.java
@@ -40,28 +40,28 @@ public class DomainMappingManager {
private boolean initialized;
public static void acquireReadLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock acquired");
}
lock.acquireReadLock();
}
public static void releaseReadLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock released");
}
lock.releaseReadLock();
}
public static void acquireWriteLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock acquired");
}
lock.acquireWriteLock();
}
public static void releaseWriteLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock released");
}
lock.releaseWriteLock();
@@ -69,10 +69,10 @@ public class DomainMappingManager {
public static DomainMappingManager getInstance() {
if (instance == null) {
- synchronized (DomainMappingManager.class){
+ synchronized (DomainMappingManager.class) {
if (instance == null) {
instance = new DomainMappingManager();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Domain mapping manager instance created");
}
}
@@ -87,21 +87,23 @@ public class DomainMappingManager {
/**
* Add domain mappings
+ *
* @param domainMappings
*/
public void addDomainMappings(List<DomainMapping> domainMappings) {
- for(DomainMapping domainMapping : domainMappings) {
+ for (DomainMapping domainMapping : domainMappings) {
addDomainMapping(domainMapping);
}
}
/**
* Add domain mapping.
+ *
* @param domainMapping
*/
public void addDomainMapping(DomainMapping domainMapping) {
List<DomainMapping> domainMappings = getDomainMappings(domainMapping.getClusterId());
- if(domainMappings == null) {
+ if (domainMappings == null) {
domainMappings = new ArrayList<DomainMapping>();
clusterIdToDomainMappingsMap.put(domainMapping.getClusterId(), domainMappings);
}
@@ -110,11 +112,12 @@ public class DomainMappingManager {
/**
* Get domain mappings of cluster.
+ *
* @param clusterId
* @return
*/
public List<DomainMapping> getDomainMappings(String clusterId) {
- if(clusterIdToDomainMappingsMap.containsKey(clusterId)) {
+ if (clusterIdToDomainMappingsMap.containsKey(clusterId)) {
return clusterIdToDomainMappingsMap.get(clusterId);
}
return null;
@@ -122,21 +125,22 @@ public class DomainMappingManager {
/**
* Get domain mapping of cluster by domain name.
+ *
* @param clusterId
* @param domainName
* @return
*/
public DomainMapping getDomainMapping(String clusterId, String domainName) {
List<DomainMapping> domainMappings = getDomainMappings(clusterId);
- if(domainMappings == null) {
+ if (domainMappings == null) {
log.warn(String.format("Domain mappings not found for cluster: [cluster-id] %s", clusterId));
return null;
}
Iterator<DomainMapping> iterator = domainMappings.iterator();
- while(iterator.hasNext()) {
+ while (iterator.hasNext()) {
DomainMapping domainMapping = iterator.next();
- if(domainMapping.getDomainName().equals(domainName)) {
+ if (domainMapping.getDomainName().equals(domainName)) {
return domainMapping;
}
}
@@ -145,21 +149,22 @@ public class DomainMappingManager {
/**
* Remove domain mapping of cluster by domain name.
+ *
* @param clusterId
* @param domainName
*/
public void removeDomainMapping(String clusterId, String domainName) {
List<DomainMapping> domainMappings = getDomainMappings(clusterId);
- if(domainMappings == null) {
+ if (domainMappings == null) {
throw new RuntimeException(String.format("Domain mappings not found for cluster: [cluster-id] %s", clusterId));
}
Iterator<DomainMapping> iterator = domainMappings.iterator();
- while(iterator.hasNext()) {
+ while (iterator.hasNext()) {
DomainMapping domainMapping = iterator.next();
- if(domainMapping.getDomainName().equals(domainName)) {
+ if (domainMapping.getDomainName().equals(domainName)) {
iterator.remove();
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Domain mapping removed: [cluster-id] %s [domain-name] %s",
clusterId, domainName));
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/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 d75c5fd..58f5a76 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
@@ -66,7 +66,7 @@ class HealthStatEventMessageDelegator implements Runnable {
log.debug("Health event message received: [message] " + messageText);
}
EventMessage eventMessage = jsonToEventMessage(messageText);
- if(eventMessage == null){
+ if (eventMessage == null) {
log.error("Error occurred while extracting message");
continue;
}
@@ -115,7 +115,7 @@ class HealthStatEventMessageDelegator implements Runnable {
String eventType = MessageParts[0].trim();
eventType = eventType.substring(eventType.indexOf("\"") + 1, eventType.lastIndexOf("\""));
- if(log.isDebugEnabled()){
+ if (log.isDebugEnabled()) {
log.debug(String.format("Extracted [event type] %s", eventType));
}
@@ -123,13 +123,13 @@ class HealthStatEventMessageDelegator implements Runnable {
String messageTag = MessageParts[1];
messageTag = messageTag.substring(messageTag.indexOf("\"") + 1, messageTag.lastIndexOf("\""));
- if("message".equals(messageTag)){
+ if ("message".equals(messageTag)) {
message = MessageParts[2].trim();
//Remove trailing bracket twice to get the message
message = message.substring(0, message.lastIndexOf("}")).trim();
message = message.substring(0, message.lastIndexOf("}")).trim();
- if(message.indexOf('{') == 0 && message.indexOf('}') == message.length() - 1){
- if(log.isDebugEnabled()) {
+ if (message.indexOf('{') == 0 && message.indexOf('}') == message.length() - 1) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("[Extracted message] %s ", message));
}
event.setMessage(message);
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java
index e17ec57..95b54b6 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventMessageListener.java
@@ -31,13 +31,13 @@ import org.apache.stratos.messaging.domain.Message;
*/
public class HealthStatEventMessageListener implements MessageListener {
- private static final Log log = LogFactory.getLog(HealthStatEventMessageListener.class);
+ private static final Log log = LogFactory.getLog(HealthStatEventMessageListener.class);
- private final HealthStatEventMessageQueue messageQueue;
+ private final HealthStatEventMessageQueue messageQueue;
- public HealthStatEventMessageListener(HealthStatEventMessageQueue messageQueue) {
- this.messageQueue = messageQueue;
- }
+ public HealthStatEventMessageListener(HealthStatEventMessageQueue messageQueue) {
+ this.messageQueue = messageQueue;
+ }
@Override
public void messageReceived(Message message) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
index a3652df..e73a326 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java
@@ -31,55 +31,55 @@ import java.util.concurrent.ExecutorService;
* A thread for receiving health stat information from message broker
*/
public class HealthStatEventReceiver {
- private static final Log log = LogFactory.getLog(HealthStatEventReceiver.class);
+ private static final Log log = LogFactory.getLog(HealthStatEventReceiver.class);
- private final HealthStatEventMessageDelegator messageDelegator;
- private final HealthStatEventMessageListener messageListener;
- private EventSubscriber eventSubscriber;
- private boolean terminated;
- private ExecutorService executorService;
+ private final HealthStatEventMessageDelegator messageDelegator;
+ private final HealthStatEventMessageListener messageListener;
+ private EventSubscriber eventSubscriber;
+ private boolean terminated;
+ private ExecutorService executorService;
- public HealthStatEventReceiver() {
- HealthStatEventMessageQueue messageQueue = new HealthStatEventMessageQueue();
- this.messageDelegator = new HealthStatEventMessageDelegator(messageQueue);
- this.messageListener = new HealthStatEventMessageListener(messageQueue);
- }
+ public HealthStatEventReceiver() {
+ HealthStatEventMessageQueue messageQueue = new HealthStatEventMessageQueue();
+ this.messageDelegator = new HealthStatEventMessageDelegator(messageQueue);
+ this.messageListener = new HealthStatEventMessageListener(messageQueue);
+ }
- public void addEventListener(EventListener eventListener) {
- messageDelegator.addEventListener(eventListener);
- }
+ public void addEventListener(EventListener eventListener) {
+ messageDelegator.addEventListener(eventListener);
+ }
- public void execute() {
- try {
- // Start topic subscriber thread
- eventSubscriber = new EventSubscriber(MessagingUtil.Topics.HEALTH_STAT_TOPIC.getTopicName(), messageListener);
+ public void execute() {
+ try {
+ // Start topic subscriber thread
+ eventSubscriber = new EventSubscriber(MessagingUtil.Topics.HEALTH_STAT_TOPIC.getTopicName(), messageListener);
executorService.execute(eventSubscriber);
if (log.isDebugEnabled()) {
- log.debug("Health stats event message delegator thread started");
- }
+ log.debug("Health stats event message delegator thread started");
+ }
// Start health stat event message delegator thread
executorService.execute(messageDelegator);
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("Health stats receiver failed", e);
- }
- }
- }
+ } catch (Exception e) {
+ if (log.isErrorEnabled()) {
+ log.error("Health stats receiver failed", e);
+ }
+ }
+ }
- public void terminate() {
- eventSubscriber.terminate();
- messageDelegator.terminate();
- terminated = true;
- }
+ public void terminate() {
+ eventSubscriber.terminate();
+ messageDelegator.terminate();
+ terminated = true;
+ }
- public ExecutorService getExecutorService() {
- return executorService;
- }
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
+ public void setExecutorService(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java
index 854150f..3981e31 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventMessageListener.java
@@ -31,13 +31,13 @@ import org.apache.stratos.messaging.domain.Message;
*/
class InstanceNotifierEventMessageListener implements MessageListener {
- private static final Log log = LogFactory.getLog(InstanceNotifierEventMessageListener.class);
+ private static final Log log = LogFactory.getLog(InstanceNotifierEventMessageListener.class);
- private final InstanceNotifierEventMessageQueue messageQueue;
+ private final InstanceNotifierEventMessageQueue messageQueue;
- public InstanceNotifierEventMessageListener(InstanceNotifierEventMessageQueue messageQueue) {
- this.messageQueue = messageQueue;
- }
+ public InstanceNotifierEventMessageListener(InstanceNotifierEventMessageQueue messageQueue) {
+ this.messageQueue = messageQueue;
+ }
@Override
public void messageReceived(Message message) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
index 6e1a52e..7476d18 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java
@@ -30,63 +30,63 @@ import org.apache.stratos.messaging.util.MessagingUtil;
* A thread for receiving instance notifier information from message broker.
*/
public class InstanceNotifierEventReceiver {
- private static final Log log = LogFactory.getLog(InstanceNotifierEventReceiver.class);
- private final InstanceNotifierEventMessageDelegator messageDelegator;
- private final InstanceNotifierEventMessageListener messageListener;
- private EventSubscriber eventSubscriber;
- private boolean terminated;
+ private static final Log log = LogFactory.getLog(InstanceNotifierEventReceiver.class);
+ private final InstanceNotifierEventMessageDelegator messageDelegator;
+ private final InstanceNotifierEventMessageListener messageListener;
+ private EventSubscriber eventSubscriber;
+ private boolean terminated;
- public InstanceNotifierEventReceiver() {
- InstanceNotifierEventMessageQueue messageQueue = new InstanceNotifierEventMessageQueue();
- this.messageDelegator = new InstanceNotifierEventMessageDelegator(messageQueue);
- this.messageListener = new InstanceNotifierEventMessageListener(messageQueue);
- }
+ public InstanceNotifierEventReceiver() {
+ InstanceNotifierEventMessageQueue messageQueue = new InstanceNotifierEventMessageQueue();
+ this.messageDelegator = new InstanceNotifierEventMessageDelegator(messageQueue);
+ this.messageListener = new InstanceNotifierEventMessageListener(messageQueue);
+ }
- public void addEventListener(EventListener eventListener) {
- messageDelegator.addEventListener(eventListener);
- }
+ public void addEventListener(EventListener eventListener) {
+ messageDelegator.addEventListener(eventListener);
+ }
- public void execute() {
- try {
- // Start topic subscriber thread
- eventSubscriber = new EventSubscriber(MessagingUtil.Topics.INSTANCE_NOTIFIER_TOPIC.getTopicName(), messageListener);
+ public void execute() {
+ try {
+ // Start topic subscriber thread
+ eventSubscriber = new EventSubscriber(MessagingUtil.Topics.INSTANCE_NOTIFIER_TOPIC.getTopicName(), messageListener);
// subscriber.setMessageListener(messageListener);
- Thread subscriberThread = new Thread(eventSubscriber);
+ Thread subscriberThread = new Thread(eventSubscriber);
- subscriberThread.start();
- if (log.isDebugEnabled()) {
- log.debug("InstanceNotifier event message receiver thread started");
- }
+ subscriberThread.start();
+ if (log.isDebugEnabled()) {
+ log.debug("InstanceNotifier event message receiver thread started");
+ }
- // Start instance notifier event message delegator thread
- Thread receiverThread = new Thread(messageDelegator);
- receiverThread.start();
- if (log.isDebugEnabled()) {
- log.debug("InstanceNotifier event message delegator thread started");
- }
+ // Start instance notifier event message delegator thread
+ Thread receiverThread = new Thread(messageDelegator);
+ receiverThread.start();
+ if (log.isDebugEnabled()) {
+ log.debug("InstanceNotifier event message delegator thread started");
+ }
- // Keep the thread live until terminated
- while (!terminated) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException ignore) {
- }
- }
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("InstanceNotifier receiver failed", e);
- }
- }
- }
+ // Keep the thread live until terminated
+ while (!terminated) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignore) {
+ }
+ }
+ } catch (Exception e) {
+ if (log.isErrorEnabled()) {
+ log.error("InstanceNotifier receiver failed", e);
+ }
+ }
+ }
- public boolean isSubscribed() {
- return ((eventSubscriber != null) && (eventSubscriber.isSubscribed()));
- }
+ public boolean isSubscribed() {
+ return ((eventSubscriber != null) && (eventSubscriber.isSubscribed()));
+ }
- public void terminate() {
- eventSubscriber.terminate();
- messageDelegator.terminate();
- terminated = true;
- }
+ public void terminate() {
+ eventSubscriber.terminate();
+ messageDelegator.terminate();
+ terminated = true;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
index dfe1c8c..41f444e 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java
@@ -36,7 +36,7 @@ public class InstanceStatusEventReceiver {
private final InstanceStatusEventMessageListener messageListener;
private EventSubscriber eventSubscriber;
private boolean terminated;
- private ExecutorService executorService;
+ private ExecutorService executorService;
public InstanceStatusEventReceiver() {
InstanceStatusEventMessageQueue messageQueue = new InstanceStatusEventMessageQueue();
@@ -80,11 +80,11 @@ public class InstanceStatusEventReceiver {
terminated = true;
}
- public ExecutorService getExecutorService() {
- return executorService;
- }
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
+ public void setExecutorService(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java
index a295d40..c735d9b 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageDelegator.java
@@ -27,8 +27,6 @@ import org.apache.stratos.messaging.message.processor.MessageProcessorChain;
import org.apache.stratos.messaging.message.processor.tenant.TenantMessageProcessorChain;
-
-
/**
* Implements logic for processing topology event messages based on a given
* topology process chain.
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java
index 07dd7cb..9483407 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventMessageListener.java
@@ -31,13 +31,13 @@ import org.apache.stratos.messaging.domain.Message;
*/
class TenantEventMessageListener implements MessageListener {
- private static final Log log = LogFactory.getLog(TenantEventMessageListener.class);
+ private static final Log log = LogFactory.getLog(TenantEventMessageListener.class);
- private final TenantEventMessageQueue messageQueue;
+ private final TenantEventMessageQueue messageQueue;
- public TenantEventMessageListener(TenantEventMessageQueue messageQueue) {
- this.messageQueue = messageQueue;
- }
+ public TenantEventMessageListener(TenantEventMessageQueue messageQueue) {
+ this.messageQueue = messageQueue;
+ }
@Override
public void messageReceived(Message message) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantManager.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantManager.java
index 17f089f..5cca47a 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantManager.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantManager.java
@@ -30,11 +30,11 @@ import java.util.List;
import java.util.Map;
/**
- * A singleton class for managing the tenant information.
- *
- * Usage:
- * Acquire a relevant lock and invoke a method inside a try block.
- * Once processing is done release the lock using a finally block.
+ * A singleton class for managing the tenant information.
+ * <p/>
+ * Usage:
+ * Acquire a relevant lock and invoke a method inside a try block.
+ * Once processing is done release the lock using a finally block.
*/
public class TenantManager {
private static final Log log = LogFactory.getLog(TenantManager.class);
@@ -47,28 +47,28 @@ public class TenantManager {
private boolean initialized;
public static void acquireReadLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock acquired");
}
lock.acquireReadLock();
}
public static void releaseReadLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock released");
}
lock.releaseReadLock();
}
public static void acquireWriteLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock acquired");
}
lock.acquireWriteLock();
}
public static void releaseWriteLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Write lock released");
}
lock.releaseWriteLock();
@@ -77,18 +77,18 @@ public class TenantManager {
private TenantManager() {
this.tenantIdTenantMap = new HashMap<Integer, Tenant>();
this.tenantDomainTenantMap = new HashMap<String, Tenant>();
- Tenant superTenant = new Tenant(MultitenantConstants.SUPER_TENANT_ID,
- MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+ Tenant superTenant = new Tenant(MultitenantConstants.SUPER_TENANT_ID,
+ MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
this.tenantIdTenantMap.put(MultitenantConstants.SUPER_TENANT_ID, superTenant);
this.tenantDomainTenantMap.put(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME, superTenant);
}
public static TenantManager getInstance() {
if (instance == null) {
- synchronized (TenantManager.class){
+ synchronized (TenantManager.class) {
if (instance == null) {
instance = new TenantManager();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("TenantManager object created");
}
}
@@ -103,7 +103,7 @@ public class TenantManager {
}
public void addTenants(List<Tenant> tenants) {
- for(Tenant tenant : tenants) {
+ for (Tenant tenant : tenants) {
addTenant(tenant);
}
}
@@ -122,7 +122,7 @@ public class TenantManager {
public void removeTenant(int tenantId) {
Tenant tenant = getTenant(tenantId);
- if(tenant != null) {
+ if (tenant != null) {
tenantIdTenantMap.remove(tenant.getTenantId());
tenantDomainTenantMap.remove(tenant.getTenantDomain());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java
index d33f5d0..58f2c36 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java
@@ -38,7 +38,7 @@ public class TopologyEventReceiver {
private TopologyEventMessageDelegator messageDelegator;
private TopologyEventMessageListener messageListener;
private EventSubscriber eventSubscriber;
- private ExecutorService executorService;
+ private ExecutorService executorService;
public TopologyEventReceiver() {
TopologyEventMessageQueue messageQueue = new TopologyEventMessageQueue();
@@ -51,12 +51,12 @@ public class TopologyEventReceiver {
}
- public void execute() {
- try {
- // Start topic subscriber thread
- eventSubscriber = new EventSubscriber(MessagingUtil.Topics.TOPOLOGY_TOPIC.getTopicName(), messageListener);
- // subscriber.setMessageListener(messageListener);
- executorService.execute(eventSubscriber);
+ public void execute() {
+ try {
+ // Start topic subscriber thread
+ eventSubscriber = new EventSubscriber(MessagingUtil.Topics.TOPOLOGY_TOPIC.getTopicName(), messageListener);
+ // subscriber.setMessageListener(messageListener);
+ executorService.execute(eventSubscriber);
if (log.isDebugEnabled()) {
@@ -82,11 +82,11 @@ public class TopologyEventReceiver {
messageDelegator.terminate();
}
- public ExecutorService getExecutorService() {
- return executorService;
- }
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
+ public void setExecutorService(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/b7df7ea8/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 159e128..8b27992 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
@@ -26,37 +26,37 @@ import org.apache.stratos.messaging.domain.topology.locking.TopologyLock;
import org.apache.stratos.messaging.domain.topology.locking.TopologyLockHierarchy;
/**
- * A singleton class for managing the topology data structure.
- *
- * Usage:
- * Acquire a relevant lock and invoke the getTopology() method inside a try block.
- * Once processing is done release the lock using a finally block.
- *
- * Acquiring Locks:
- *
- * Stratos supports hierarchical locking. As per the practice, we need to lock the
- * hierarchy from root level till the relevant sub tree.
- *
- * Acquire a read lock:
- *
- * From root level, acquire read locks till the relevant sub tree
- *
- * Examples -
- *
- * Example 1: Acquiring read lock to read Cluster information
- * acquiring:
- * public static void acquireReadLockForCluster (String serviceName, String clusterId)
- *
- * releasing:
- * public static void releaseReadLockForCluster (String serviceName, String clusterId)
- *
- *
- * Example 2: Acquiring read lock for a particular Service
- * acquiring:
- * public static void acquireReadLockForService (String serviceName)
- *
- * releasing:
- * public static void releaseReadLockForService (String serviceName)
+ * A singleton class for managing the topology data structure.
+ * <p/>
+ * Usage:
+ * Acquire a relevant lock and invoke the getTopology() method inside a try block.
+ * Once processing is done release the lock using a finally block.
+ * <p/>
+ * Acquiring Locks:
+ * <p/>
+ * Stratos supports hierarchical locking. As per the practice, we need to lock the
+ * hierarchy from root level till the relevant sub tree.
+ * <p/>
+ * Acquire a read lock:
+ * <p/>
+ * From root level, acquire read locks till the relevant sub tree
+ * <p/>
+ * Examples -
+ * <p/>
+ * Example 1: Acquiring read lock to read Cluster information
+ * acquiring:
+ * public static void acquireReadLockForCluster (String serviceName, String clusterId)
+ * <p/>
+ * releasing:
+ * public static void releaseReadLockForCluster (String serviceName, String clusterId)
+ * <p/>
+ * <p/>
+ * Example 2: Acquiring read lock for a particular Service
+ * acquiring:
+ * public static void acquireReadLockForService (String serviceName)
+ * <p/>
+ * releasing:
+ * public static void releaseReadLockForService (String serviceName)
*/
public class TopologyManager {
private static final Log log = LogFactory.getLog(TopologyManager.class);
@@ -69,7 +69,7 @@ public class TopologyManager {
* Acquires read lock for the Complete Topology
*/
public static void acquireReadLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock acquired for Topology");
}
topologyLockHierarchy.getCompleteTopologyLock().acquireReadLock();
@@ -79,7 +79,7 @@ public class TopologyManager {
* Releases read lock for the Complete Topology
*/
public static void releaseReadLock() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock released for Topology");
}
topologyLockHierarchy.getCompleteTopologyLock().releaseReadLock();
@@ -91,7 +91,7 @@ public class TopologyManager {
* Acquires read lock for the all Services
*/
public static void acquireReadLockForServices() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock acquired for Services");
}
topologyLockHierarchy.getServiceLock().acquireReadLock();
@@ -101,7 +101,7 @@ public class TopologyManager {
* Releases read lock for the all Services
*/
public static void releaseReadLockForServices() {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock released for Services");
}
topologyLockHierarchy.getServiceLock().releaseReadLock();
@@ -112,7 +112,7 @@ public class TopologyManager {
*
* @param serviceName service name to acquire read lock
*/
- public static void acquireReadLockForService (String serviceName) {
+ public static void acquireReadLockForService(String serviceName) {
// acquire read lock for all Services
acquireReadLockForServices();
@@ -123,7 +123,7 @@ public class TopologyManager {
} else {
topologyServiceLock.acquireReadLock();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock acquired for Service " + serviceName);
}
}
@@ -134,7 +134,7 @@ public class TopologyManager {
*
* @param serviceName service name to release read lock
*/
- public static void releaseReadLockForService (String serviceName) {
+ public static void releaseReadLockForService(String serviceName) {
TopologyLock topologyServiceLock = topologyLockHierarchy.getTopologyLockForService(serviceName);
if (topologyServiceLock == null) {
@@ -142,7 +142,7 @@ public class TopologyManager {
} else {
topologyServiceLock.releaseReadLock();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock released for Service " + serviceName);
}
}
@@ -153,13 +153,13 @@ public class TopologyManager {
/**
* Acquires read lock for a Cluster. This will acquire the read lock in the following order
- * 1. for the Service
- * 2. for the Cluster
+ * 1. for the Service
+ * 2. for the Cluster
*
* @param serviceName service name to acquire read lock
- * @param clusterId cluster id to acquire read lock
+ * @param clusterId cluster id to acquire read lock
*/
- public static void acquireReadLockForCluster (String serviceName, String clusterId) {
+ public static void acquireReadLockForCluster(String serviceName, String clusterId) {
// acquire read lock for the relevant Services
acquireReadLockForService(serviceName);
@@ -168,10 +168,10 @@ public class TopologyManager {
if (topologyClusterLock == null) {
handleLockNotFound("Topology lock not found for Cluster " + clusterId);
- } else {
+ } else {
// acquire read lock for the relevant Cluster
topologyClusterLock.acquireReadLock();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock acquired for Cluster " + clusterId);
}
}
@@ -179,13 +179,13 @@ public class TopologyManager {
/**
* Releases read lock for a Cluster. This will release the read lock in the following order
- * 1. for the Cluster
- * 2. for the Service
+ * 1. for the Cluster
+ * 2. for the Service
*
* @param serviceName service name to release read lock
- * @param clusterId cluster id to release read lock
+ * @param clusterId cluster id to release read lock
*/
- public static void releaseReadLockForCluster (String serviceName, String clusterId) {
+ public static void releaseReadLockForCluster(String serviceName, String clusterId) {
TopologyLock topologyClusterLock = topologyLockHierarchy.getTopologyLockForCluster(clusterId);
if (topologyClusterLock == null) {
@@ -194,7 +194,7 @@ public class TopologyManager {
} else {
// release read lock for the relevant Cluster
topologyClusterLock.releaseReadLock();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Read lock released for Cluster " + clusterId);
}
}
@@ -203,17 +203,17 @@ public class TopologyManager {
releaseReadLockForService(serviceName);
}
- private static void handleLockNotFound (String errorMsg) {
+ private static void handleLockNotFound(String errorMsg) {
log.warn(errorMsg);
//throw new RuntimeException(errorMsg);
}
public static Topology getTopology() {
if (topology == null) {
- synchronized (TopologyManager.class){
+ synchronized (TopologyManager.class) {
if (topology == null) {
topology = new Topology();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Topology object created");
}
}