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

Timestamp:

06/29/13 20:44:27 (11 years ago)

Author:

stoda

Message:

Events deleted instead of them there's a new example of how to use the observer pattern

Location:

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

Files:

• Serializer.java (modified) (5 diffs)
• Serializers/GsonImp.java (modified) (2 diffs)
• Serializers/ISerializer.java (modified) (2 diffs)
• Serializers/JavaImp.java (modified) (2 diffs)
• Serializers/KryoImp.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import java.util.Properties;
 
-import omq.common.event.Event;
 import omq.common.message.Request;
 import omq.common.message.Response;
@@ -48 +47 @@
                         try {
                                 String className = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.JAVA);
-                                
+
                                 if (className == null || className.isEmpty()) {
                                         throw new ClassNotFoundException("Class name is null or empty.");
                                 }
-                                
+
                                 serializer = getInstance(className);
                         } catch (Exception ex) {
@@ -62 +61 @@
         }
 
-        public ISerializer getInstance(String type) throws SerializerException {                                
+        public ISerializer getInstance(String type) throws SerializerException {
                 if (KRYO.equals(type)) {
                         if (kryoSerializer == null) {
@@ -79 +78 @@
                         return javaSerializer;
                 }
-                
+
                 throw new SerializerException("Serializer not found.");
         }
@@ -148 +147 @@
         }
 
-        public Event deserializeEvent(byte[] bytes) throws SerializerException {
-                ISerializer instance = getInstance();
-
-                Boolean enableCompression = getEnableCompression();
-                if (enableCompression) {
-                        try {
-                                byte[] unZippedBytes = Zipper.unzip(bytes);
-                                return instance.deserializeEvent(unZippedBytes);
-                        } catch (IOException e) {
-                                throw new SerializerException(e.getMessage(), e);
-                        }
-                } else {
-                        return instance.deserializeEvent(bytes);
-                }
-        }
-
-        // public static void removeSerializers() {
-        // logger.warn("Removing serializers");
-        // serializer = null;
-        // kryoSerializer = null;
-        // javaSerializer = null;
-        // gsonSerializer = null;
-        // }
 }

trunk/src/main/java/omq/common/util/Serializers/GsonImp.java

@@ -3 +3 @@
 import java.util.List;
 
-import omq.common.event.Event;
 import omq.common.message.Request;
 import omq.common.message.Response;
@@ -75 +74 @@
         }
 
-        @Override
-        public Event deserializeEvent(byte[] bytes) throws SerializerException {
-                try {
-                        String json = new String(bytes);
-
-                        JsonParser parser = new JsonParser();
-                        JsonObject jsonObj = parser.parse(json).getAsJsonObject();
-
-                        String type = jsonObj.get("type").getAsString();
-
-                        JsonElement jsonElement = jsonObj.get("event");
-                        Event event;
-
-                        event = (Event) gson.fromJson(jsonElement, Class.forName(type));
-
-                        return event;
-                } catch (Exception e) {
-                        throw new SerializerException("Deserialize event", e.getCause());
-                }
-        }
-
 }

trunk/src/main/java/omq/common/util/Serializers/ISerializer.java

@@ -1 +1 @@
 package omq.common.util.Serializers;
 
-import omq.common.event.Event;
 import omq.common.message.Request;
 import omq.common.message.Response;
@@ -18 +17 @@
 
         public Response deserializeResponse(byte[] bytes, Class<?> type) throws SerializerException;
-
-        public Event deserializeEvent(byte[] bytes) throws SerializerException;
 }

trunk/src/main/java/omq/common/util/Serializers/JavaImp.java

@@ -6 +6 @@
 import java.io.ObjectOutputStream;
 
-import omq.common.event.Event;
-import omq.common.event.EventWrapper;
 import omq.common.message.Request;
 import omq.common.message.Response;
@@ -51 +49 @@
         }
 
-        @Override
-        public Event deserializeEvent(byte[] bytes) throws SerializerException {
-                EventWrapper wrapper = (EventWrapper) deserializeObject(bytes);
-                return wrapper.getEvent();
-        }
-
         public Object deserializeObject(byte[] bytes) throws SerializerException {
                 try {

trunk/src/main/java/omq/common/util/Serializers/KryoImp.java

@@ -3 +3 @@
 import java.io.ByteArrayOutputStream;
 
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
-
-import omq.common.event.Event;
-import omq.common.event.EventWrapper;
 import omq.common.message.Request;
 import omq.common.message.Response;
 import omq.exception.SerializerException;
 import omq.server.RemoteObject;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
 
 /**
@@ -53 +51 @@
         }
 
-        @Override
-        public Event deserializeEvent(byte[] bytes) throws SerializerException {
-                EventWrapper wrapper = (EventWrapper) deserializeObject(bytes, EventWrapper.class);
-                return wrapper.getEvent();
-        }
-
         public Object deserializeObject(byte[] bytes, Class<?> type) throws SerializerException {
                 try {