Changeset 17 for trunk

Timestamp:

05/22/13 18:41:56 (11 years ago)

Author:

stoda

Message:

JavaImp? error with Events solved

Location:

trunk/objectmq/src/omq

Files:

• common/event/EventWrapper.java (modified) (2 diffs)
• common/util/Serializers/JavaImp.java (modified) (2 diffs)
• ztest/calculator/Calculator.java (modified) (1 diff)
• ztest/calculator/CalculatorImpl.java (modified) (2 diffs)
• ztest/calculator/CalculatorTest.java (modified) (2 diffs)
• ztest/calculator/Message.java (added)
• ztest/calculator/ServerTest.java (modified) (1 diff)

trunk/objectmq/src/omq/common/event/EventWrapper.java

@@ -1 +1 @@
 package omq.common.event;
 
-public class EventWrapper {
+import java.io.Serializable;
+
+public class EventWrapper implements Serializable {
+
+        /**
+         * 
+         */
+        private static final long serialVersionUID = 1L;
+
         private String type;
         private Event event;
@@ -8 +16 @@
         }
 
-        //TODO change to simpleName
+        // TODO change to simpleName
         public EventWrapper(Event event) {
                 this.event = event;

trunk/objectmq/src/omq/common/util/Serializers/JavaImp.java

@@ -7 +7 @@
 
 import omq.common.event.Event;
+import omq.common.event.EventWrapper;
 import omq.common.message.Request;
 import omq.common.message.Response;
@@ -54 +55 @@
         @Override
         public Event deserializeEvent(byte[] bytes) throws SerializerException {
-                return (Event) deserliazeObject(bytes);
+                EventWrapper wrapper = (EventWrapper) deserliazeObject(bytes);
+                return wrapper.getEvent();
         }
 

trunk/objectmq/src/omq/ztest/calculator/Calculator.java

@@ -16 +16 @@
         @AsyncMethod
         public void mult(int x, int y);
-        
+
+        @AsyncMethod
+        public void sendMessage(Message m);
+
         @AsyncMethod
         public void divideByZero() throws IOException, SerializerException;

trunk/objectmq/src/omq/ztest/calculator/CalculatorImpl.java

@@ -3 +3 @@
 import java.io.IOException;
 
+import omq.client.annotation.AsyncMethod;
 import omq.exception.SerializerException;
 import omq.server.remote.request.RemoteObject;
@@ -36 +37 @@
         }
 
+        @Override
+        @AsyncMethod
+        public void sendMessage(Message m) {
+                System.out.println("Code = "+m.getCode());
+                System.out.println("Message = "+m.getMessage());
+        }
+        
+        
+
 }

trunk/objectmq/src/omq/ztest/calculator/CalculatorTest.java

@@ -24 +24 @@
                 env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
                 env.setProperty(ParameterQueue.SERVER_PORT, "5672");
-//              env.setProperty(ParameterQueue.SERIALIZERNAME, "omq.common.util.Serializers.KryoImp");
+                // env.setProperty(ParameterQueue.SERIALIZERNAME,
+                // "omq.common.util.Serializers.KryoImp");
                 env.setProperty(ParameterQueue.SERIALIZERNAME, "omq.common.util.Serializers.GsonImp");
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
@@ -82 +83 @@
                 Thread.sleep(200);
         }
+
+        @Test
+        public void sendMessage() throws Exception {
+                Message m = new Message(2334, "Hello objectmq");
+                remoteCalc.sendMessage(m);
+        }
 }

trunk/objectmq/src/omq/ztest/calculator/ServerTest.java

@@ -32 +32 @@
                 Broker.bind("calculator1", calc);
                 Broker.bind("calculator2", calc2);
+
+                System.out.println("Server started");
         }
 }