Changeset 38

Timestamp:

06/13/13 17:19:52 (11 years ago)

Author:

stoda

Message:

Remote exception added
todo: change throws Exception to Throwable since it seems that NoSuchMethodException? does not inherit from Exception...

Location:

trunk/objectmq

Files:

• src/omq/client/proxy/Proxymq.java (modified) (2 diffs)
• src/omq/common/broker/Broker.java (modified) (2 diffs)
• src/omq/common/message/Request.java (modified) (4 diffs)
• src/omq/common/message/Response.java (modified) (3 diffs)
• src/omq/common/util/Serializers/GsonImp.java (modified) (3 diffs)
• src/omq/exception/OmqException.java (added)
• src/omq/server/InvocationThread.java (modified) (6 diffs)
• src/omq/server/RemoteObject.java (modified) (1 diff)
• test/calculatorTest/Calculator.java (modified) (1 diff)
• test/calculatorTest/CalculatorImpl.java (modified) (4 diffs)
• test/calculatorTest/ClientTest.java (modified) (3 diffs)
• test/calculatorTest/ServerTest.java (modified) (1 diff)
• test/exceptionTest (added)
• test/exceptionTest/ClientInterface.java (added)
• test/exceptionTest/ClientTest.java (added)
• test/exceptionTest/OmqServerImpl.java (added)
• test/exceptionTest/ServerInterface.java (added)
• test/exceptionTest/ServerTest.java (added)
• test/exceptionTest/Trailer.java (added)

trunk/objectmq/src/omq/client/proxy/Proxymq.java

@@ -24 +24 @@
 import omq.common.util.Serializer;
 import omq.exception.NoContainsInstanceException;
+import omq.exception.OmqException;
 import omq.exception.RetryException;
 import omq.exception.SerializerException;
@@ -234 +235 @@
                 }
 
+                if (resp.getError() != null) {
+                        OmqException error = resp.getError();
+                        String name = error.getType();System.out.println("Name: "+name);
+                        String message = error.getMessage();
+                        throw (Exception) Class.forName(name).getConstructor(String.class).newInstance(message);
+                }
+
                 return resp.getResult();
         }

trunk/objectmq/src/omq/common/broker/Broker.java

@@ -196 +196 @@
          */
         public static void tryConnection(Properties env) throws Exception {
-                System.out.println("hola");
                 Channel channel = connection.createChannel();
                 String message = "ping";
@@ -221 +220 @@
 
                 if (!message.equalsIgnoreCase(new String(delivery.getBody()))) {
-                        throw new IOException("Ping-pong initialitzation has failed");
+                        throw new IOException("Ping initialitzation has failed");
                 }
         }

trunk/objectmq/src/omq/common/message/Request.java

@@ -10 +10 @@
         private static final long serialVersionUID = 6366255840200365083L;
 
+        private String method;
+        private Object[] params;
         private String id;
-        private String method;
         private boolean async = false;
-        private Object[] arguments;
 
         private transient long timeout;
@@ -21 +21 @@
         }
 
