few updates on logs

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.activemq / src / main / java / org / argeo / slc / jms / MarshallerMessageConverter.java

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/MarshallerMessageConverter.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/MarshallerMessageConverter.java
index 31e6354452a6465987879062daae8586270c5561..5a54a96cefe9c2723339325332a04bdc37651aae 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/MarshallerMessageConverter.java
+++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/MarshallerMessageConverter.java
@@ -1,9 +1,27 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.jms;
 
+import java.io.Serializable;
 import java.util.Enumeration;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
+import javax.jms.ObjectMessage;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
@@ -24,13 +42,16 @@ public class MarshallerMessageConverter implements MessageConverter {
        private Marshaller marshaller;
        private Unmarshaller unmarshaller;
 
+       /** Use unmarshalled ObjectMessages instead of TextMessages */
+       private Boolean disableMarshalling = false;
+
        /** @return the converted message or null if the message itself is null */
+       @SuppressWarnings("unchecked")
        public Object fromMessage(Message message) throws JMSException,
                        MessageConversionException {
-               if (message == null) {
+               long begin = System.currentTimeMillis();
+               if (message == null)
                        return null;
-               }
-
                if (log.isTraceEnabled()) {
                        Enumeration<String> names = message.getPropertyNames();
                        while (names.hasMoreElements()) {
@@ -40,35 +61,51 @@ public class MarshallerMessageConverter implements MessageConverter {
                        }
                }
 
+               Object res;
                if (message instanceof TextMessage) {
-
                        String text = ((TextMessage) message).getText();
-
                        if (text == null)
                                throw new SlcException(
                                                "Cannot unmarshall message without body: " + message);
-
                        try {
-                               return unmarshaller.unmarshal(new StringSource(text));
+                               res = unmarshaller.unmarshal(new StringSource(text));
                        } catch (Exception e) {
                                throw new SlcException("Could not unmarshall " + text, e);
                        }
+               } else if (message instanceof ObjectMessage) {
+                       res = ((ObjectMessage) message).getObject();
+                       if (res == null)
+                               throw new SlcException("Message without body: " + message);
                } else {
                        throw new SlcException("This type of messages is not supported: "
                                        + message);
                }
+               if (log.isTraceEnabled())
+                       log.trace("'From' message processed in " + (System.currentTimeMillis() - begin)
+                                       + " ms");
+               return res;
        }
 
        public Message toMessage(Object object, Session session)
                        throws JMSException, MessageConversionException {
-               StringResult result = new StringResult();
-               try {
-                       marshaller.marshal(object, result);
-               } catch (Exception e) {
-                       throw new SlcException("Could not marshall " + object, e);
+               long begin = System.currentTimeMillis();
+               Message msg;
+               if (disableMarshalling) {
+                       msg = session.createObjectMessage();
+                       ((ObjectMessage) msg).setObject((Serializable) object);
+               } else {
+                       StringResult result = new StringResult();
+                       try {
+                               marshaller.marshal(object, result);
+                       } catch (Exception e) {
+                               throw new SlcException("Could not marshall " + object, e);
+                       }
+                       msg = session.createTextMessage();
+                       ((TextMessage) msg).setText(result.toString());
                }
-               TextMessage msg = session.createTextMessage();
-               msg.setText(result.toString());
+               if (log.isTraceEnabled())
+                       log.trace("'To' message processed in " + (System.currentTimeMillis() - begin)
+                                       + " ms");
                return msg;
        }
 
@@ -80,4 +117,8 @@ public class MarshallerMessageConverter implements MessageConverter {
                this.unmarshaller = unmarshaller;
        }
 
+       public void setDisableMarshalling(Boolean disableMarshalling) {
+               this.disableMarshalling = disableMarshalling;
+       }
+
 }