You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/01/10 14:11:02 UTC
stratos git commit: Fixing event topic names to match with event
package names
Repository: stratos
Updated Branches:
refs/heads/master 98d3fa1b6 -> 0456d484b
Fixing event topic names to match with event package names
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0456d484
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0456d484
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0456d484
Branch: refs/heads/master
Commit: 0456d484bd40e5ae8e5dfa14443b22fb9a605ad7
Parents: 98d3fa1
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Jan 10 18:40:48 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Jan 10 18:40:48 2015 +0530
----------------------------------------------------------------------
.../ApplicationSignUpEventPublisher.java | 18 +++++++++++-------
.../publisher/DomainMappingEventPublisher.java | 15 +++++++++------
.../publisher/InstanceNotificationPublisher.java | 4 ++--
.../publisher/TenantEventPublisher.java | 19 ++++++++++---------
.../application/ApplicationsEventReceiver.java | 2 +-
.../signup/ApplicationSignUpEventReceiver.java | 2 +-
.../org/apache/stratos/messaging/util/Util.java | 6 +++---
7 files changed, 37 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0456d484/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/ApplicationSignUpEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/ApplicationSignUpEventPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/ApplicationSignUpEventPublisher.java
index 8fbf72a..82af4a5 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/ApplicationSignUpEventPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/ApplicationSignUpEventPublisher.java
@@ -22,6 +22,7 @@ package org.apache.stratos.manager.messaging.publisher;
import org.apache.stratos.messaging.broker.publish.EventPublisher;
import org.apache.stratos.messaging.broker.publish.EventPublisherPool;
import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
+import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.application.signup.ApplicationSignUpAddedEvent;
import org.apache.stratos.messaging.event.application.signup.ApplicationSignUpRemovedEvent;
import org.apache.stratos.messaging.event.application.signup.CompleteApplicationSignUpsEvent;
@@ -34,27 +35,30 @@ import java.util.List;
*/
public class ApplicationSignUpEventPublisher {
+ private static void publish(Event event) {
+ String topic = Util.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
+ eventPublisher.publish(event);
+ }
+
public static void publishCompleteApplicationSignUpsEvent(List<ApplicationSignUp> applicationSignUps) {
CompleteApplicationSignUpsEvent completeApplicationSignUpsEvent = new CompleteApplicationSignUpsEvent(
applicationSignUps);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(Util.Topics.APPLICATION_SIGNUPS_TOPIC.getTopicName());
- eventPublisher.publish(completeApplicationSignUpsEvent);
+ publish(completeApplicationSignUpsEvent);
}
public static void publishApplicationSignUpAddedEvent(String applicationId, int tenantId, List<String> clusterIds) {
ApplicationSignUpAddedEvent applicationSignUpAddedEvent = new ApplicationSignUpAddedEvent(
applicationId, tenantId, clusterIds);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(Util.Topics.APPLICATION_SIGNUPS_TOPIC.getTopicName());
- eventPublisher.publish(applicationSignUpAddedEvent);
+ publish(applicationSignUpAddedEvent);
}
public static void publishApplicationSignUpRemovedEvent(String applicationId, int tenantId) {
- ApplicationSignUpRemovedEvent applicationSignUpAddedEvent = new ApplicationSignUpRemovedEvent(
+ ApplicationSignUpRemovedEvent applicationSignUpRemovedEvent = new ApplicationSignUpRemovedEvent(
applicationId, tenantId);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(Util.Topics.APPLICATION_SIGNUPS_TOPIC.getTopicName());
- eventPublisher.publish(applicationSignUpAddedEvent);
+ publish(applicationSignUpRemovedEvent);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0456d484/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java
index eb9a9d6..7d5f61d 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.messaging.broker.publish.EventPublisher;
import org.apache.stratos.messaging.broker.publish.EventPublisherPool;
+import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.domain.mapping.DomainMappingAddedEvent;
import org.apache.stratos.messaging.event.domain.mapping.DomainMappingRemovedEvent;
import org.apache.stratos.messaging.util.Util;
@@ -34,13 +35,17 @@ public class DomainMappingEventPublisher {
private static final Log log = LogFactory.getLog(DomainMappingEventPublisher.class);
+ private static void publish(Event event) {
+ String topic = Util.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
+ eventPublisher.publish(event);
+ }
+
public static void publishDomainMappingAddedEvent(String applicationId, int tenantId, String serviceName,
String clusterId, String domainName, String contextPath) {
DomainMappingAddedEvent domainMappingAddedEvent = new DomainMappingAddedEvent(applicationId, tenantId,
serviceName, clusterId, domainName, contextPath);
-
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(Util.Topics.DOMAIN_MAPPING_TOPIC.getTopicName());
- eventPublisher.publish(domainMappingAddedEvent);
+ publish(domainMappingAddedEvent);
if(log.isInfoEnabled()) {
log.info(String.format("Domain mapping added event published: %s", domainMappingAddedEvent.toString()));
@@ -51,9 +56,7 @@ public class DomainMappingEventPublisher {
String clusterId, String domainName) {
DomainMappingRemovedEvent domainNameRemovedEvent = new DomainMappingRemovedEvent(applicationId, tenantId,
serviceName, clusterId, domainName);
-
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(Util.Topics.DOMAIN_MAPPING_TOPIC.getTopicName());
- eventPublisher.publish(domainNameRemovedEvent);
+ publish(domainNameRemovedEvent);
if(log.isInfoEnabled()) {
log.info(String.format("Domain mapping removed event published: %s", domainNameRemovedEvent.toString()));
http://git-wip-us.apache.org/repos/asf/stratos/blob/0456d484/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java
index e9eb78a..da12cc7 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java
@@ -41,8 +41,8 @@ public class InstanceNotificationPublisher {
private void publish(Event event) {
String topic = Util.getMessageTopicName(event);
- EventPublisher depsyncEventPublisher = EventPublisherPool.getPublisher(topic);
- depsyncEventPublisher.publish(event);
+ EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
+ eventPublisher.publish(event);
}
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/0456d484/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java
index 3212010..8a12e7b 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java
@@ -27,6 +27,7 @@ import org.apache.stratos.common.listeners.TenantMgtListener;
import org.apache.stratos.messaging.broker.publish.EventPublisher;
import org.apache.stratos.messaging.broker.publish.EventPublisherPool;
import org.apache.stratos.messaging.domain.tenant.Tenant;
+import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.tenant.TenantCreatedEvent;
import org.apache.stratos.messaging.event.tenant.TenantRemovedEvent;
import org.apache.stratos.messaging.event.tenant.TenantUpdatedEvent;
@@ -41,6 +42,12 @@ public class TenantEventPublisher implements TenantMgtListener {
private static final Log log = LogFactory.getLog(TenantEventPublisher.class);
private static final int EXEC_ORDER = 1;
+ private void publish(Event event) {
+ String topic = Util.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
+ eventPublisher.publish(event);
+ }
+
@Override
public void onTenantCreate(TenantInfoBean tenantInfo) throws ApacheStratosException {
try {
@@ -50,9 +57,7 @@ public class TenantEventPublisher implements TenantMgtListener {
}
Tenant tenant = new Tenant(tenantInfo.getTenantId(), tenantInfo.getTenantDomain());
TenantCreatedEvent event = new TenantCreatedEvent(tenant);
- String topic = Util.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
- eventPublisher.publish(event);
+ publish(event);
} catch (Exception e) {
log.error(String.format("Could not publish tenant created event [tenant-id] %d [tenant-domain] %s ",
tenantInfo.getTenantId(),
@@ -69,9 +74,7 @@ public class TenantEventPublisher implements TenantMgtListener {
}
TenantUpdatedEvent event = new TenantUpdatedEvent(tenantInfo.getTenantId(),
tenantInfo.getTenantDomain());
- String topic = Util.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
- eventPublisher.publish(event);
+ publish(event);
} catch (Exception e) {
log.error(String.format("Could not publish tenant updated event:[tenant-id] %d [tenant-domain] %s ",
tenantInfo.getTenantId(),
@@ -86,9 +89,7 @@ public class TenantEventPublisher implements TenantMgtListener {
log.info(String.format("Publishing tenant removed event: [tenant-id] %d", tenantId));
}
TenantRemovedEvent event = new TenantRemovedEvent(tenantId);
- String topic = Util.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
- eventPublisher.publish(event);
+ publish(event);
} catch (Exception e) {
log.error(String.format("Could not publish tenant removed event [tenant-id] %d", tenantId),e);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/0456d484/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 1675275..db99f37 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
@@ -49,7 +49,7 @@ public class ApplicationsEventReceiver {
public void execute() {
try {
// Start topic subscriber thread
- topicSubscriber = new TopicSubscriber(Util.Topics.APPLICATIONS_TOPIC.getTopicName(), messageListener);
+ topicSubscriber = new TopicSubscriber(Util.Topics.APPLICATION_TOPIC.getTopicName(), messageListener);
executorService.execute(topicSubscriber);
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/0456d484/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
index c8d098d..2db0572 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java
@@ -53,7 +53,7 @@ public class ApplicationSignUpEventReceiver {
public void execute() {
try {
// Start topic subscriber thread
- topicSubscriber = new TopicSubscriber(Util.Topics.APPLICATION_SIGNUPS_TOPIC.getTopicName(), messageListener);
+ topicSubscriber = new TopicSubscriber(Util.Topics.APPLICATION_SIGNUP_TOPIC.getTopicName(), messageListener);
// subscriber.setMessageListener(messageListener);
executorService.execute(topicSubscriber);
http://git-wip-us.apache.org/repos/asf/stratos/blob/0456d484/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java
index d173900..3ae2673 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Util.java
@@ -63,11 +63,11 @@ public class Util {
HEALTH_STAT_TOPIC("summarized-health-stats"),
INSTANCE_STATUS_TOPIC("instance/status/#"),
INSTANCE_NOTIFIER_TOPIC("instance/notifier/#"),
- APPLICATIONS_TOPIC("applications/#"),
- APPLICATION_SIGNUPS_TOPIC("application-signups/#"),
+ APPLICATION_TOPIC("application/#"),
+ APPLICATION_SIGNUP_TOPIC("application/signup/#"),
CLUSTER_STATUS_TOPIC("cluster/status/#"),
TENANT_TOPIC("tenant/#"),
- DOMAIN_MAPPING_TOPIC("domain/mappings/#");
+ DOMAIN_MAPPING_TOPIC("domain/mapping/#");
private String topicName;