Changeset 67 for trunk

Timestamp:

06/27/13 11:44:54 (11 years ago)

Author:

stoda

Message:

EventTest? added

Location:

trunk

Files:

• src/main/java/omq/server/RemoteObject.java (modified) (2 diffs)
• src/test/java/omq/test/event/EventTest.java (added)
• src/test/java/omq/test/event/EventTrigger.java (modified) (1 diff)
• src/test/java/omq/test/event/EventTriggerImpl.java (modified) (2 diffs)
• src/test/java/omq/test/event/MessageEvent.java (moved) (moved from trunk/src/test/java/omq/test/event/ZeroEvent.java) (2 diffs)
• src/test/java/omq/test/event/MessageListener.java (moved) (moved from trunk/src/test/java/omq/test/event/ZeroListener.java) (1 diff)
• target/classes/log4j.xml (deleted)

trunk/src/main/java/omq/server/RemoteObject.java

@@ -93 +93 @@
                 this.broker = broker;
                 UID = reference;
+                serializer = broker.getSerializer();
                 if (channel == null || !channel.isOpen()) {
                         channel = broker.getChannel();
@@ -142 +143 @@
         @Override
         public void notifyEvent(Event event) throws IOException, SerializerException {
+                String corrID = java.util.UUID.randomUUID().toString();
                 event.setTopic(UID);
+                event.setCorrId(corrID);
                 EventWrapper wrapper = new EventWrapper(event);
                 channel.exchangeDeclare(UID, "fanout");
                 channel.basicPublish(UID, "", null, serializer.serialize(wrapper));
+                logger.debug("Sending event-> topic: " + UID + ", corrID: " + corrID);
         }
 

trunk/src/test/java/omq/test/event/EventTrigger.java

@@ -1 +1 @@
 package omq.test.event;
 
+import java.io.IOException;
+
 import omq.Remote;
+import omq.client.annotation.AsyncMethod;
 import omq.client.annotation.RemoteInterface;
+import omq.exception.SerializerException;
 
 @RemoteInterface
 public interface EventTrigger extends Remote {
-
+        @AsyncMethod
+        public void triggerEvent(String message) throws IOException, SerializerException;
 }

trunk/src/test/java/omq/test/event/EventTriggerImpl.java

@@ -1 +1 @@
 package omq.test.event;
 
+import java.io.IOException;
+
+import omq.exception.SerializerException;
 import omq.server.RemoteObject;
 
@@ -9 +12 @@
          */
         private static final long serialVersionUID = 1L;
+
+        public void triggerEvent(String message) throws IOException, SerializerException {
+                MessageEvent event = new MessageEvent(message);
+                this.notifyEvent(event);
+        }
         
 }

trunk/src/test/java/omq/test/event/MessageEvent.java

@@ -3 +3 @@
 import omq.common.event.Event;
 
-public class ZeroEvent extends Event {
+public class MessageEvent extends Event {
         /**
          * 
@@ -9 +9 @@
         private static final long serialVersionUID = 1L;
 
-        public ZeroEvent() {
+        private String message;
+
+        public MessageEvent() {
         }
 
-        public ZeroEvent(String corrId, String topic) {
-                super(corrId, topic);
+        public MessageEvent(String message) {
+                this.message = message;
         }
 
-        public String getZeroMessage() {
-                return "divition by 0";
+        public String getMessage() {
+                return message;
+        }
+
+        public void setMessage(String message) {
+                this.message = message;
         }
 

trunk/src/test/java/omq/test/event/MessageListener.java

@@ -3 +3 @@
 import omq.common.event.EventListener;
 
-public class ZeroListener extends EventListener<ZeroEvent> {
+public class MessageListener extends EventListener<MessageEvent> {
+        private String message;
 
-        public ZeroListener(String topic) {
-                super(topic);
+        @Override
+        public void notifyEvent(MessageEvent event) {
+                message = event.getMessage();
         }
 
-        @Override
-        public void notifyEvent(ZeroEvent event) {
-                System.out.println(event.getZeroMessage());
+        public String getMessage() {
+                return message;
+        }
+
+        public void setMessage(String message) {
+                this.message = message;
         }
 }