Author: hadrian
Date: Sun Nov 9 20:21:51 2008
New Revision: 712605
URL: http://svn.apache.org/viewvc?rev=712605&view=rev
Log:
CAMEL-872. Remove generics from DefaultConsumer. Part 4, a few more to come.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java
activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcConsumer.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConsumer.java
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
Sun Nov 9 20:21:51 2008
@@ -28,7 +28,7 @@
*
* @version $Revision$
*/
-public class DataSetConsumer extends DefaultConsumer<Exchange> {
+public class DataSetConsumer extends DefaultConsumer {
private static final transient Log LOG =
LogFactory.getLog(DataSetConsumer.class);
private DataSetEndpoint endpoint;
private Processor reporter;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
Sun Nov 9 20:21:51 2008
@@ -34,7 +34,7 @@
*/
public class DirectEndpoint<E extends Exchange> extends DefaultEndpoint<E> {
private boolean allowMultipleConsumers = true;
- private final CopyOnWriteArrayList<DefaultConsumer<E>> consumers = new
CopyOnWriteArrayList<DefaultConsumer<E>>();
+ private final CopyOnWriteArrayList<DefaultConsumer> consumers = new
CopyOnWriteArrayList<DefaultConsumer>();
public DirectEndpoint(String uri, DirectComponent<E> component) {
super(uri, component);
@@ -49,7 +49,7 @@
}
public Consumer createConsumer(Processor processor) throws Exception {
- return new DefaultConsumer<E>(this, processor) {
+ return new DefaultConsumer(this, processor) {
@Override
public void start() throws Exception {
if (!allowMultipleConsumers && !consumers.isEmpty()) {
@@ -80,7 +80,7 @@
return true;
}
- public List<DefaultConsumer<E>> getConsumers() {
+ public List<DefaultConsumer> getConsumers() {
return consumers;
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
Sun Nov 9 20:21:51 2008
@@ -43,7 +43,7 @@
if (endpoint.getConsumers().isEmpty()) {
LOG.warn("No consumers available on " + this + " to process " +
exchange);
} else {
- for (DefaultConsumer<E> consumer : endpoint.getConsumers()) {
+ for (DefaultConsumer consumer : endpoint.getConsumers()) {
consumer.getProcessor().process(exchange);
}
}
@@ -54,13 +54,13 @@
if (size == 0) {
LOG.warn("No consumers available on " + this + " to process " +
exchange);
} else if (size == 1) {
- DefaultConsumer<E> consumer = endpoint.getConsumers().get(0);
+ DefaultConsumer consumer = endpoint.getConsumers().get(0);
AsyncProcessor processor =
AsyncProcessorTypeConverter.convert(consumer.getProcessor());
return processor.process(exchange, callback);
} else if (size > 1) {
// Too hard to do multiple async.. do it sync
try {
- for (DefaultConsumer<E> consumer : endpoint.getConsumers()) {
+ for (DefaultConsumer consumer : endpoint.getConsumers()) {
consumer.getProcessor().process(exchange);
}
} catch (Throwable error) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
Sun Nov 9 20:21:51 2008
@@ -31,7 +31,7 @@
*
* @version $Revision$
*/
-public class TimerConsumer extends DefaultConsumer<Exchange> {
+public class TimerConsumer extends DefaultConsumer {
private static final transient Log LOG =
LogFactory.getLog(TimerConsumer.class);
private final TimerEndpoint endpoint;
private TimerTask task;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
Sun Nov 9 20:21:51 2008
@@ -30,13 +30,13 @@
*
* @version $Revision$
*/
-public class DefaultConsumer<E extends Exchange> extends ServiceSupport
implements Consumer {
- private Endpoint<E> endpoint;
+public class DefaultConsumer extends ServiceSupport implements Consumer {
+ private Endpoint endpoint;
private Processor processor;
private AsyncProcessor asyncProcessor;
private ExceptionHandler exceptionHandler;
- public DefaultConsumer(Endpoint<E> endpoint, Processor processor) {
+ public DefaultConsumer(Endpoint endpoint, Processor processor) {
this.endpoint = endpoint;
this.processor = processor;
}
@@ -46,7 +46,7 @@
return "Consumer on " + endpoint;
}
- public Endpoint<E> getEndpoint() {
+ public Endpoint getEndpoint() {
return endpoint;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
Sun Nov 9 20:21:51 2008
@@ -31,7 +31,7 @@
*
* @version $Revision$
*/
-public abstract class ScheduledPollConsumer<E extends Exchange> extends
DefaultConsumer<E> implements
+public abstract class ScheduledPollConsumer<E extends Exchange> extends
DefaultConsumer implements
Runnable {
private static final transient Log LOG =
LogFactory.getLog(ScheduledPollConsumer.class);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
Sun Nov 9 20:21:51 2008
@@ -27,7 +27,7 @@
*
* @version $Revision$
*/
-public class LoadBalancerConsumer extends DefaultConsumer<Exchange> {
+public class LoadBalancerConsumer extends DefaultConsumer {
private final LoadBalancer loadBalancer;
public LoadBalancerConsumer(Endpoint endpoint, Processor processor,
LoadBalancer loadBalancer) {
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
Sun Nov 9 20:21:51 2008
@@ -40,7 +40,7 @@
*
* @version $Revision$
*/
-public class CxfConsumer extends DefaultConsumer<CxfExchange> {
+public class CxfConsumer extends DefaultConsumer {
private CxfEndpoint endpoint;
private Server server;
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java
Sun Nov 9 20:21:51 2008
@@ -22,7 +22,7 @@
/**
* @version $Revision$
*/
-public class HttpConsumer extends DefaultConsumer<HttpExchange> {
+public class HttpConsumer extends DefaultConsumer {
private final HttpEndpoint endpoint;
Modified:
activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
Sun Nov 9 20:21:51 2008
@@ -25,7 +25,7 @@
import org.schwering.irc.lib.IRCModeParser;
import org.schwering.irc.lib.IRCUser;
-public class IrcConsumer extends DefaultConsumer<IrcExchange> {
+public class IrcConsumer extends DefaultConsumer {
private static final transient Log LOG =
LogFactory.getLog(IrcConsumer.class);
private final IrcConfiguration configuration;
Modified:
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcConsumer.java
Sun Nov 9 20:21:51 2008
@@ -44,7 +44,7 @@
* Created by IntelliJ IDEA. User: gnodet Date: Sep 7, 2007 Time: 8:15:54 PM To
* change this template use File | Settings | File Templates.
*/
-public class JhcConsumer extends DefaultConsumer<JhcExchange> {
+public class JhcConsumer extends DefaultConsumer {
private static final Log LOG = LogFactory.getLog(JhcConsumer.class);
private JhcServerEngine engine;
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConsumer.java
Sun Nov 9 20:21:51 2008
@@ -26,7 +26,7 @@
*
* @version $Revision$
*/
-public class JmsConsumer extends DefaultConsumer<JmsExchange> {
+public class JmsConsumer extends DefaultConsumer {
private final AbstractMessageListenerContainer listenerContainer;
private EndpointMessageListener messageListener;
Modified:
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
Sun Nov 9 20:21:51 2008
@@ -35,7 +35,7 @@
*
* @version $Revision$
*/
-public class MinaConsumer extends DefaultConsumer<MinaExchange> {
+public class MinaConsumer extends DefaultConsumer {
private static final transient Log LOG =
LogFactory.getLog(MinaConsumer.class);
private final MinaEndpoint endpoint;
Modified:
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConsumer.java
Sun Nov 9 20:21:51 2008
@@ -22,7 +22,7 @@
/**
* @version $Revision$
*/
-public class QuartzConsumer extends DefaultConsumer<QuartzExchange> {
+public class QuartzConsumer extends DefaultConsumer {
public QuartzConsumer(QuartzEndpoint endpoint, Processor processor) {
super(endpoint, processor);
}
Modified:
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiConsumer.java
Sun Nov 9 20:21:51 2008
@@ -35,7 +35,7 @@
*
* @version $Revision$
*/
-public class RmiConsumer extends DefaultConsumer<BeanExchange> implements
InvocationHandler {
+public class RmiConsumer extends DefaultConsumer implements InvocationHandler {
private final RmiEndpoint endpoint;
private Remote stub;
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
Sun Nov 9 20:21:51 2008
@@ -20,15 +20,11 @@
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultConsumer;
-import org.apache.camel.impl.ScheduledPollConsumer;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ServiceHelper;
-import org.springframework.integration.channel.AbstractPollableChannel;
import org.springframework.integration.channel.BeanFactoryChannelResolver;
import org.springframework.integration.channel.ChannelResolver;
import org.springframework.integration.channel.DirectChannel;
-import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.message.MessageHandler;
@@ -40,7 +36,7 @@
*
* @version $Revision$
*/
-public class SpringIntegrationConsumer extends
DefaultConsumer<SpringIntegrationExchange> implements MessageHandler {
+public class SpringIntegrationConsumer extends DefaultConsumer implements
MessageHandler {
private SpringCamelContext context;
private DirectChannel inputChannel;
private MessageChannel outputChannel;
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventConsumer.java
Sun Nov 9 20:21:51 2008
@@ -26,7 +26,7 @@
*
* @version $Revision$
*/
-public class EventConsumer extends DefaultConsumer<Exchange> {
+public class EventConsumer extends DefaultConsumer {
private EventEndpoint endpoint;
public EventConsumer(EventEndpoint endpoint, Processor processor) {
Modified:
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
Sun Nov 9 20:21:51 2008
@@ -39,7 +39,7 @@
/**
* Consumer that can read from streams
*/
-public class StreamConsumer extends DefaultConsumer<Exchange> {
+public class StreamConsumer extends DefaultConsumer {
private static final transient Log LOG =
LogFactory.getLog(StreamConsumer.class);
private static final String TYPES = "in,file,url";
Modified:
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java?rev=712605&r1=712604&r2=712605&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
Sun Nov 9 20:21:51 2008
@@ -34,7 +34,7 @@
*
* @version $Revision$
*/
-public class XmppConsumer extends DefaultConsumer<XmppExchange> implements
PacketListener, MessageListener {
+public class XmppConsumer extends DefaultConsumer implements PacketListener,
MessageListener {
private static final transient Log LOG =
LogFactory.getLog(XmppConsumer.class);
private final XmppEndpoint endpoint;
private Chat privateChat;
