This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1a4eab70c6aede60830bfc67547f9690f444279d
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Jul 29 11:34:30 2019 +0200
Camel-JMS: Use BindToRegistry annotation wherever possible
---
.../component/jms/ConsumeMessageConverterTest.java | 12 +++---
.../jms/JmsEndpointConfigurationTest.java | 14 +++----
.../jms/JmsInOnlyInvalidDestinationTest.java | 14 +++----
.../jms/JmsMessageCreatedStrategyEndpointTest.java | 15 +++-----
.../JmsRouteWithCustomKeyFormatStrategyTest.java | 13 +++----
.../JmsRouteWithCustomListenerContainerTest.java | 42 +++++++++------------
.../jms/JmsRouteWithInOnlyAndMultipleAcksTest.java | 43 ++++++++++------------
.../component/jms/JmsRouteWithInOnlyTest.java | 20 ++++------
.../component/jms/JmsRoutingSlipInOutTest.java | 29 +++++----------
.../component/jms/ProduceMessageConverterTest.java | 13 +++----
.../jms/issues/JmsBeanMethodHeaderTest.java | 25 ++++++-------
.../jms/issues/JmsInOutPipelineWithBeanTest.java | 10 ++---
12 files changed, 99 insertions(+), 151 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
index 8edd566..d8b1338 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
@@ -23,6 +23,7 @@ import javax.jms.Message;
import javax.jms.Session;
import javax.jms.TextMessage;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -36,12 +37,8 @@ import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow
public class ConsumeMessageConverterTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myMessageConverter", new MyMessageConverter());
- return jndi;
- }
+ @BindToRegistry("myMessageConverter")
+ private MyMessageConverter conv = new MyMessageConverter();
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
@@ -89,7 +86,8 @@ public class ConsumeMessageConverterTest extends
CamelTestSupport {
}
public Object fromMessage(Message message) throws JMSException,
MessageConversionException {
- // just return the underlying JMS message directly so we can test
that this converter is used
+ // just return the underlying JMS message directly so we can test
+ // that this converter is used
return message;
}
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
index a1aaa8b..059fad6 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
@@ -22,6 +22,7 @@ import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
@@ -43,6 +44,8 @@ import org.springframework.util.ErrorHandler;
public class JmsEndpointConfigurationTest extends CamelTestSupport {
+ @BindToRegistry("myConnectionFactory")
+ private ActiveMQConnectionFactory factory = new
ActiveMQConnectionFactory("vm:myBroker");
private final Processor failProcessor = new Processor() {
public void process(Exchange exchange) throws Exception {
fail("Should not be reached");
@@ -157,7 +160,7 @@ public class JmsEndpointConfigurationTest extends
CamelTestSupport {
JmsConsumer consumer = endpoint.createConsumer(dummyProcessor);
JmsOperations operations =
consumer.getEndpointMessageListener().getTemplate();
assertTrue(operations instanceof JmsTemplate);
- JmsTemplate template = (JmsTemplate) operations;
+ JmsTemplate template = (JmsTemplate)operations;
assertTrue("Wrong delivery mode on reply template; expected " + "
DeliveryMode.NON_PERSISTENT but was DeliveryMode.PERSISTENT",
template.getDeliveryMode() == DeliveryMode.NON_PERSISTENT);
}
@@ -353,7 +356,7 @@ public class JmsEndpointConfigurationTest extends
CamelTestSupport {
endpoint.setAcceptMessagesWhileStopping(true);
assertTrue(endpoint.isAcceptMessagesWhileStopping());
-
+
endpoint.setAllowReplyManagerQuickStop(true);
assertTrue(endpoint.isAllowReplyManagerQuickStop());
@@ -518,11 +521,4 @@ public class JmsEndpointConfigurationTest extends
CamelTestSupport {
return camelContext;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myConnectionFactory", new
ActiveMQConnectionFactory("vm:myBroker"));
- return jndi;
- }
-
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
index 88da4b0..20b2a03 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
@@ -21,6 +21,7 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Session;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
@@ -36,6 +37,9 @@ import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow
*/
public class JmsInOnlyInvalidDestinationTest extends CamelTestSupport {
+ @BindToRegistry("myResolver")
+ private MyDestinationResolver resolver = new MyDestinationResolver();
+
@Test
public void testInvalidDestination() throws Exception {
getMockEndpoint("mock:dead").expectedMessageCount(1);
@@ -45,13 +49,6 @@ public class JmsInOnlyInvalidDestinationTest extends
CamelTestSupport {
assertMockEndpointsSatisfied();
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myResolver", new MyDestinationResolver());
- return jndi;
- }
-
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
ConnectionFactory connectionFactory =
CamelJmsTestHelper.createConnectionFactory();
@@ -66,8 +63,7 @@ public class JmsInOnlyInvalidDestinationTest extends
CamelTestSupport {
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(1));
- from("direct:foo")
- .recipientList(header("foo"));
+ from("direct:foo").recipientList(header("foo"));
}
};
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyEndpointTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyEndpointTest.java
index fcaeadc..4f1446b 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyEndpointTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyEndpointTest.java
@@ -21,6 +21,7 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -35,12 +36,8 @@ public class JmsMessageCreatedStrategyEndpointTest extends
CamelTestSupport {
protected String componentName = "activemq";
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myStrategy", new MyMessageCreatedStrategy());
- return jndi;
- }
+ @BindToRegistry("myStrategy")
+ private MyMessageCreatedStrategy strategy = new MyMessageCreatedStrategy();
@Test
public void testMessageCreatedStrategy() throws Exception {
@@ -48,7 +45,8 @@ public class JmsMessageCreatedStrategyEndpointTest extends
CamelTestSupport {
mock.expectedMessageCount(1);
mock.expectedHeaderReceived("beer", "Carlsberg");
- // must remember to use this on the producer side as its in use when
sending
+ // must remember to use this on the producer side as its in use when
+ // sending
template.sendBody("activemq:queue:foo?messageCreatedStrategy=#myStrategy",
"Hello World");
assertMockEndpointsSatisfied();
@@ -68,8 +66,7 @@ public class JmsMessageCreatedStrategyEndpointTest extends
CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("activemq:queue:foo")
- .to("mock:result");
+ from("activemq:queue:foo").to("mock:result");
}
};
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java
index ae71157..db49c4d 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.util.StringHelper;
@@ -25,18 +26,14 @@ import org.apache.camel.util.StringHelper;
*/
public class JmsRouteWithCustomKeyFormatStrategyTest extends
JmsRouteWithDefaultKeyFormatStrategyTest {
+ @BindToRegistry("myJmsKeyStrategy")
+ private MyCustomKeyFormatStrategy strategy = new
MyCustomKeyFormatStrategy();
+
protected String getUri() {
return "activemq:queue:foo?jmsKeyFormatStrategy=#myJmsKeyStrategy";
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myJmsKeyStrategy", new MyCustomKeyFormatStrategy());
- return jndi;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
@@ -58,4 +55,4 @@ public class JmsRouteWithCustomKeyFormatStrategyTest extends
JmsRouteWithDefault
return StringHelper.between(key, "FOO", "BAR");
}
}
-}
\ No newline at end of file
+}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
index 91d4bbcc..ca0635d 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jms;
import javax.jms.ConnectionFactory;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
@@ -37,6 +38,12 @@ public class JmsRouteWithCustomListenerContainerTest extends
CamelTestSupport {
protected String componentName = "activemq";
+ @BindToRegistry("orderService")
+ private MyOrderServiceBean serviceBean = new MyOrderServiceBean();
+
+ @BindToRegistry("myListenerContainerFactory")
+ private MyListenerContainerFactory containerFact = new
MyListenerContainerFactory();
+
@Test
public void testSendOrder() throws Exception {
MockEndpoint inbox = getMockEndpoint("mock:inbox");
@@ -53,21 +60,13 @@ public class JmsRouteWithCustomListenerContainerTest
extends CamelTestSupport {
// assert MEP
assertEquals(ExchangePattern.InOut,
inbox.getReceivedExchanges().get(0).getPattern());
assertEquals(ExchangePattern.InOnly,
order.getReceivedExchanges().get(0).getPattern());
-
+
JmsEndpoint jmsEndpoint =
getMandatoryEndpoint("activemq:queue:inbox?messageListenerContainerFactory=#myListenerContainerFactory",
JmsEndpoint.class);
assertIsInstanceOf(MyListenerContainerFactory.class,
jmsEndpoint.getMessageListenerContainerFactory());
- assertEquals(ConsumerType.Custom,
jmsEndpoint.getConfiguration().getConsumerType());
+ assertEquals(ConsumerType.Custom,
jmsEndpoint.getConfiguration().getConsumerType());
assertIsInstanceOf(MyListenerContainer.class,
jmsEndpoint.createMessageListenerContainer());
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("orderService", new MyOrderServiceBean());
- jndi.bind("myListenerContainerFactory", new
MyListenerContainerFactory());
- return jndi;
- }
-
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
@@ -76,37 +75,32 @@ public class JmsRouteWithCustomListenerContainerTest
extends CamelTestSupport {
return camelContext;
}
-
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("activemq:queue:inbox?messageListenerContainerFactory=#myListenerContainerFactory")
- .to("mock:inbox")
- .inOnly("activemq:topic:order")
- .bean("orderService", "handleOrder");
+
from("activemq:queue:inbox?messageListenerContainerFactory=#myListenerContainerFactory").to("mock:inbox").inOnly("activemq:topic:order").bean("orderService",
+
"handleOrder");
- from("activemq:topic:order")
- .to("mock:topic");
+ from("activemq:topic:order").to("mock:topic");
}
};
}
- public static class MyListenerContainerFactory implements
- MessageListenerContainerFactory {
+ public static class MyListenerContainerFactory implements
MessageListenerContainerFactory {
@Override
- public AbstractMessageListenerContainer createMessageListenerContainer(
- JmsEndpoint endpoint) {
+ public AbstractMessageListenerContainer
createMessageListenerContainer(JmsEndpoint endpoint) {
return new MyListenerContainer();
}
}
-
+
public static class MyListenerContainer extends
DefaultMessageListenerContainer {
- }
-
+ }
+
public static class MyOrderServiceBean {
public String handleOrder(String body) {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
index f168261..2a8179d 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.jms;
import javax.jms.ConnectionFactory;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
+import
org.apache.camel.component.jms.JmsRouteWithCustomListenerContainerTest.MyOrderServiceBean;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -30,7 +32,16 @@ import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow
public class JmsRouteWithInOnlyAndMultipleAcksTest extends CamelTestSupport {
protected String componentName = "amq";
-
+
+ @BindToRegistry("orderService")
+ private MyOrderServiceBean serviceBean = new MyOrderServiceBean();
+
+ @BindToRegistry("orderServiceNotificationWithAck-1")
+ private MyOrderServiceNotificationWithAckBean orderNotificationAckBean =
new MyOrderServiceNotificationWithAckBean("1");
+
+ @BindToRegistry("orderServiceNotificationWithAck-2")
+ private MyOrderServiceNotificationWithAckBean orderNotificationAckBean2 =
new MyOrderServiceNotificationWithAckBean("2");
+
@Test
public void testSendOrderWithMultipleAcks() throws Exception {
MockEndpoint inbox = getMockEndpoint("mock:inbox");
@@ -41,22 +52,13 @@ public class JmsRouteWithInOnlyAndMultipleAcksTest extends
CamelTestSupport {
notifCollector.expectedMessageCount(2);
notifCollector.expectedHeaderReceived("JMSCorrelationID", orderId);
notifCollector.setResultWaitTime(10000);
-
+
Object out = template.requestBodyAndHeader("amq:queue:inbox", "Camel
in Action", "JMSCorrelationID", orderId);
assertEquals("OK: Camel in Action", out);
assertMockEndpointsSatisfied();
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("orderService", new MyOrderServiceBean());
- jndi.bind("orderServiceNotificationWithAck-1", new
MyOrderServiceNotificationWithAckBean("1"));
- jndi.bind("orderServiceNotificationWithAck-2", new
MyOrderServiceNotificationWithAckBean("2"));
- return jndi;
- }
-
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
@@ -76,26 +78,18 @@ public class JmsRouteWithInOnlyAndMultipleAcksTest extends
CamelTestSupport {
// topic subscribers, lets a bean handle
// the order and then delivers a reply back to
// the original order request initiator
- from("amq:queue:inbox")
- .to("mock:inbox")
- .inOnly("amq:topic:orderServiceNotification")
- .bean("orderService", "handleOrder");
+
from("amq:queue:inbox").to("mock:inbox").inOnly("amq:topic:orderServiceNotification").bean("orderService",
"handleOrder");
// this route collects an order request notification
// and sends back an acknowledgment back to a queue
- from("amq:topic:orderServiceNotification")
- .bean("orderServiceNotificationWithAck-1",
"handleOrderNotificationWithAck")
- .to("amq:queue:orderServiceNotificationAck");
-
+
from("amq:topic:orderServiceNotification").bean("orderServiceNotificationWithAck-1",
"handleOrderNotificationWithAck").to("amq:queue:orderServiceNotificationAck");
+
// this route collects an order request notification
// and sends back an acknowledgment back to a queue
- from("amq:topic:orderServiceNotification")
- .bean("orderServiceNotificationWithAck-2",
"handleOrderNotificationWithAck")
- .to("amq:queue:orderServiceNotificationAck");
+
from("amq:topic:orderServiceNotification").bean("orderServiceNotificationWithAck-2",
"handleOrderNotificationWithAck").to("amq:queue:orderServiceNotificationAck");
// this route collects all order notifications acknowledgments
- from("amq:queue:orderServiceNotificationAck")
- .to("mock:orderNotificationAckCollector");
+
from("amq:queue:orderServiceNotificationAck").to("mock:orderNotificationAckCollector");
}
};
}
@@ -112,6 +106,7 @@ public class JmsRouteWithInOnlyAndMultipleAcksTest extends
CamelTestSupport {
public MyOrderServiceNotificationWithAckBean(String id) {
this.id = id;
}
+
public String handleOrderNotificationWithAck(String body) {
return "Ack-" + id + ":" + body;
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
index 9928804..82ea25b 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
@@ -18,9 +18,11 @@ package org.apache.camel.component.jms;
import javax.jms.ConnectionFactory;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
+import
org.apache.camel.component.jms.JmsRouteWithInOnlyAndMultipleAcksTest.MyOrderServiceBean;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -35,6 +37,9 @@ public class JmsRouteWithInOnlyTest extends CamelTestSupport {
protected String componentName = "activemq";
+ @BindToRegistry("orderService")
+ private MyOrderServiceBean serviceBean = new MyOrderServiceBean();
+
@Test
public void testSendOrder() throws Exception {
MockEndpoint inbox = getMockEndpoint("mock:inbox");
@@ -53,13 +58,6 @@ public class JmsRouteWithInOnlyTest extends CamelTestSupport
{
assertEquals(ExchangePattern.InOnly,
order.getReceivedExchanges().get(0).getPattern());
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("orderService", new MyOrderServiceBean());
- return jndi;
- }
-
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
@@ -74,13 +72,9 @@ public class JmsRouteWithInOnlyTest extends CamelTestSupport
{
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("activemq:queue:inbox")
- .to("mock:inbox")
- .inOnly("activemq:topic:order")
- .bean("orderService", "handleOrder");
+
from("activemq:queue:inbox").to("mock:inbox").inOnly("activemq:topic:order").bean("orderService",
"handleOrder");
- from("activemq:topic:order")
- .to("mock:topic");
+ from("activemq:topic:order").to("mock:topic");
}
};
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
index 19ace50..36fb429 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
@@ -20,6 +20,7 @@ import java.util.Map;
import javax.jms.ConnectionFactory;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Headers;
@@ -35,6 +36,9 @@ import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow
*/
public class JmsRoutingSlipInOutTest extends CamelTestSupport {
+ @BindToRegistry("myBean")
+ private MyBean bean = new MyBean();
+
@Test
public void testInOutRoutingSlip() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Result-Done-B-A-Hello");
@@ -54,33 +58,18 @@ public class JmsRoutingSlipInOutTest extends
CamelTestSupport {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myBean", new MyBean());
- return jndi;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("activemq:queue:start")
- .to("direct:start")
- .to("bean:myBean?method=doResult")
- .to("mock:result");
-
- from("direct:start")
- .to("bean:myBean?method=createSlip")
- .setExchangePattern(ExchangePattern.InOut)
- .routingSlip(header("mySlip"))
+
from("activemq:queue:start").to("direct:start").to("bean:myBean?method=doResult").to("mock:result");
+
+
from("direct:start").to("bean:myBean?method=createSlip").setExchangePattern(ExchangePattern.InOut).routingSlip(header("mySlip"))
.to("bean:myBean?method=backFromSlip");
- from("activemq:queue:a")
- .to("bean:myBean?method=doA");
+ from("activemq:queue:a").to("bean:myBean?method=doA");
- from("activemq:queue:b")
- .to("bean:myBean?method=doB");
+ from("activemq:queue:b").to("bean:myBean?method=doB");
}
};
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ProduceMessageConverterTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ProduceMessageConverterTest.java
index 81eae4a..92bee28 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ProduceMessageConverterTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ProduceMessageConverterTest.java
@@ -22,6 +22,7 @@ import javax.jms.Message;
import javax.jms.Session;
import javax.jms.TextMessage;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,12 +36,8 @@ import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow
public class ProduceMessageConverterTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myMessageConverter", new MyMessageConverter());
- return jndi;
- }
+ @BindToRegistry("myMessageConverter")
+ private MyMessageConverter conv = new MyMessageConverter();
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
@@ -81,5 +78,5 @@ public class ProduceMessageConverterTest extends
CamelTestSupport {
return null;
}
}
-
-}
\ No newline at end of file
+
+}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
index ab32e6a..0cdbfee 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jms.issues;
import javax.jms.ConnectionFactory;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Body;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -32,10 +33,14 @@ import org.junit.Test;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
/**
- * Unit test for sending the bean method name as a key over the JMS wire, that
we now support this.
+ * Unit test for sending the bean method name as a key over the JMS wire, that
+ * we now support this.
*/
public class JmsBeanMethodHeaderTest extends CamelTestSupport {
+ @BindToRegistry("approveService")
+ private ApproveService service = new ApproveService();
+
@Test
public void testPlainHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -63,8 +68,7 @@ public class JmsBeanMethodHeaderTest extends CamelTestSupport
{
MockEndpoint mock = getMockEndpoint("mock:approve");
mock.expectedBodiesReceived("Yes");
- template.sendBodyAndHeader("direct:approve", ExchangePattern.InOut,
"James",
- Exchange.BEAN_METHOD_NAME, "approveLoan");
+ template.sendBodyAndHeader("direct:approve", ExchangePattern.InOut,
"James", Exchange.BEAN_METHOD_NAME, "approveLoan");
mock.assertIsSatisfied();
}
@@ -74,20 +78,19 @@ public class JmsBeanMethodHeaderTest extends
CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:approve");
mock.expectedBodiesReceived("Yes");
- template.sendBodyAndHeader("activemq:approve", ExchangePattern.InOut,
"James",
- Exchange.BEAN_METHOD_NAME, "approveLoan");
+ template.sendBodyAndHeader("activemq:approve", ExchangePattern.InOut,
"James", Exchange.BEAN_METHOD_NAME, "approveLoan");
mock.assertIsSatisfied();
}
@Test
public void testUsingJMStoJMStoBean() throws Exception {
- // the big one from jms to jms to test that we do not lost the bean
method name
+ // the big one from jms to jms to test that we do not lost the bean
+ // method name
MockEndpoint mock = getMockEndpoint("mock:approve");
mock.expectedBodiesReceived("No");
- template.sendBodyAndHeader("activemq:queue", ExchangePattern.InOut,
"James",
- Exchange.BEAN_METHOD_NAME, "approveSuperLoan");
+ template.sendBodyAndHeader("activemq:queue", ExchangePattern.InOut,
"James", Exchange.BEAN_METHOD_NAME, "approveSuperLoan");
mock.assertIsSatisfied();
}
@@ -101,12 +104,6 @@ public class JmsBeanMethodHeaderTest extends
CamelTestSupport {
return camelContext;
}
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry reg = super.createRegistry();
- reg.bind("approveService", new ApproveService());
- return reg;
- }
-
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java
index 97d03b2..747d7c8 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jms.issues;
import javax.jms.ConnectionFactory;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -34,6 +35,9 @@ import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknow
*/
public class JmsInOutPipelineWithBeanTest extends CamelTestSupport {
+ @BindToRegistry("dummyBean")
+ private MyDummyBean bean = new MyDummyBean();
+
@Test
public void testA() throws Exception {
Object response = template.requestBody("activemq:testA", "Hello
World");
@@ -59,12 +63,6 @@ public class JmsInOutPipelineWithBeanTest extends
CamelTestSupport {
return camelContext;
}
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry reg = super.createRegistry();
- reg.bind("dummyBean", new MyDummyBean());
- return reg;
- }
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
