Changeset 53 for trunk/src/main/java/omq/common/util

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

Location:

trunk/src/main/java/omq/common/util

Files:

• Log.java (deleted)
• Serializer.java (modified) (9 diffs)

trunk/src/main/java/omq/common/util/Serializer.java

@@ -4 +4 @@
 import java.util.Properties;
 
-import org.apache.log4j.Logger;
-
-import omq.common.broker.Broker;
 import omq.common.event.Event;
 import omq.common.message.Request;
@@ -23 +20 @@
  */
 public class Serializer {
-        private static final Logger logger = Logger.getLogger(Serializer.class.getName());
-        public static String kryo = "kryo";
-        public static String java = "java";
-        public static String gson = "gson";
+        // private static final Logger logger =
+        // Logger.getLogger(Serializer.class.getName());
+        public static final String kryo = "kryo";
+        public static final String java = "java";
+        public static final String gson = "gson";
 
         // Client serializer
-        public static ISerializer serializer;
+        public ISerializer serializer;
 
         // Server serializers
-        private static ISerializer kryoSerializer;
-        private static ISerializer javaSerializer;
-        private static ISerializer gsonSerializer;
+        private ISerializer kryoSerializer;
+        private ISerializer javaSerializer;
+        private ISerializer gsonSerializer;
 
-        private static Boolean getEnableCompression() {
-                Properties env = Broker.getEnvironment();
+        private Properties env;
+
+        public Serializer(Properties env) {
+                this.env = env;
+        }
+
+        private Boolean getEnableCompression() {
                 return Boolean.valueOf(env.getProperty(ParameterQueue.ENABLECOMPRESSION, "false"));
         }
 
-        public static ISerializer getInstance() throws SerializerException {
+        public ISerializer getInstance() throws SerializerException {
                 if (serializer == null) {
                         try {
-                                Properties env = Broker.getEnvironment();
                                 String className = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
 
@@ -60 +62 @@
         }
 
-        public static ISerializer getInstance(String type) throws SerializerException {
+        public ISerializer getInstance(String type) throws SerializerException {
                 if (kryo.equals(type)) {
                         if (kryoSerializer == null) {
@@ -79 +81 @@
         }
 
-        public static byte[] serialize(String type, Object obj) throws SerializerException {
+        public byte[] serialize(String type, Object obj) throws SerializerException {
                 ISerializer instance = getInstance(type);
 
@@ -96 +98 @@
 
         // TODO: remove this function and think about the event serialization
-        public static byte[] serialize(Object obj) throws SerializerException {
+        public byte[] serialize(Object obj) throws SerializerException {
                 ISerializer instance = getInstance();
 
@@ -112 +114 @@
         }
 
-        public static Request deserializeRequest(String type, byte[] bytes, RemoteObject obj) throws SerializerException {
+        public Request deserializeRequest(String type, byte[] bytes, RemoteObject obj) throws SerializerException {
                 ISerializer instance = getInstance(type);
 
@@ -128 +130 @@
         }
 
-        public static Response deserializeResponse(byte[] bytes, Class<?> type) throws SerializerException {
+        public Response deserializeResponse(byte[] bytes, Class<?> type) throws SerializerException {
                 ISerializer instance = getInstance();
 
@@ -144 +146 @@
         }
 
-        public static Event deserializeEvent(byte[] bytes) throws SerializerException {
+        public Event deserializeEvent(byte[] bytes) throws SerializerException {
                 ISerializer instance = getInstance();
 
@@ -160 +162 @@
         }
 
-        public static void removeSerializers() {
-                logger.warn("Removing serializers");
-                serializer = null;
-                kryoSerializer = null;
-                javaSerializer = null;
-                gsonSerializer = null;
-        }
+        // public static void removeSerializers() {
+        // logger.warn("Removing serializers");
+        // serializer = null;
+        // kryoSerializer = null;
+        // javaSerializer = null;
+        // gsonSerializer = null;
+        // }
 }