Repository: camel Updated Branches: refs/heads/master 9ef01070d -> e6347abe8
CAMEL-7908 Clean up the code camel-sjms Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6c68389b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6c68389b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6c68389b Branch: refs/heads/master Commit: 6c68389b1f8916c517bacf0d8adb25951e8c3a12 Parents: 9ef0107 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Nov 7 15:45:14 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Nov 7 16:00:14 2014 +0800 ---------------------------------------------------------------------- .../camel/component/sjms/SjmsConsumer.java | 1 - .../sjms/SjmsExchangeMessageHelper.java | 53 -------------------- .../sjms/consumer/InOnlyMessageHandler.java | 1 - .../sjms/consumer/InOutMessageHandler.java | 1 - .../component/sjms/support/JmsTestSupport.java | 1 - 5 files changed, 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6c68389b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java index f1959b7..322ad5c 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java @@ -177,7 +177,6 @@ public class SjmsConsumer extends DefaultConsumer { * Creates a {@link MessageConsumerResources} with a dedicated * {@link Session} required for transacted and InOut consumers. */ - @SuppressWarnings("unused") private MessageConsumerResources createConsumer() throws Exception { MessageConsumerResources answer; Connection conn = getConnectionResource().borrowConnection(); http://git-wip-us.apache.org/repos/asf/camel/blob/6c68389b/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 efe13c7..656452a 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 @@ -22,7 +22,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import javax.jms.BytesMessage; import javax.jms.DeliveryMode; @@ -381,58 +380,6 @@ public final class SjmsExchangeMessageHelper { message.setIntProperty(JmsConstants.JMS_DELIVERY_MODE, mode); } } - - public static Message setJmsMessageHeaders(final Exchange exchange, final Message jmsMessage) throws Exception { - Map<String, Object> headers = new HashMap<String, Object>(exchange.getIn().getHeaders()); - Set<String> keys = headers.keySet(); - for (String headerName : keys) { - Object headerValue = headers.get(headerName); - if (headerName.equalsIgnoreCase("JMSCorrelationID")) { - jmsMessage.setJMSCorrelationID(ExchangeHelper.convertToType(exchange, String.class, headerValue)); - } else if (headerName.equalsIgnoreCase("JMSReplyTo") && headerValue != null) { - if (headerValue instanceof String) { - // if the value is a String we must normalize it first - headerValue = headerValue; - } else { - // TODO write destination converter - // Destination replyTo = - // ExchangeHelper.convertToType(exchange, Destination.class, - // headerValue); - // jmsMessage.setJMSReplyTo(replyTo); - } - } else if (headerName.equalsIgnoreCase("JMSType")) { - jmsMessage.setJMSType(ExchangeHelper.convertToType(exchange, String.class, headerValue)); - } else if (headerName.equalsIgnoreCase("JMSPriority")) { - jmsMessage.setJMSPriority(ExchangeHelper.convertToType(exchange, Integer.class, headerValue)); - } else if (headerName.equalsIgnoreCase("JMSDeliveryMode")) { - SjmsExchangeMessageHelper.setJMSDeliveryMode(exchange, jmsMessage, headerValue); - } else if (headerName.equalsIgnoreCase("JMSExpiration")) { - jmsMessage.setJMSExpiration(ExchangeHelper.convertToType(exchange, Long.class, headerValue)); - } else { - // The following properties are set by the MessageProducer: - // JMSDestination - // The following are set on the underlying JMS provider: - // JMSMessageID, JMSTimestamp, JMSRedelivered - // log at trace level to not spam log - LOGGER.trace("Ignoring JMS header: {} with value: {}", headerName, headerValue); - if (headerName.equalsIgnoreCase("JMSDestination") || headerName.equalsIgnoreCase("JMSMessageID") || headerName.equalsIgnoreCase("JMSTimestamp") - || headerName.equalsIgnoreCase("JMSRedelivered")) { - // The following properties are set by the MessageProducer: - // JMSDestination - // The following are set on the underlying JMS provider: - // JMSMessageID, JMSTimestamp, JMSRedelivered - // log at trace level to not spam log - LOGGER.trace("Ignoring JMS header: {} with value: {}", headerName, headerValue); - } else { - if (!(headerValue instanceof JmsMessageType)) { - String encodedName = new DefaultJmsKeyFormatStrategy().encodeKey(headerName); - SjmsExchangeMessageHelper.setProperty(jmsMessage, encodedName, headerValue); - } - } - } - } - return jmsMessage; - } @Deprecated /** http://git-wip-us.apache.org/repos/asf/camel/blob/6c68389b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java index e23844e..da658b7 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java @@ -19,7 +19,6 @@ package org.apache.camel.component.sjms.consumer; import java.util.concurrent.ExecutorService; import org.apache.camel.AsyncCallback; -import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.component.sjms.SjmsEndpoint; import org.apache.camel.spi.Synchronization; http://git-wip-us.apache.org/repos/asf/camel/blob/6c68389b/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 15d39d2..663f39f 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 @@ -29,7 +29,6 @@ import javax.jms.Queue; import javax.jms.Topic; import org.apache.camel.AsyncCallback; -import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.component.sjms.SjmsEndpoint; import org.apache.camel.component.sjms.SjmsExchangeMessageHelper; http://git-wip-us.apache.org/repos/asf/camel/blob/6c68389b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java index 8245ed9..787c7a7 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java @@ -17,7 +17,6 @@ package org.apache.camel.component.sjms.support; import javax.jms.Connection; -import javax.jms.Destination; import javax.jms.MessageConsumer; import javax.jms.Session; import javax.management.MalformedObjectNameException;
