Author: dkulp
Date: Wed Jul 27 14:01:23 2011
New Revision: 1151467
URL: http://svn.apache.org/viewvc?rev=1151467&view=rev
Log:
Fix compiler warnings in camel-jms component
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRoutingSlipIssueTest.java
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
Wed Jul 27 14:01:23 2011
@@ -49,7 +49,6 @@ import static org.apache.camel.util.Obje
*/
public class JmsComponent extends DefaultComponent implements
ApplicationContextAware, HeaderFilterStrategyAware {
- private static final transient Logger LOG =
LoggerFactory.getLogger(JmsComponent.class);
private static final String KEY_FORMAT_STRATEGY_PARAM =
"jmsKeyFormatStrategy";
private JmsConfiguration configuration;
private ApplicationContext applicationContext;
@@ -112,6 +111,7 @@ public class JmsComponent extends Defaul
return jmsComponentTransacted(connectionFactory, transactionManager);
}
+ @SuppressWarnings("deprecation")
public static JmsComponent jmsComponentTransacted(ConnectionFactory
connectionFactory,
PlatformTransactionManager transactionManager) {
JmsConfiguration template = new JmsConfiguration(connectionFactory);
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Wed Jul 27 14:01:23 2011
@@ -149,7 +149,7 @@ public class JmsConfiguration implements
public void send(final String destinationName,
final MessageCreator messageCreator,
final MessageSentCallback callback) throws
JmsException {
- execute(new SessionCallback() {
+ execute(new SessionCallback<Object>() {
public Object doInJms(Session session) throws JMSException {
Destination destination = resolveDestinationName(session,
destinationName);
return doSendToDestination(destination, messageCreator,
callback, session);
@@ -160,7 +160,7 @@ public class JmsConfiguration implements
public void send(final Destination destination,
final MessageCreator messageCreator,
final MessageSentCallback callback) throws
JmsException {
- execute(new SessionCallback() {
+ execute(new SessionCallback<Object>() {
public Object doInJms(Session session) throws JMSException {
return doSendToDestination(destination, messageCreator,
callback, session);
}
@@ -169,7 +169,7 @@ public class JmsConfiguration implements
public void send(final String destinationName,
final MessageCreator messageCreator) throws
JmsException {
- execute(new SessionCallback() {
+ execute(new SessionCallback<Object>() {
public Object doInJms(Session session) throws JMSException {
Destination destination = resolveDestinationName(session,
destinationName);
return doSendToDestination(destination, messageCreator,
null, session);
@@ -179,7 +179,7 @@ public class JmsConfiguration implements
public void send(final Destination destination,
final MessageCreator messageCreator) throws
JmsException {
- execute(new SessionCallback() {
+ execute(new SessionCallback<Object>() {
public Object doInJms(Session session) throws JMSException {
return doSendToDestination(destination, messageCreator,
null, session);
}
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Wed Jul 27 14:01:23 2011
@@ -644,6 +644,7 @@ public class JmsEndpoint extends Default
}
@ManagedAttribute
+ @Deprecated
public boolean isSubscriptionDurable() {
return getConfiguration().isSubscriptionDurable();
}
@@ -654,6 +655,7 @@ public class JmsEndpoint extends Default
}
@ManagedAttribute
+ @Deprecated
public boolean isTransactedInOut() {
return getConfiguration().isTransactedInOut();
}
@@ -841,6 +843,7 @@ public class JmsEndpoint extends Default
}
@ManagedAttribute
+ @Deprecated
public void setSubscriptionDurable(boolean subscriptionDurable) {
getConfiguration().setSubscriptionDurable(subscriptionDurable);
}
@@ -864,6 +867,7 @@ public class JmsEndpoint extends Default
}
@ManagedAttribute
+ @Deprecated
public void setTransactedInOut(boolean transactedInOut) {
getConfiguration().setTransactedInOut(transactedInOut);
}
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java
(original)
+++
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProviderMetadata.java
Wed Jul 27 14:01:23 2011
@@ -85,7 +85,7 @@ public class JmsProviderMetadata {
if (template == null) {
throw new IllegalArgumentException("No JmsTemplate supplied!");
}
- template.execute(new SessionCallback() {
+ template.execute(new SessionCallback<Object>() {
public Object doInJms(Session session) throws JMSException {
TemporaryQueue queue = session.createTemporaryQueue();
setTemporaryQueueType(queue.getClass());
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
Wed Jul 27 14:01:23 2011
@@ -178,6 +178,7 @@ public class JmsEndpointConfigurationTes
assertEquals(true,
endpoint.getConfiguration().isLazyCreateTransactionManager());
}
+ @SuppressWarnings("deprecation")
@Test
public void testDefaultEndpointOptions() throws Exception {
JmsEndpoint endpoint = (JmsEndpoint)
resolveMandatoryEndpoint("jms:queue:Foo");
@@ -248,6 +249,7 @@ public class JmsEndpointConfigurationTes
assertEquals(false, endpoint.isTransferException());
}
+ @SuppressWarnings("deprecation")
@Test
public void testSettingEndpointOptions() throws Exception {
JmsEndpoint endpoint = (JmsEndpoint)
resolveMandatoryEndpoint("jms:queue:Foo");
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
Wed Jul 27 14:01:23 2011
@@ -19,6 +19,7 @@ package org.apache.camel.component.jms;
import javax.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -64,7 +65,8 @@ public class JmsRequestReplyProcessRepli
@Override
public void configure() throws Exception {
from("seda:start")
- .inOut().to("activemq:queue:foo")
+ .setExchangePattern(ExchangePattern.InOut)
+ .to("activemq:queue:foo")
.log("reply - ${body}")
.threads(5)
.log("delay - ${body}")
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipTest.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipTest.java
Wed Jul 27 14:01:23 2011
@@ -54,7 +54,7 @@ public class JmsRoutingSlipTest extends
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("activemq:queue:hello").routingSlip("myslip", "#");
+ from("activemq:queue:hello").routingSlip(header("myslip"),
"#");
}
};
}
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
Wed Jul 27 14:01:23 2011
@@ -22,6 +22,7 @@ import javax.jms.TextMessage;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.CamelJmsTestHelper;
@@ -71,7 +72,7 @@ public class JmsAnotherCustomJMSReplyToT
public void configure() throws Exception {
from("activemq:queue:hello")
- .inOnly()
+ .setExchangePattern(ExchangePattern.InOnly)
.process(new Processor() {
public void process(Exchange exchange) throws
Exception {
exchange.getIn().setBody("What's your name");
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
Wed Jul 27 14:01:23 2011
@@ -19,6 +19,7 @@ package org.apache.camel.component.jms.i
import javax.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.CamelJmsTestHelper;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -55,8 +56,8 @@ public class JmsInOutRoutingSlipTest ext
@Override
public void configure() throws Exception {
from("activemq:queue:start")
- .inOut()
- .routingSlip("slip")
+ .setExchangePattern(ExchangePattern.InOut)
+ .routingSlip(header("slip"))
.to("log:end")
.to("mock:end");
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRoutingSlipIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRoutingSlipIssueTest.java?rev=1151467&r1=1151466&r2=1151467&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRoutingSlipIssueTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRoutingSlipIssueTest.java
Wed Jul 27 14:01:23 2011
@@ -60,7 +60,7 @@ public class JmsRoutingSlipIssueTest ext
from("direct:start")
// need to use InOut as we do request/reply over JMS
.setExchangePattern(ExchangePattern.InOut)
- .routingSlip("mySlip")
+ .routingSlip(header("mySlip"))
.to("mock:result");
from("activemq:queue:a")
