You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2008/11/10 21:29:06 UTC
svn commit: r712824 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/component/file/
camel-core/src/main/java/org/apache/camel/impl/
components/camel-atom/src/main/java/org/apache/camel/component/atom/
components/camel-ftp/src/main...
Author: hadrian
Date: Mon Nov 10 12:29:05 2008
New Revision: 712824
URL: http://svn.apache.org/viewvc?rev=712824&view=rev
Log:
CAMEL-872. Remove generics on ScheduledPollConsumer. Part 9 of 10.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisPollingConsumer.java
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java?rev=712824&r1=712823&r2=712824&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java Mon Nov 10 12:29:05 2008
@@ -25,6 +25,7 @@
import org.apache.camel.AsyncCallback;
import org.apache.camel.Processor;
+import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.ScheduledPollConsumer;
import org.apache.camel.processor.DeadLetterChannel;
import org.apache.camel.util.ObjectHelper;
@@ -36,7 +37,7 @@
*
* @version $Revision$
*/
-public class FileConsumer extends ScheduledPollConsumer<FileExchange> {
+public class FileConsumer extends ScheduledPollConsumer {
private static final transient Log LOG = LogFactory.getLog(FileConsumer.class);
private FileEndpoint endpoint;
@@ -56,7 +57,7 @@
private boolean exclusiveReadLock = true;
public FileConsumer(final FileEndpoint endpoint, Processor processor) {
- super(endpoint, processor);
+ super((DefaultEndpoint)endpoint, processor);
this.endpoint = endpoint;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java?rev=712824&r1=712823&r2=712824&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultPollingEndpoint.java Mon Nov 10 12:29:05 2008
@@ -46,7 +46,7 @@
}
public Consumer createConsumer(Processor processor) throws Exception {
- DefaultScheduledPollConsumer result = new DefaultScheduledPollConsumer(this, processor);
+ DefaultScheduledPollConsumer result = new DefaultScheduledPollConsumer((DefaultEndpoint<Exchange>) this, processor);
configureConsumer(result);
return result;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java?rev=712824&r1=712823&r2=712824&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumer.java Mon Nov 10 12:29:05 2008
@@ -30,20 +30,20 @@
*
* @version $Revision$
*/
-public class DefaultScheduledPollConsumer<E extends Exchange> extends ScheduledPollConsumer<E> {
+public class DefaultScheduledPollConsumer extends ScheduledPollConsumer {
private PollingConsumer pollingConsumer;
- public DefaultScheduledPollConsumer(DefaultEndpoint<E> defaultEndpoint, Processor processor) {
+ public DefaultScheduledPollConsumer(DefaultEndpoint<Exchange> defaultEndpoint, Processor processor) {
super(defaultEndpoint, processor);
}
- public DefaultScheduledPollConsumer(Endpoint<E> endpoint, Processor processor, ScheduledExecutorService executor) {
+ public DefaultScheduledPollConsumer(Endpoint<Exchange> endpoint, Processor processor, ScheduledExecutorService executor) {
super(endpoint, processor, executor);
}
protected void poll() throws Exception {
while (true) {
- E exchange = (E) pollingConsumer.receiveNoWait();
+ Exchange exchange = pollingConsumer.receiveNoWait();
if (exchange == null) {
break;
}
@@ -53,7 +53,7 @@
Message out = exchange.getOut(false);
if (out != null) {
// lets create a new exchange
- E newExchange = (E) getEndpoint().createExchange();
+ Exchange newExchange = getEndpoint().createExchange();
newExchange.getIn().copyFrom(out);
exchange = newExchange;
}
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=712824&r1=712823&r2=712824&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 Mon Nov 10 12:29:05 2008
@@ -31,7 +31,7 @@
*
* @version $Revision$
*/
-public abstract class ScheduledPollConsumer<E extends Exchange> extends DefaultConsumer implements
+public abstract class ScheduledPollConsumer extends DefaultConsumer implements
Runnable {
private static final transient Log LOG = LogFactory.getLog(ScheduledPollConsumer.class);
@@ -43,11 +43,11 @@
private ScheduledFuture<?> future;
private Exception firstExceptionThrown;
- public ScheduledPollConsumer(DefaultEndpoint<E> endpoint, Processor processor) {
+ public ScheduledPollConsumer(DefaultEndpoint<Exchange> endpoint, Processor processor) {
this(endpoint, processor, endpoint.getExecutorService());
}
- public ScheduledPollConsumer(Endpoint<E> endpoint, Processor processor, ScheduledExecutorService executor) {
+ public ScheduledPollConsumer(Endpoint<Exchange> endpoint, Processor processor, ScheduledExecutorService executor) {
super(endpoint, processor);
this.executor = executor;
if (executor == null) {
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java?rev=712824&r1=712823&r2=712824&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomConsumerSupport.java Mon Nov 10 12:29:05 2008
@@ -16,14 +16,13 @@
*/
package org.apache.camel.component.atom;
-import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.ScheduledPollConsumer;
/**
* Base class for consuming Atom feeds.
*/
-public abstract class AtomConsumerSupport extends ScheduledPollConsumer<Exchange> {
+public abstract class AtomConsumerSupport extends ScheduledPollConsumer {
public static final long DEFAULT_CONSUMER_DELAY = 60 * 1000L;
protected final AtomEndpoint endpoint;
Modified: activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java?rev=712824&r1=712823&r2=712824&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java (original)
+++ activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java Mon Nov 10 12:29:05 2008
@@ -20,11 +20,12 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.ScheduledPollConsumer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-public abstract class RemoteFileConsumer<T extends RemoteFileExchange> extends ScheduledPollConsumer<T> {
+public abstract class RemoteFileConsumer<T extends RemoteFileExchange> extends ScheduledPollConsumer {
protected final transient Log log = LogFactory.getLog(getClass());
protected RemoteFileEndpoint<T> endpoint;
@@ -43,13 +44,13 @@
private boolean timestamp;
public RemoteFileConsumer(RemoteFileEndpoint<T> endpoint, Processor processor) {
- super(endpoint, processor);
+ super((DefaultEndpoint)endpoint, processor);
this.endpoint = endpoint;
}
public RemoteFileConsumer(RemoteFileEndpoint<T> endpoint, Processor processor,
ScheduledExecutorService executor) {
- super(endpoint, processor, executor);
+ super((DefaultEndpoint)endpoint, processor, executor);
}
/**
Modified: activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisPollingConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisPollingConsumer.java?rev=712824&r1=712823&r2=712824&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisPollingConsumer.java (original)
+++ activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisPollingConsumer.java Mon Nov 10 12:29:05 2008
@@ -93,7 +93,7 @@
*
* @see strategy.IBatisProcessingStrategy
*/
-public class IBatisPollingConsumer extends ScheduledPollConsumer<Exchange> {
+public class IBatisPollingConsumer extends ScheduledPollConsumer {
private static Log logger = LogFactory.getLog(IBatisPollingConsumer.class);
/**
* Statement to run after data has been processed in the route
Modified: activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java?rev=712824&r1=712823&r2=712824&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java (original)
+++ activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaConsumer.java Mon Nov 10 12:29:05 2008
@@ -36,7 +36,7 @@
/**
* @version $Revision$
*/
-public class JpaConsumer extends ScheduledPollConsumer<Exchange> {
+public class JpaConsumer extends ScheduledPollConsumer {
private static final transient Log LOG = LogFactory.getLog(JpaConsumer.class);
private final JpaEndpoint endpoint;
private final TransactionStrategy template;
Modified: activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=712824&r1=712823&r2=712824&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java (original)
+++ activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java Mon Nov 10 12:29:05 2008
@@ -25,6 +25,7 @@
import javax.mail.search.FlagTerm;
import org.apache.camel.Processor;
+import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.ScheduledPollConsumer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,7 +37,7 @@
*
* @version $Revision$
*/
-public class MailConsumer extends ScheduledPollConsumer<MailExchange> {
+public class MailConsumer extends ScheduledPollConsumer {
public static final long DEFAULT_CONSUMER_DELAY = 60 * 1000L;
private static final transient Log LOG = LogFactory.getLog(MailConsumer.class);
@@ -46,7 +47,7 @@
private Store store;
public MailConsumer(MailEndpoint endpoint, Processor processor, JavaMailSenderImpl sender) {
- super(endpoint, processor);
+ super((DefaultEndpoint)endpoint, processor);
this.endpoint = endpoint;
this.sender = sender;
}