-        public Request(String id, String method, Object[] arguments) {
+        public Request(String id, String method, Object[] params) {
                 this.id = id;
                 this.method = method;
-                this.arguments = arguments;
+                this.params = params;
         }
 
-        private Request(String id, String method, boolean async, Object[] arguments) {
+        private Request(String id, String method, boolean async, Object[] params) {
                 this.id = id;
                 this.method = method;
                 this.async = async;
-                this.arguments = arguments;
+                this.params = params;
         }
 
-        public static Request newSyncRequest(String id, String method, Object[] arguments) {
-                return new Request(id, method, false, arguments);
+        public static Request newSyncRequest(String id, String method, Object[] params) {
+                return new Request(id, method, false, params);
         }
 
-        public static Request newSyncRequest(String id, String method, Object[] arguments, int retries, long timeout) {
-                Request req = new Request(id, method, false, arguments);
+        public static Request newSyncRequest(String id, String method, Object[] params, int retries, long timeout) {
+                Request req = new Request(id, method, false, params);
                 req.setRetries(retries);
                 req.setTimeout(timeout);
@@ -45 +45 @@
         }
 
-        public static Request newAsyncRequest(String id, String method, Object[] arguments) {
-                return new Request(id, method, true, arguments);
+        public static Request newAsyncRequest(String id, String method, Object[] params) {
+                return new Request(id, method, true, params);
         }
 
@@ -65 +65 @@
         }
 
-        public Object[] getArguments() {
-                return arguments;
+        public Object[] getParams() {
+                return params;
         }
 
-        public void setArguments(Object[] arguments) {
-                this.arguments = arguments;
+        public void setParams(Object[] params) {
+                this.params = params;
         }
 

trunk/objectmq/src/omq/common/message/Response.java

@@ -2 +2 @@
 
 import java.io.Serializable;
+
+import omq.exception.OmqException;
 
 public class Response implements Serializable {
@@ -10 +12 @@
         private static final long serialVersionUID = 3368363997012527189L;
 
+        private Object result;
+        private OmqException error;
         private String id;
         private String idOmq;
-        private Object result;
 
         public Response() {
         }
 
-        public Response(String id, String idOmq, Object result) {
+        public Response(String id, String idOmq, Object result, OmqException error) {
                 this.id = id;
                 this.idOmq = idOmq;
                 this.result = result;
+                this.error = error;
         }
 
@@ -47 +51 @@
         }
 
+        public OmqException getError() {
+                return error;
+        }
+
+        public void setError(OmqException error) {
+                this.error = error;
+        }
+
 }

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

@@ -6 +6 @@
 import omq.common.message.Request;
 import omq.common.message.Response;
+import omq.exception.OmqException;
 import omq.exception.SerializerException;
 import omq.server.RemoteObject;
@@ -69 +70 @@
                 Object result = gson.fromJson(jsonElement, type);
 
-                return new Response(id, idOmq, result);
+                JsonElement jsonError = jsonObj.get("error");
+                OmqException error = gson.fromJson(jsonError, OmqException.class);
+
+                return new Response(id, idOmq, result, error);
         }
 
@@ -77 +81 @@
                         String json = new String(bytes);
                         System.out.println(json);
-                        
+
                         JsonParser parser = new JsonParser();
                         JsonObject jsonObj = parser.parse(json).getAsJsonObject();

trunk/objectmq/src/omq/server/InvocationThread.java

@@ -1 +1 @@
 package omq.server;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.BlockingQueue;
 
@@ -6 +7 @@
 import omq.common.message.Response;
 import omq.common.util.Serializer;
+import omq.exception.OmqException;
 
 import com.rabbitmq.client.AMQP.BasicProperties;
@@ -35 +37 @@
                                 // Deserialize the json
                                 Request request = Serializer.deserializeRequest(delivery.getBody(), obj);
-                                //Log.saveLog("Server-Deserialize", delivery.getBody());
+                                // Log.saveLog("Server-Deserialize", delivery.getBody());
 
                                 String methodName = request.getMethod();
@@ -42 +44 @@
                                 System.out.println("Invoke method: " + methodName + " CorrID: " + requestID);
 
-                                 // Invoke the method
-                                 Object result = obj.invokeMethod(request.getMethod(),
-                                 request.getArguments());
+                                // Invoke the method
+                                Object result = null;
+                                OmqException error = null;
+                                try {
+                                        result = obj.invokeMethod(request.getMethod(), request.getParams());
+                                } catch (InvocationTargetException e) {
+                                        Throwable throwable = e.getTargetException();
+                                        error = new OmqException(throwable.getClass().getCanonicalName(), throwable.getMessage());
+                                } catch (NoSuchMethodException e) {
+                                        error = new OmqException(e.getClass().getCanonicalName(), e.getMessage());
+                                }
 
+                                // Reply if it's necessary
                                 if (!request.isAsync()) {
-                                        Response resp = new Response(request.getId(), obj.getRef(), result);
+                                        Response resp = new Response(request.getId(), obj.getRef(), result, error);
 
                                         Channel channel = obj.getChannel();
@@ -58 +69 @@
                                         channel.basicPublish("", props.getReplyTo(), replyProps, bytesResponse);
 
-                                        //Log.saveLog("Server-Serialize", bytesResponse);
+                                        // Log.saveLog("Server-Serialize", bytesResponse);
                                 }
 
@@ -69 +80 @@
                         }
 
-                }System.out.println("Invocation Thread dies!!");
+                }
+                System.out.println("Invocation Thread dies!!");
         }
 

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

@@ -166 +166 @@
 
         private Method loadMethodWithPrimitives(String methodName, Class<?>[] argArray) throws NoSuchMethodException {
-                Method[] methods = this.getClass().getMethods();
-                int length = argArray.length;
-
-                for (Method method : methods) {
-                        String name = method.getName();
-                        int argsLength = method.getParameterTypes().length;
-
-                        if (name.equals(methodName) && length == argsLength) {
-                                // This array can have primitive types inside
-                                Class<?>[] params = method.getParameterTypes();
-
-                                boolean found = true;
-
-                                for (int i = 0; i < length; i++) {
-                                        if (params[i].isPrimitive()) {
-                                                Class<?> paramWrapper = primitiveClasses.get(params[i].getName());
-
-                                                if (!paramWrapper.equals(argArray[i])) {
-                                                        found = false;
-                                                        break;
+                if (argArray != null) {
+                        Method[] methods = this.getClass().getMethods();
+                        int length = argArray.length;
+
+                        for (Method method : methods) {
+                                String name = method.getName();
+                                int argsLength = method.getParameterTypes().length;
+
+                                if (name.equals(methodName) && length == argsLength) {
+                                        // This array can have primitive types inside
+                                        Class<?>[] params = method.getParameterTypes();
+
+                                        boolean found = true;
+
+                                        for (int i = 0; i < length; i++) {
+                                                if (params[i].isPrimitive()) {
+                                                        Class<?> paramWrapper = primitiveClasses.get(params[i].getName());
+
+                                                        if (!paramWrapper.equals(argArray[i])) {
+                                                                found = false;
+                                                                break;
+                                                        }
                                                 }
                                         }
-                                }
-                                if (found) {
-                                        return method;
+                                        if (found) {
+                                                return method;
+                                        }
                                 }
                         }

trunk/objectmq/test/calculatorTest/Calculator.java

@@ -21 +21 @@
 
         @AsyncMethod
-        public void divideByZero() throws IOException, SerializerException;
+        public void asyncDivideByZero() throws IOException, SerializerException;
+
+        @SyncMethod
+        public int divideByZero();
 
 }

trunk/objectmq/test/calculatorTest/CalculatorImpl.java

@@ -3 +3 @@
 import java.io.IOException;
 
-import omq.client.annotation.AsyncMethod;
 import omq.common.broker.Broker;
 import omq.exception.SerializerException;
@@ -17 +16 @@
         private static final long serialVersionUID = 1L;
 
+        @Override
         public int add(int x, int y) {
                 return x + y;
         }
 
+        @Override
         public void mult(int x, int y) {
                 mult = x * y;
@@ -33 +34 @@
         }
 
-        public void divideByZero() throws IOException, SerializerException {
+        @Override
+        public void asyncDivideByZero() throws IOException, SerializerException {
                 ZeroEvent ze = new ZeroEvent("my zero event", "zero-event");
                 Broker.trigger(ze);
@@ -40 +42 @@
 
         @Override
-        @AsyncMethod
         public void sendMessage(Message m) {
                 System.out.println("Code = "+m.getCode());
                 System.out.println("Message = "+m.getMessage());
         }
-        
-        
+
+        @Override
+        public int divideByZero() {
+                int x = 2 / 0;
+                return x;
+        }
 
 }

trunk/objectmq/test/calculatorTest/ClientTest.java

@@ -26 +26 @@
                 env.setProperty(ParameterQueue.SERVER_PORT, "5672");
                 env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.kryo);
+                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
@@ -80 +80 @@
                 remoteCalc.addListener(zL);
 
-                remoteCalc.divideByZero();
+                remoteCalc.asyncDivideByZero();
 
                 Thread.sleep(200);
@@ -90 +90 @@
                 remoteCalc.sendMessage(m);
         }
+
+        @Test(expected = ArithmeticException.class)
+        public void divideByZero() {
+                remoteCalc.divideByZero();
+        }
 }

trunk/objectmq/test/calculatorTest/ServerTest.java

@@ -20 +20 @@
                 env.setProperty(ParameterQueue.SERVER_PORT, "5672");
                 env.setProperty(ParameterQueue.DURABLE_QUEUES, "true");
-                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.kryo);
+                env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
                 env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");