Author: hadrian
Date: Mon Nov 10 09:24:17 2008
New Revision: 712704
URL: http://svn.apache.org/viewvc?rev=712704&view=rev
Log:
CAMEL-872. Remove generics from the PollingConsumer. Part 8 of 10.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java?rev=712704&r1=712703&r2=712704&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
Mon Nov 10 09:24:17 2008
@@ -64,7 +64,7 @@
@Override
public PollingConsumer createPollingConsumer() throws Exception {
- return new EventDrivenPollingConsumer<Exchange>(this);
+ return new EventDrivenPollingConsumer(this);
}
@Override
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java?rev=712704&r1=712703&r2=712704&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
Mon Nov 10 09:24:17 2008
@@ -120,7 +120,7 @@
}
public PollingConsumer createPollingConsumer() throws Exception {
- return new EventDrivenPollingConsumer<E>(this);
+ return new EventDrivenPollingConsumer(this);
}
/**
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java?rev=712704&r1=712703&r2=712704&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenPollingConsumer.java
Mon Nov 10 09:24:17 2008
@@ -37,17 +37,17 @@
*
* @version $Revision$
*/
-public class EventDrivenPollingConsumer<E extends Exchange> extends
PollingConsumerSupport<E> implements Processor {
+public class EventDrivenPollingConsumer extends PollingConsumerSupport
implements Processor {
private static final transient Log LOG =
LogFactory.getLog(EventDrivenPollingConsumer.class);
- private BlockingQueue<E> queue;
+ private BlockingQueue<Exchange> queue;
private ExceptionHandler interuptedExceptionHandler = new
LoggingExceptionHandler(new Logger(LOG));
private Consumer consumer;
- public EventDrivenPollingConsumer(Endpoint<E> endpoint) {
- this(endpoint, new ArrayBlockingQueue<E>(1000));
+ public EventDrivenPollingConsumer(Endpoint endpoint) {
+ this(endpoint, new ArrayBlockingQueue<Exchange>(1000));
}
- public EventDrivenPollingConsumer(Endpoint<E> endpoint, BlockingQueue<E>
queue) {
+ public EventDrivenPollingConsumer(Endpoint endpoint,
BlockingQueue<Exchange> queue) {
super(endpoint);
this.queue = queue;
}
@@ -78,7 +78,7 @@
}
public void process(Exchange exchange) throws Exception {
- queue.offer((E)exchange);
+ queue.offer(exchange);
}
public ExceptionHandler getInteruptedExceptionHandler() {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java?rev=712704&r1=712703&r2=712704&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PollingConsumerSupport.java
Mon Nov 10 09:24:17 2008
@@ -26,11 +26,11 @@
*
* @version $Revision$
*/
-public abstract class PollingConsumerSupport<E extends Exchange> extends
ServiceSupport implements PollingConsumer {
- private final Endpoint<E> endpoint;
+public abstract class PollingConsumerSupport extends ServiceSupport implements
PollingConsumer {
+ private final Endpoint endpoint;
private ExceptionHandler exceptionHandler;
- public PollingConsumerSupport(Endpoint<E> endpoint) {
+ public PollingConsumerSupport(Endpoint endpoint) {
this.endpoint = endpoint;
}
@@ -39,7 +39,7 @@
return "PullConsumer on " + endpoint;
}
- public Endpoint<E> getEndpoint() {
+ public Endpoint getEndpoint() {
return endpoint;
}
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java?rev=712704&r1=712703&r2=712704&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
Mon Nov 10 09:24:17 2008
@@ -36,7 +36,7 @@
*
* @version $Revision$
*/
-public class HttpPollingConsumer extends PollingConsumerSupport<HttpExchange> {
+public class HttpPollingConsumer extends PollingConsumerSupport {
private final HttpEndpoint endpoint;
private HttpClient httpClient;
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java?rev=712704&r1=712703&r2=712704&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
Mon Nov 10 09:24:17 2008
@@ -27,7 +27,7 @@
/**
* @version $Revision$
*/
-public class JmsPollingConsumer extends PollingConsumerSupport<JmsExchange> {
+public class JmsPollingConsumer extends PollingConsumerSupport {
private JmsOperations template;
public JmsPollingConsumer(JmsEndpoint endpoint, JmsOperations template) {
Modified:
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java?rev=712704&r1=712703&r2=712704&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueConsumer.java
Mon Nov 10 09:24:17 2008
@@ -37,7 +37,7 @@
/**
* [EMAIL PROTECTED] PollingConsumer} that polls a data queue for data
*/
-public class Jt400DataQueueConsumer extends PollingConsumerSupport<Exchange> {
+public class Jt400DataQueueConsumer extends PollingConsumerSupport {
private final Jt400DataQueueEndpoint endpoint;
