Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9e987fe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9e987fe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9e987fe Branch: refs/heads/master Commit: a9e987fe2eb6201b154d7cffb2ee8cd67fc9019f Parents: 3a526ce Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Nov 9 08:27:45 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Nov 9 08:27:45 2014 +0100 ---------------------------------------------------------------------- .../component/sjms/SjmsExchangeMessageHelper.java | 11 +++++------ .../sjms/consumer/InOutMessageHandler.java | 3 ++- .../camel/component/sjms/jms/JmsMessageHelper.java | 16 ++++------------ .../component/sjms/producer/InOnlyProducer.java | 6 ++++-- 4 files changed, 15 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a9e987fe/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java index f58c570..434a3c2 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsExchangeMessageHelper.java @@ -16,18 +16,12 @@ */ package org.apache.camel.component.sjms; -import static org.apache.camel.component.sjms.SjmsConstants.JMS_MESSAGE_TYPE; -import static org.apache.camel.component.sjms.SjmsConstants.QUEUE_PREFIX; -import static org.apache.camel.component.sjms.SjmsConstants.TOPIC_PREFIX; -import static org.apache.camel.util.ObjectHelper.removeStartingCharacters; - import java.io.ByteArrayOutputStream; import java.util.Enumeration; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; - import javax.jms.BytesMessage; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -56,6 +50,11 @@ import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.camel.component.sjms.SjmsConstants.JMS_MESSAGE_TYPE; +import static org.apache.camel.component.sjms.SjmsConstants.QUEUE_PREFIX; +import static org.apache.camel.component.sjms.SjmsConstants.TOPIC_PREFIX; +import static org.apache.camel.util.ObjectHelper.removeStartingCharacters; + public final class SjmsExchangeMessageHelper { private static final Logger LOGGER = LoggerFactory.getLogger(SjmsExchangeMessageHelper.class); http://git-wip-us.apache.org/repos/asf/camel/blob/a9e987fe/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java index e68c278..9be8d2f 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java @@ -159,7 +159,8 @@ public class InOutMessageHandler extends AbstractMessageHandler { @Override public void done(boolean sync) { try { - Message response = SjmsExchangeMessageHelper.createMessage(exchange, getSession(), ((SjmsEndpoint) getEndpoint()).getJmsKeyFormatStrategy(), ((SjmsEndpoint) getEndpoint()).getCamelContext().getTypeConverter()); + Message response = SjmsExchangeMessageHelper.createMessage(exchange, getSession(), + getEndpoint().getJmsKeyFormatStrategy(), getEndpoint().getCamelContext().getTypeConverter()); response.setJMSCorrelationID(exchange.getIn().getHeader("JMSCorrelationID", String.class)); localProducer.send(response); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/camel/blob/a9e987fe/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java index d57009a..176c776 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java @@ -23,7 +23,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Set; - import javax.jms.BytesMessage; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -98,8 +97,7 @@ public final class JmsMessageHelper { switch (messageType) { case Bytes: - BytesMessage bytesMessage = session.createBytesMessage(); - bytesMessage = typeConverter.convertTo(BytesMessage.class, payload); + BytesMessage bytesMessage = typeConverter.convertTo(BytesMessage.class, payload); answer = bytesMessage; break; case Map: @@ -130,7 +128,6 @@ public final class JmsMessageHelper { baos.write(reads); reads = is.read(); } - BytesMessage bytesStreamMessage = session.createBytesMessage(); bytesStreamMessage.writeBytes(baos.toByteArray()); baos.close(); @@ -160,7 +157,6 @@ public final class JmsMessageHelper { * format keys in a JMS 1.1 compliant manner. If null the * {@link DefaultJmsKeyFormatStrategy} will be used. * @return {@link Message} - * @throws Exception a */ public static Message setJmsMessageHeaders(final Message jmsMessage, Map<String, Object> messageHeaders, KeyFormatStrategy keyFormatStrategy) throws IllegalHeaderException { // Support for the null keyFormatStrategy @@ -266,14 +262,12 @@ public final class JmsMessageHelper { /** * Sets the JMSDeliveryMode on the message. * - * @param exchange the exchange * @param message the message * @param deliveryMode the delivery mode, either as a String or integer - * @throws javax.jms.JMSException is thrown if error setting the delivery - * mode + * @throws javax.jms.JMSException is thrown if error setting the delivery mode */ public static void setJMSDeliveryMode(Message message, Object deliveryMode) throws JMSException { - Integer mode = null; + Integer mode; if (deliveryMode instanceof String) { String s = (String) deliveryMode; @@ -302,9 +296,7 @@ public final class JmsMessageHelper { throw new IllegalArgumentException("Unable to convert the given delivery mode of type " + deliveryMode.getClass().getName() + " with value: " + deliveryMode); } - if (mode != null) { - message.setJMSDeliveryMode(mode); - } + message.setJMSDeliveryMode(mode); } /** http://git-wip-us.apache.org/repos/asf/camel/blob/a9e987fe/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java index d4db3cd..986a7bd 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java @@ -96,14 +96,16 @@ public class InOnlyProducer extends SjmsProducer { message = JmsMessageHelper.createMessage(producer.getSession(), batchMessage.getPayload(), batchMessage.getHeaders(), getSjmsEndpoint() .getJmsKeyFormatStrategy(), getSjmsEndpoint().getCamelContext().getTypeConverter()); } else { - message = JmsMessageHelper.createMessage(producer.getSession(), object, exchange.getIn().getHeaders(), getSjmsEndpoint().getJmsKeyFormatStrategy(),getSjmsEndpoint().getCamelContext().getTypeConverter()); + message = JmsMessageHelper.createMessage(producer.getSession(), object, exchange.getIn().getHeaders(), + getSjmsEndpoint().getJmsKeyFormatStrategy(), getSjmsEndpoint().getCamelContext().getTypeConverter()); } messages.add(message); } } else { Object payload = exchange.getIn().getBody(); Message message = JmsMessageHelper - .createMessage(producer.getSession(), payload, exchange.getIn().getHeaders(), getSjmsEndpoint().getJmsKeyFormatStrategy(),getSjmsEndpoint().getCamelContext().getTypeConverter()); + .createMessage(producer.getSession(), payload, exchange.getIn().getHeaders(), getSjmsEndpoint().getJmsKeyFormatStrategy(), + getSjmsEndpoint().getCamelContext().getTypeConverter()); messages.add(message); } }
