Changeset 47 for trunk/src/main/java/omq/common/util/Serializer.java

Timestamp:

06/18/13 16:51:22 (11 years ago)

Author:

stoda

Message:

Refactoring Environment class - deleted.
StopBroker? problems solved (?)
Server can receive send and receive messages in different formats.
Some tests modified

TODO: finish all the tests, add log4j

File:

• trunk/src/main/java/omq/common/util/Serializer.java (modified) (8 diffs)

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

@@ -4 +4 @@
 import java.util.Properties;
 
+import omq.common.broker.Broker;
 import omq.common.event.Event;
 import omq.common.message.Request;
@@ -11 +12 @@
 import omq.common.util.Serializers.JavaImp;
 import omq.common.util.Serializers.KryoImp;
-import omq.exception.EnvironmentException;
 import omq.exception.SerializerException;
 import omq.server.RemoteObject;
@@ -21 +21 @@
  */
 public class Serializer {
-        public static String kryo = KryoImp.class.getCanonicalName();
-        public static String java = JavaImp.class.getCanonicalName();
-        public static String gson = GsonImp.class.getCanonicalName();
+        public static String kryo = "kryo";
+        public static String java = "java";
+        public static String gson = "gson";
 
+        // Client serializer
         public static ISerializer serializer;
 
+        // Server serializers
+        private static ISerializer kryoSerializer;
+        private static ISerializer javaSerializer;
+        private static ISerializer gsonSerializer;
+
         private static Boolean getEnableCompression() {
-                Boolean enableCompression = false;
-                try {
-                        Properties env = Environment.getEnvironment();
-                        enableCompression = Boolean.valueOf(env.getProperty(ParameterQueue.ENABLECOMPRESSION, "false"));
-                } catch (EnvironmentException e) {
-                        e.printStackTrace();
-                }
-
-                return enableCompression;
+                Properties env = Broker.getEnvironment();
+                return Boolean.valueOf(env.getProperty(ParameterQueue.ENABLECOMPRESSION, "false"));
         }
 
@@ -42 +41 @@
                 if (serializer == null) {
                         try {
-                                Properties env = Environment.getEnvironment();
+                                Properties env = Broker.getEnvironment();
                                 String className = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
 
@@ -49 +48 @@
                                 }
 
-                                serializer = (ISerializer) Class.forName(className).newInstance();
+                                serializer = getInstance(className);
                         } catch (Exception ex) {
                                 throw new SerializerException(ex.getMessage(), ex);
@@ -58 +57 @@
         }
 
+        public static ISerializer getInstance(String type) throws SerializerException {
+                if (kryo.equals(type)) {
+                        if (kryoSerializer == null) {
+                                kryoSerializer = new KryoImp();
+                        }
+                        return kryoSerializer;
+                } else if (gson.endsWith(type)) {
+                        if (gsonSerializer == null) {
+                                gsonSerializer = new GsonImp();
+                        }
+                        return gsonSerializer;
+                } else {
+                        if (javaSerializer == null) {
+                                javaSerializer = new JavaImp();
+                        }
+                        return javaSerializer;
+                }
+        }
+
+        public static byte[] serialize(String type, Object obj) throws SerializerException {
+                ISerializer instance = getInstance(type);
+
+                Boolean enableCompression = getEnableCompression();
+                if (enableCompression) {
+                        byte[] objSerialized = instance.serialize(obj);
+                        try {
+                                return Zipper.zip(objSerialized);
+                        } catch (IOException e) {
+                                throw new SerializerException(e.getMessage(), e);
+                        }
+                } else {
+                        return instance.serialize(obj);
+                }
+        }
+
+        // TODO: remove this function and think about the event serialization
         public static byte[] serialize(Object obj) throws SerializerException {
                 ISerializer instance = getInstance();
@@ -74 +109 @@
         }
 
-        public static Request deserializeRequest(byte[] bytes, RemoteObject obj) throws SerializerException {
-                ISerializer instance = getInstance();
+        public static Request deserializeRequest(String type, byte[] bytes, RemoteObject obj) throws SerializerException {
+                ISerializer instance = getInstance(type);
 
                 Boolean enableCompression = getEnableCompression();
@@ -121 +156 @@
                 }
         }
+
+        public static void removeSerializers() {
+                serializer = null;
+                kryoSerializer = null;
+                javaSerializer = null;
+                gsonSerializer = null;
+        }
 }