Author: janstey
Date: Wed Oct 3 14:21:25 2012
New Revision: 1393502
URL: http://svn.apache.org/viewvc?rev=1393502&view=rev
Log:
CAMEL-5676 - use factory rather than instance ref for custom message listener
container
Added:
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerContainerFactory.java
Modified:
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
Modified:
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java?rev=1393502&r1=1393501&r2=1393502&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
Wed Oct 3 14:21:25 2012
@@ -56,6 +56,7 @@ public class JmsComponent extends Defaul
private QueueBrowseStrategy queueBrowseStrategy;
private HeaderFilterStrategy headerFilterStrategy = new
JmsHeaderFilterStrategy();
private ExecutorService asyncStartStopExecutorService;
+ private MessageListenerContainerFactory messageListenerContainerFactory;
public JmsComponent() {
}
@@ -497,14 +498,13 @@ public class JmsComponent extends Defaul
endpoint.setJmsKeyFormatStrategy(resolveAndRemoveReferenceParameter(
parameters, KEY_FORMAT_STRATEGY_PARAM,
JmsKeyFormatStrategy.class));
}
-
- // remove the listener from the registry because we cannot reuse it
for a 2nd endpoint
- AbstractMessageListenerContainer customMessageListenerContainer =
resolveAndRemoveReferenceParameter(
- parameters, "customMessageListenerContainerRef",
AbstractMessageListenerContainer.class);
- if (customMessageListenerContainer != null) {
-
endpoint.setCustomMessageListenerContainer(customMessageListenerContainer);
+
+ messageListenerContainerFactory =
resolveAndRemoveReferenceParameter(parameters,
"messageListenerContainerFactoryRef",
+ MessageListenerContainerFactory.class);
+ if (messageListenerContainerFactory != null) {
+
endpoint.setMessageListenerContainerFactory(messageListenerContainerFactory);
}
-
+
setProperties(endpoint.getConfiguration(), parameters);
endpoint.setHeaderFilterStrategy(getHeaderFilterStrategy());
Modified:
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=1393502&r1=1393501&r2=1393502&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Wed Oct 3 14:21:25 2012
@@ -135,7 +135,7 @@ public class JmsConfiguration implements
// the cacheLevelName of reply manager
private String replyToCacheLevelName;
private boolean allowNullBody = true;
- private AbstractMessageListenerContainer customMessageListenerContainer;
+ private MessageListenerContainerFactory messageListenerContainerFactory;
public JmsConfiguration() {
}
@@ -385,12 +385,19 @@ public class JmsConfiguration implements
case Default:
return new DefaultJmsMessageListenerContainer(endpoint);
case Custom:
- return getCustomMessageListenerContainer();
+ return getCustomMessageListenerContainer(endpoint);
default:
throw new IllegalArgumentException("Unknown consumer type: " +
consumerType);
}
}
+ private AbstractMessageListenerContainer
getCustomMessageListenerContainer(JmsEndpoint endpoint) {
+ if (messageListenerContainerFactory != null) {
+ return
messageListenerContainerFactory.createMessageListenerContainer(endpoint);
+ }
+ return null;
+ }
+
// Properties
//
-------------------------------------------------------------------------
@@ -1281,12 +1288,11 @@ public class JmsConfiguration implements
this.allowNullBody = allowNullBody;
}
- public AbstractMessageListenerContainer
getCustomMessageListenerContainer() {
- return customMessageListenerContainer;
+ public MessageListenerContainerFactory
getMessageListenerContainerFactory() {
+ return messageListenerContainerFactory;
}
- public void setCustomMessageListenerContainer(
- AbstractMessageListenerContainer customMessageListenerContainer) {
- this.customMessageListenerContainer =
customMessageListenerContainer;
+ public void
setMessageListenerContainerFactory(MessageListenerContainerFactory
messageListenerContainerFactory) {
+ this.messageListenerContainerFactory = messageListenerContainerFactory;
}
}
Modified:
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=1393502&r1=1393501&r2=1393502&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Wed Oct 3 14:21:25 2012
@@ -1041,14 +1041,13 @@ public class JmsEndpoint extends Default
configuration.setAllowNullBody(allowNullBody);
}
- public AbstractMessageListenerContainer
getCustomMessageListenerContainer() {
- return configuration.getCustomMessageListenerContainer();
+ public MessageListenerContainerFactory
getMessageListenerContainerFactory() {
+ return configuration.getMessageListenerContainerFactory();
}
- public void setCustomMessageListenerContainer(
- AbstractMessageListenerContainer customMessageListenerContainer) {
-
configuration.setCustomMessageListenerContainer(customMessageListenerContainer);
- configuration.setConsumerType(ConsumerType.Custom);
+ public void
setMessageListenerContainerFactory(MessageListenerContainerFactory
messageListenerContainerFactory) {
+
configuration.setMessageListenerContainerFactory(messageListenerContainerFactory);
+ configuration.setConsumerType(ConsumerType.Custom);
}
@ManagedAttribute
Added:
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerContainerFactory.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerContainerFactory.java?rev=1393502&view=auto
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerContainerFactory.java
(added)
+++
camel/branches/camel-2.10.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/MessageListenerContainerFactory.java
Wed Oct 3 14:21:25 2012
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.camel.component.jms;
+
+import org.springframework.jms.listener.AbstractMessageListenerContainer;
+
+/**
+ * Factory used to create a custom {@link
org.springframework.jms.listener.AbstractMessageListenerContainer} to
+ * be used in JMS endpoints.
+ */
+public interface MessageListenerContainerFactory {
+
+ /**
+ * Create a custom {@link
org.springframework.jms.listener.AbstractMessageListenerContainer}.
+ *
+ * @param endpoint the endpoint to create the listener container for
+ * @return the custom message listener container
+ */
+ AbstractMessageListenerContainer
createMessageListenerContainer(JmsEndpoint endpoint);
+}
Modified:
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java?rev=1393502&r1=1393501&r2=1393502&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
Wed Oct 3 14:21:25 2012
@@ -17,6 +17,7 @@
package org.apache.camel.component.jms;
import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
import javax.naming.Context;
import org.apache.camel.CamelContext;
@@ -26,6 +27,7 @@ import org.apache.camel.component.mock.M
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
+import org.springframework.jms.listener.AbstractMessageListenerContainer;
import org.springframework.jms.listener.DefaultMessageListenerContainer;
import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@@ -56,16 +58,17 @@ public class JmsRouteWithCustomListenerC
assertEquals(ExchangePattern.InOut,
inbox.getReceivedExchanges().get(0).getPattern());
assertEquals(ExchangePattern.InOnly,
order.getReceivedExchanges().get(0).getPattern());
- JmsEndpoint jmsEndpoint =
getMandatoryEndpoint("activemq:queue:inbox?customMessageListenerContainerRef=myListenerContainer",
JmsEndpoint.class);
- assertIsInstanceOf(MyListenerContainer.class,
jmsEndpoint.getCustomMessageListenerContainer());
+ JmsEndpoint jmsEndpoint =
getMandatoryEndpoint("activemq:queue:inbox?messageListenerContainerFactoryRef=myListenerContainerFactory",
JmsEndpoint.class);
+ assertIsInstanceOf(MyListenerContainerFactory.class,
jmsEndpoint.getMessageListenerContainerFactory());
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("myListenerContainer", new MyListenerContainer());
+ jndi.bind("myListenerContainerFactory", new
MyListenerContainerFactory());
return jndi;
}
@@ -83,7 +86,7 @@ public class JmsRouteWithCustomListenerC
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("activemq:queue:inbox?customMessageListenerContainerRef=myListenerContainer")
+
from("activemq:queue:inbox?messageListenerContainerFactoryRef=myListenerContainerFactory")
.to("mock:inbox")
.inOnly("activemq:topic:order")
.beanRef("orderService", "handleOrder");
@@ -94,12 +97,20 @@ public class JmsRouteWithCustomListenerC
};
}
- public static class MyListenerContainer extends
DefaultMessageListenerContainer {
- public MyListenerContainer() {
- super();
+ public static class MyListenerContainerFactory implements
+ MessageListenerContainerFactory {
+
+ @Override
+ public AbstractMessageListenerContainer createMessageListenerContainer(
+ JmsEndpoint endpoint) {
+ return new MyListenerContainer();
}
}
+ public static class MyListenerContainer extends
DefaultMessageListenerContainer {
+
+ }
+
public static class MyOrderServiceBean {
public String handleOrder(String body) {