Changeset 62 for trunk/src

Timestamp:

06/26/13 11:20:06 (11 years ago)

Author:

gguerrero

Message:

 

Location:

trunk

Files:

• . (modified) (1 prop)
• src/main/java/omq/client/proxy/Proxymq.java (modified) (1 diff)
• src/main/java/omq/common/util/Serializer.java (modified) (4 diffs)
• src/main/java/omq/exception/SerializerException.java (modified) (1 diff)
• src/test/java/omq/test/calculator/CalculatorTest.java (modified) (1 diff)
• src/test/java/omq/test/exception/ExceptionTest.java (modified) (1 diff)
• src/test/java/omq/test/faultTolerance/FaultToleranceTest.java (modified) (1 diff)
• src/test/java/omq/test/multiProcess/MultiProcessTest.java (modified) (1 diff)
• src/test/java/omq/test/stopBroker/StopBrokerTest.java (modified) (1 diff)
• src/test/java/omq/test/temporal/ProvaTest.java (modified) (1 diff)

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

@@ -98 +98 @@
 
                 // set the serializer type
-                serializerType = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
+                serializerType = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.JAVA);
 
                 listeners = new HashMap<String, EventListener<?>>();

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

@@ -22 +22 @@
         // 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";
+        public static final String KRYO = "kryo";
+        public static final String JAVA = "java";
+        public static final String GSON = "gson";
 
         // Client serializer
@@ -47 +47 @@
                 if (serializer == null) {
                         try {
-                                String className = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
-
+                                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 +62 @@
         }
 
-        public ISerializer getInstance(String type) throws SerializerException {
-                if (kryo.equals(type)) {
+        public ISerializer getInstance(String type) throws SerializerException {                                
+                if (KRYO.equals(type)) {
                         if (kryoSerializer == null) {
                                 kryoSerializer = new KryoImp();
                         }
                         return kryoSerializer;
-                } else if (gson.endsWith(type)) {
+                } else if (GSON.equals(type)) {
                         if (gsonSerializer == null) {
                                 gsonSerializer = new GsonImp();
                         }
                         return gsonSerializer;
-                } else {
+                } else if (JAVA.equals(type)) {
                         if (javaSerializer == null) {
                                 javaSerializer = new JavaImp();
@@ -79 +79 @@
                         return javaSerializer;
                 }
+                
+                throw new SerializerException("Serializer not found.");
         }
 

trunk/src/main/java/omq/exception/SerializerException.java

@@ -8 +8 @@
         private static final long serialVersionUID = 1L;
 
+        public SerializerException(String message) {
+                super(message);
+        }       
+        
         public SerializerException(String message, Throwable cause) {
                 super(message, cause);

trunk/src/test/java/omq/test/calculator/CalculatorTest.java

@@ -53 +53 @@
         @Parameters
         public static Collection<Object[]> data() {
-                Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+                Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
                 return Arrays.asList(data);
         }

trunk/src/test/java/omq/test/exception/ExceptionTest.java

@@ -50 +50 @@
         @Parameters
         public static Collection<Object[]> data() {
-                Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+                Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
                 return Arrays.asList(data);
         }

trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java

@@ -53 +53 @@
         @Parameters
         public static Collection<Object[]> data() {
-                Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+                Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
                 return Arrays.asList(data);
         }

trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java

@@ -49 +49 @@
         @Parameters
         public static Collection<Object[]> data() {
-                Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+                Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
                 return Arrays.asList(data);
         }

trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java

@@ -50 +50 @@
         @Parameters
         public static Collection<Object[]> data() {
-                Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+                Object[][] data = new Object[][] { { Serializer.JAVA }, { Serializer.GSON }, { Serializer.KRYO } };
                 return Arrays.asList(data);
         }

trunk/src/test/java/omq/test/temporal/ProvaTest.java

@@ -77 +77 @@
         @Parameters
         public static Collection<Object[]> data() {
-                Object[][] data = new Object[][] { { Serializer.java } /*
+                Object[][] data = new Object[][] { { Serializer.JAVA } /*
                                                                                                                                  * , {
                                                                                                                                  * Serializer