Changeset 54 for trunk/src/main/java/omq/client

Timestamp:

06/21/13 12:42:25 (11 years ago)

Author:

stoda

Message:

Adding @MultiMethod?
Broker is not a singleton.

Location:

trunk/src/main/java/omq/client

Files:

• annotation/MultiMethod.java (added)
• listener/ResponseListener.java (modified) (2 diffs)
• proxy/Proxymq.java (modified) (7 diffs)

trunk/src/main/java/omq/client/listener/ResponseListener.java

@@ -55 +55 @@
         @Override
         public void run() {
+                logger.info("ResponseListener started");
                 Delivery delivery;
                 String uid_request;
@@ -122 +123 @@
 
                 channel.queueDeclare(reply_queue, durable, false, false, args);
+                logger.info("ResponseListener creating queue: " + reply_queue + ", durable: " + durable);
 
                 // Declare a new consumer

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

@@ -15 +15 @@
 import omq.Remote;
 import omq.client.annotation.AsyncMethod;
+import omq.client.annotation.MultiMethod;
 import omq.client.annotation.SyncMethod;
 import omq.client.listener.ResponseListener;
@@ -133 +134 @@
                 Request request = createRequest(method, arguments);
 
-                // Log.saveTimeSendRequestLog("Client-time-request", request.getId(),
-                // method.getName(), timeStart);
-
                 Object response = null;
                 // Publish the request
@@ -144 +142 @@
                         logger.debug("Publish sync request -> " + request.getId());
                         response = publishSyncRequest(request, method.getReturnType());
-
-                        // long timeEnd = (new Date()).getTime();
-                        // Log.saveTimeSendRequestLog("Client-time-response",
-                        // request.getId(), method.getName(), timeEnd);
                 }
 
@@ -168 +162 @@
                 // channel.basicPublish(exchange, routingkey, props, bytesRequest);
                 broker.getChannel().basicPublish(exchange, routingkey, props, bytesRequest);
-                // Log.saveLog("Client-Serialize", bytesRequest);
         }
 
@@ -203 +196 @@
                 String corrId = java.util.UUID.randomUUID().toString();
                 String methodName = method.getName();
+                boolean multi = false;
+
+                if (method.getAnnotation(MultiMethod.class) != null) {
+                        multi = true;
+                }
 
                 // Since we need to know whether the method is async and if it has to
@@ -217 +215 @@
                         return Request.newSyncRequest(corrId, methodName, arguments, retries, timeout);
                 } else {
-                        return Request.newAsyncRequest(corrId, methodName, arguments);
+                        return Request.newAsyncRequest(corrId, methodName, arguments, multi);
                 }
         }
@@ -237 +235 @@
                         }
                         resp = serializer.deserializeResponse(results.get(corrId), type);
-                        // Log.saveLog("Client-Deserialize", results.get(corrId));
 
                         // Remove and indicate the key exists (a hashmap can contain a null