Changeset 105

Timestamp:

10/16/13 16:19:02 (11 years ago)

Author:

stoda

Message:

UID changed to reference
TODO: add UID

Location:

branches/supervisor/src/main/java/omq

Files:

• Remote.java (modified) (1 diff)
• client/proxy/MultiProxymq.java (modified) (3 diffs)
• client/proxy/Proxymq.java (modified) (7 diffs)
• server/InvocationThread.java (modified) (7 diffs)
• server/RemoteObject.java (modified) (3 diffs)

branches/supervisor/src/main/java/omq/Remote.java

@@ -17 +17 @@
 
         /**
-         * Returns the UID of a RemoteObject
+         * Returns the reference of a RemoteObject
          * 
-         * @return UID
+         * @return reference
          */
         public String getRef();

branches/supervisor/src/main/java/omq/client/proxy/MultiProxymq.java

@@ -25 +25 @@
         private static final String multi = "multi#";
 
-        private String uid;
+        private String reference;
         private Broker broker;
         private Serializer serializer;
@@ -33 +33 @@
         private transient String serializerType;
 
-        public MultiProxymq(String uid, Class<?> clazz, Broker broker) throws Exception {
-                this.uid = uid;
+        public MultiProxymq(String reference, Class<?> clazz, Broker broker) throws Exception {
+                this.reference = reference;
                 this.broker = broker;
                 serializer = broker.getSerializer();
 
                 Properties env = broker.getEnvironment();
-                exchange = multi + uid;
+                exchange = multi + reference;
                 serializerType = env.getProperty(ParameterQueue.PROXY_SERIALIZER, Serializer.JAVA);
         }
@@ -52 +52 @@
 
                 // Add the correlation ID and create a replyTo property
-                BasicProperties props = new BasicProperties.Builder().appId(uid).correlationId(corrId).type(serializerType).build();
+                BasicProperties props = new BasicProperties.Builder().appId(reference).correlationId(corrId).type(serializerType).build();
 
                 byte[] bytesRequest = serializer.serialize(serializerType, request);
                 broker.publishMessge(exchange, routingkey, props, bytesRequest);
 
-                logger.debug("Proxymq: " + uid + " invokes " + methodName + ", corrID" + corrId + ", exchange: " + exchange + ", replyQueue: " + replyQueueName
+                logger.debug("Proxymq: " + reference + " invokes " + methodName + ", corrID" + corrId + ", exchange: " + exchange + ", replyQueue: " + replyQueueName
                                 + ", serializerType: " + serializerType + ", multi call: " + request.isMulti() + ", async call: " + request.isAsync());
 

branches/supervisor/src/main/java/omq/client/proxy/Proxymq.java

@@ -46 +46 @@
         private static final String multi = "multi#";
 
-        private String uid;
+        private String reference;
         private transient String exchange;
         private transient String multiExchange;
@@ -72 +72 @@
          * Proxymq Constructor.
          * 
-         * This constructor uses an uid to know which object will call. It also uses
+         * This constructor uses an reference to know which object will call. It also uses
          * Properties to set where to send the messages
          * 
-         * @param uid
-         *            The uid represents the unique identifier of a remote object
+         * @param reference
+         *            The reference represents the unique identifier of a remote object
          * @param clazz
          *            It represents the real class of the remote object. With this
@@ -85 +85 @@
          * @throws Exception
          */
-        public Proxymq(String uid, Class<?> clazz, Broker broker) throws Exception {
-                this.uid = uid;
+        public Proxymq(String reference, Class<?> clazz, Broker broker) throws Exception {
+                this.reference = reference;
                 this.broker = broker;
                 rListener = broker.getResponseListener();
@@ -95 +95 @@
                 env = broker.getEnvironment();
                 exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE, "");
-                multiExchange = multi + uid;
+                multiExchange = multi + reference;
                 replyQueueName = env.getProperty(ParameterQueue.RPC_REPLY_QUEUE);
 
@@ -165 +165 @@
                 } else {
                         exchange = this.exchange;
-                        routingkey = uid;
+                        routingkey = reference;
                 }
 
                 // Add the correlation ID and create a replyTo property
-                BasicProperties props = new BasicProperties.Builder().appId(uid).correlationId(corrId).replyTo(replyQueueName).type(serializerType)
+                BasicProperties props = new BasicProperties.Builder().appId(reference).correlationId(corrId).replyTo(replyQueueName).type(serializerType)
                                 .deliveryMode(deliveryMode).build();
 
@@ -175 +175 @@
                 byte[] bytesRequest = serializer.serialize(serializerType, request);
                 broker.publishMessge(exchange, routingkey, props, bytesRequest);
-                logger.debug("Proxymq: " + uid + " invokes '" + request.getMethod() + "' , corrID: " + corrId + ", exchange: " + exchange + ", replyQueue: "
+                logger.debug("Proxymq: " + reference + " invokes '" + request.getMethod() + "' , corrID: " + corrId + ", exchange: " + exchange + ", replyQueue: "
                                 + replyQueueName + ", serializerType: " + serializerType + ", multi call: " + request.isMulti() + ", async call: " + request.isAsync()
                                 + ", delivery mode: " + deliveryMode);
@@ -359 +359 @@
         @Override
         public String getRef() {
-                return uid;
+                return reference;
         }
 

branches/supervisor/src/main/java/omq/server/InvocationThread.java

@@ -35 +35 @@
         // RemoteObject
         private RemoteObject obj;
-        private String UID;
+        private String reference;
         private Properties env;
         private boolean idle;
@@ -54 +54 @@
         public InvocationThread(RemoteObject obj) throws Exception {
                 this.obj = obj;
-                this.UID = obj.getRef();
+                this.reference = obj.getRef();
                 this.env = obj.getEnv();
                 this.broker = obj.getBroker();
@@ -176 +176 @@
                 // Get info about which exchange and queue will use
                 String exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE, "");
-                String queue = UID;
-                String routingKey = UID;
+                String queue = reference;
+                String routingKey = reference;
 
                 // RemoteObject default queue
@@ -192 +192 @@
                         channel.queueBind(queue, exchange, routingKey);
                 }
-                logger.info("RemoteObject: " + UID + " declared direct exchange: " + exchange + ", Queue: " + queue + ", Durable: " + durable + ", Exclusive: "
+                logger.info("RemoteObject: " + reference + " declared direct exchange: " + exchange + ", Queue: " + queue + ", Durable: " + durable + ", Exclusive: "
                                 + exclusive + ", AutoDelete: " + autoDelete);
 
@@ -200 +200 @@
 
                 // Get info about the multiQueue
-                String multiExchange = multi + UID;
-                // TODO:String multiExchange = multi + exchange + UID;
+                String multiExchange = multi + reference;
+                // TODO:String multiExchange = multi + exchange + reference;
                 multiQueue = env.getProperty(ParameterQueue.MULTI_QUEUE_NAME);
 
@@ -217 +217 @@
                 }
                 channel.queueBind(multiQueue, multiExchange, "");
-                logger.info("RemoteObject: " + UID + " declared fanout exchange: " + multiExchange + ", Queue: " + multiQueue + ", Durable: " + multiDurable
+                logger.info("RemoteObject: " + reference + " declared fanout exchange: " + multiExchange + ", Queue: " + multiQueue + ", Durable: " + multiDurable
                                 + ", Exclusive: " + multiExclusive + ", AutoDelete: " + multiAutoDelete);
 
@@ -236 +236 @@
 
         public void kill() throws IOException {
-                logger.info("Killing objectmq: " + UID + " thread id");
+                logger.info("Killing objectmq: " + reference + " thread id");
                 killed = true;
                 interrupt();

branches/supervisor/src/main/java/omq/server/RemoteObject.java

@@ -30 +30 @@
         private static final Logger logger = Logger.getLogger(RemoteObject.class.getName());
 
-        private String UID;
+        private String reference;
         private Properties env;
         private transient Broker broker;
@@ -61 +61 @@
         public void startRemoteObject(String reference, Broker broker, Properties env) throws Exception {
                 this.broker = broker;
-                this.UID = reference;
+                this.reference = reference;
                 this.env = env;
 
@@ -87 +87 @@
         @Override
         public String getRef() {
-                return UID;
+                return reference;
         }