Changeset 53 for trunk/src/main/java/omq/client/proxy

Timestamp:

06/20/13 16:57:39 (11 years ago)

Author:

stoda

Message:

Non static broker
TODO: change all test to see whether the new broker configuration works

File:

• trunk/src/main/java/omq/client/proxy/Proxymq.java (modified) (4 diffs)

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

@@ -51 +51 @@
         private String uid;
         private transient String serializerType;
+        private transient Broker broker;
         private transient ResponseListener rListener;
         private transient EventDispatcher dispatcher;
+        private transient Serializer serializer;
         // private transient Channel channel;
         private transient Properties env;
@@ -85 +87 @@
          * @throws Exception
          */
-        public Proxymq(String uid, Class<?> clazz, Properties env) throws Exception {
+        public Proxymq(String uid, Class<?> clazz, Broker broker) throws Exception {
                 this.uid = uid;
-                this.rListener = ResponseListener.getRequestListener();
-                this.dispatcher = EventDispatcher.getDispatcher();
+                this.broker = broker;
+                rListener = broker.getResponseListener();
+                dispatcher = broker.getEventDispatcher();
+                serializer = broker.getSerializer();
 
                 // TODO what is better to use a new channel or to use the same?
                 // this.channel = Broker.getChannel();
-                this.env = env;
+                env = broker.getEnvironment();
 
                 // set the serializer type
@@ -160 +164 @@
 
                 // Publish the message
-                byte[] bytesRequest = Serializer.serialize(serializerType, request);
+                byte[] bytesRequest = serializer.serialize(serializerType, request);
                 // TODO See this
                 // channel.basicPublish(exchange, routingkey, props, bytesRequest);
-                Broker.getChannel().basicPublish(exchange, routingkey, props, bytesRequest);
+                broker.getChannel().basicPublish(exchange, routingkey, props, bytesRequest);
                 // Log.saveLog("Client-Serialize", bytesRequest);
         }
@@ -232 +236 @@
                                 throw new TimeoutException("Timeout exception time: " + timeout);
                         }
-                        resp = Serializer.deserializeResponse(results.get(corrId), type);
+                        resp = serializer.deserializeResponse(results.get(corrId), type);
                         // Log.saveLog("Client-Deserialize", results.get(corrId));