Skip to content

Commit 85e73d1

Browse files
kelvenykelveny
committed
Refactor message bus facitlity to avoid confusing with event bus for external notification, planning to use it in VMSync
1 parent e7e862d commit 85e73d1

14 files changed

Lines changed: 61 additions & 61 deletions

File tree

‎client/tomcatconf/applicationContext.xml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<property name="messageSerializer" ref="messageSerializer" />
8383
</bean>
8484

85-
<bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" />
85+
<bean id="messageBus" class = "org.apache.cloudstack.framework.messagebus.MessageBusBase" />
8686

8787
<!--
8888
DAO with customized configuration

‎core/src/com/cloud/vm/VMInstanceVO.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
153153

154154
@Column(name="uuid")
155155
protected String uuid = UUID.randomUUID().toString();
156-
;
157156

158157
@Column(name="disk_offering_id")
159158
protected Long diskOfferingId;

‎framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
*/
1919
package org.apache.cloudstack.framework.client;
2020

21-
import org.apache.cloudstack.framework.eventbus.EventBusBase;
21+
import org.apache.cloudstack.framework.messagebus.MessageBusBase;
2222
import org.apache.cloudstack.framework.transport.TransportMultiplexier;
2323

24-
public class ClientEventBus extends EventBusBase implements TransportMultiplexier {
24+
public class ClientEventBus extends MessageBusBase implements TransportMultiplexier {
2525

2626
@Override
2727
public void onTransportMessage(String senderEndpointAddress,

framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBus.java renamed to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBus.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.cloudstack.framework.eventbus;
20+
package org.apache.cloudstack.framework.messagebus;
2121

2222
import org.apache.cloudstack.framework.serializer.MessageSerializer;
2323

24-
public interface EventBus {
24+
public interface MessageBus {
2525
void setMessageSerializer(MessageSerializer messageSerializer);
2626
MessageSerializer getMessageSerializer();
2727

28-
void subscribe(String subject, Subscriber subscriber);
29-
void unsubscribe(String subject, Subscriber subscriber);
28+
void subscribe(String subject, MessageSubscriber subscriber);
29+
void unsubscribe(String subject, MessageSubscriber subscriber);
3030

3131
void publish(String senderAddress, String subject, PublishScope scope, Object args);
3232
}

framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusBase.java renamed to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.cloudstack.framework.eventbus;
20+
package org.apache.cloudstack.framework.messagebus;
2121

2222
import java.util.ArrayList;
2323
import java.util.Arrays;
@@ -28,15 +28,15 @@
2828

2929
import org.apache.cloudstack.framework.serializer.MessageSerializer;
3030

31-
public class EventBusBase implements EventBus {
31+
public class MessageBusBase implements MessageBus {
3232

3333
private Gate _gate;
3434
private List<ActionRecord> _pendingActions;
3535

3636
private SubscriptionNode _subscriberRoot;
3737
private MessageSerializer _messageSerializer;
3838

39-
public EventBusBase() {
39+
public MessageBusBase() {
4040
_gate = new Gate();
4141
_pendingActions = new ArrayList<ActionRecord>();
4242

@@ -54,7 +54,7 @@ public MessageSerializer getMessageSerializer() {
5454
}
5555

5656
@Override
57-
public void subscribe(String subject, Subscriber subscriber) {
57+
public void subscribe(String subject, MessageSubscriber subscriber) {
5858
assert(subject != null);
5959
assert(subscriber != null);
6060
if(_gate.enter()) {
@@ -70,7 +70,7 @@ public void subscribe(String subject, Subscriber subscriber) {
7070
}
7171

7272
@Override
73-
public void unsubscribe(String subject, Subscriber subscriber) {
73+
public void unsubscribe(String subject, MessageSubscriber subscriber) {
7474
if(_gate.enter()) {
7575
SubscriptionNode current = locate(subject, null, false);
7676
if(current != null)
@@ -186,9 +186,9 @@ private static enum ActionType {
186186
private static class ActionRecord {
187187
private ActionType _type;
188188
private String _subject;
189-
private Subscriber _subscriber;
189+
private MessageSubscriber _subscriber;
190190

191-
public ActionRecord(ActionType type, String subject, Subscriber subscriber) {
191+
public ActionRecord(ActionType type, String subject, MessageSubscriber subscriber) {
192192
_type = type;
193193
_subject = subject;
194194
_subscriber = subscriber;
@@ -202,7 +202,7 @@ public String getSubject() {
202202
return _subject;
203203
}
204204

205-
public Subscriber getSubscriber() {
205+
public MessageSubscriber getSubscriber() {
206206
return _subscriber;
207207
}
208208
}
@@ -264,13 +264,13 @@ public void leave() {
264264
private static class SubscriptionNode {
265265
@SuppressWarnings("unused")
266266
private String _nodeKey;
267-
private List<Subscriber> _subscribers;
267+
private List<MessageSubscriber> _subscribers;
268268
private Map<String, SubscriptionNode> _children;
269269

270-
public SubscriptionNode(String nodeKey, Subscriber subscriber) {
270+
public SubscriptionNode(String nodeKey, MessageSubscriber subscriber) {
271271
assert(nodeKey != null);
272272
_nodeKey = nodeKey;
273-
_subscribers = new ArrayList<Subscriber>();
273+
_subscribers = new ArrayList<MessageSubscriber>();
274274

275275
if(subscriber != null)
276276
_subscribers.add(subscriber);
@@ -279,15 +279,15 @@ public SubscriptionNode(String nodeKey, Subscriber subscriber) {
279279
}
280280

281281
@SuppressWarnings("unused")
282-
public List<Subscriber> getSubscriber() {
282+
public List<MessageSubscriber> getSubscriber() {
283283
return _subscribers;
284284
}
285285

286-
public void addSubscriber(Subscriber subscriber) {
286+
public void addSubscriber(MessageSubscriber subscriber) {
287287
_subscribers.add(subscriber);
288288
}
289289

290-
public void removeSubscriber(Subscriber subscriber) {
290+
public void removeSubscriber(MessageSubscriber subscriber) {
291291
_subscribers.remove(subscriber);
292292
}
293293

@@ -300,8 +300,8 @@ public void addChild(String key, SubscriptionNode childNode) {
300300
}
301301

302302
public void notifySubscribers(String senderAddress, String subject, Object args) {
303-
for(Subscriber subscriber : _subscribers) {
304-
subscriber.onPublishEvent(senderAddress, subject, args);
303+
for(MessageSubscriber subscriber : _subscribers) {
304+
subscriber.onPublishMessage(senderAddress, subject, args);
305305
}
306306
}
307307
}

framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusEndpoint.java renamed to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusEndpoint.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.cloudstack.framework.eventbus;
20+
package org.apache.cloudstack.framework.messagebus;
2121

2222

23-
public class EventBusEndpoint {
24-
private EventBus _eventBus;
23+
public class MessageBusEndpoint {
24+
private MessageBus _eventBus;
2525
private String _sender;
2626
private PublishScope _scope;
2727

28-
public EventBusEndpoint(EventBus eventBus, String sender, PublishScope scope) {
28+
public MessageBusEndpoint(MessageBus eventBus, String sender, PublishScope scope) {
2929
_eventBus = eventBus;
3030
_sender = sender;
3131
_scope = scope;
3232
}
3333

34-
public EventBusEndpoint setEventBus(EventBus eventBus) {
34+
public MessageBusEndpoint setEventBus(MessageBus eventBus) {
3535
_eventBus = eventBus;
3636
return this;
3737
}
3838

39-
public EventBusEndpoint setScope(PublishScope scope) {
39+
public MessageBusEndpoint setScope(PublishScope scope) {
4040
_scope = scope;
4141
return this;
4242
}
@@ -45,7 +45,7 @@ public PublishScope getScope() {
4545
return _scope;
4646
}
4747

48-
public EventBusEndpoint setSender(String sender) {
48+
public MessageBusEndpoint setSender(String sender) {
4949
_sender = sender;
5050
return this;
5151
}

framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventDispatcher.java renamed to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDispatcher.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.cloudstack.framework.eventbus;
19+
package org.apache.cloudstack.framework.messagebus;
2020

2121
import java.lang.reflect.InvocationTargetException;
2222
import java.lang.reflect.Method;
2323
import java.util.HashMap;
2424
import java.util.Map;
2525

2626

27-
public class EventDispatcher implements Subscriber {
27+
public class MessageDispatcher implements MessageSubscriber {
2828
private static Map<Class<?>, Method> s_handlerCache = new HashMap<Class<?>, Method>();
2929

30-
private static Map<Object, EventDispatcher> s_targetMap = new HashMap<Object, EventDispatcher>();
30+
private static Map<Object, MessageDispatcher> s_targetMap = new HashMap<Object, MessageDispatcher>();
3131
private Object _targetObject;
3232

33-
public EventDispatcher(Object targetObject) {
33+
public MessageDispatcher(Object targetObject) {
3434
_targetObject = targetObject;
3535
}
3636

3737
@Override
38-
public void onPublishEvent(String senderAddress, String subject, Object args) {
38+
public void onPublishMessage(String senderAddress, String subject, Object args) {
3939
dispatch(_targetObject, subject, senderAddress, args);
4040
}
4141

42-
public static EventDispatcher getDispatcher(Object targetObject) {
43-
EventDispatcher dispatcher;
42+
public static MessageDispatcher getDispatcher(Object targetObject) {
43+
MessageDispatcher dispatcher;
4444
synchronized(s_targetMap) {
4545
dispatcher = s_targetMap.get(targetObject);
4646
if(dispatcher == null) {
47-
dispatcher = new EventDispatcher(targetObject);
47+
dispatcher = new MessageDispatcher(targetObject);
4848
s_targetMap.put(targetObject, dispatcher);
4949
}
5050
}
@@ -85,7 +85,7 @@ public static Method resolveHandler(Class<?> handlerClz, String subject) {
8585
return handler;
8686

8787
for(Method method : handlerClz.getMethods()) {
88-
EventHandler annotation = method.getAnnotation(EventHandler.class);
88+
MessageHandler annotation = method.getAnnotation(MessageHandler.class);
8989
if(annotation != null) {
9090
if(match(annotation.topic(), subject)) {
9191
s_handlerCache.put(handlerClz, method);

framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventHandler.java renamed to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.cloudstack.framework.eventbus;
19+
package org.apache.cloudstack.framework.messagebus;
2020

2121
import java.lang.annotation.ElementType;
2222
import java.lang.annotation.Retention;
@@ -25,6 +25,6 @@
2525

2626
@Retention(RetentionPolicy.RUNTIME)
2727
@Target(ElementType.METHOD)
28-
public @interface EventHandler {
28+
public @interface MessageHandler {
2929
public String topic();
3030
}

framework/ipc/src/org/apache/cloudstack/framework/eventbus/Subscriber.java renamed to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageSubscriber.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.cloudstack.framework.eventbus;
20+
package org.apache.cloudstack.framework.messagebus;
2121

22-
public interface Subscriber {
23-
void onPublishEvent(String senderAddress, String subject, Object args);
22+
public interface MessageSubscriber {
23+
void onPublishMessage(String senderAddress, String subject, Object args);
2424
}

framework/ipc/src/org/apache/cloudstack/framework/eventbus/PublishScope.java renamed to framework/ipc/src/org/apache/cloudstack/framework/messagebus/PublishScope.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.apache.cloudstack.framework.eventbus;
20+
package org.apache.cloudstack.framework.messagebus;
2121

2222
public enum PublishScope {
2323
LOCAL, GLOBAL

0 commit comments

Comments
 (0)