Author: hadrian
Date: Sun Nov 9 18:40:43 2008
New Revision: 712603
URL: http://svn.apache.org/viewvc?rev=712603&view=rev
Log:
CAMEL-872. Remove generics from Consumer. Part 3 of many.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumer.java
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/component/direct/DirectEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.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/DefaultEndpoint.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/EventDrivenConsumerRoute.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/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consumer.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consumer.java
Sun Nov 9 18:40:43 2008
@@ -21,5 +21,5 @@
*
* @version $Revision$
*/
-public interface Consumer<E extends Exchange> extends Service {
+public interface Consumer extends Service {
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
Sun Nov 9 18:40:43 2008
@@ -86,7 +86,7 @@
*
* @return a newly created consumer
*/
- Consumer<E> createConsumer(Processor processor) throws Exception;
+ Consumer createConsumer(Processor processor) throws Exception;
/**
* Creates a new <a
@@ -102,7 +102,7 @@
* @return a newly created pull consumer
* @throws Exception if the pull consumer could not be created
*/
- PollingConsumer<E> createPollingConsumer() throws Exception;
+ PollingConsumer createPollingConsumer() throws Exception;
void configureProperties(Map options);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumer.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/PollingConsumer.java
Sun Nov 9 18:40:43 2008
@@ -23,7 +23,7 @@
*
* @version $Revision$
*/
-public interface PollingConsumer<E extends Exchange> extends Consumer<E> {
+public interface PollingConsumer extends Consumer {
/**
* Waits until a message is available and then returns it. Warning that
this
@@ -55,5 +55,4 @@
* period, or <tt>null</tt> if the timeout expired
*/
Exchange receive(long timeout);
-
}
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=712603&r1=712602&r2=712603&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
Sun Nov 9 18:40:43 2008
@@ -63,12 +63,12 @@
}
@Override
- public PollingConsumer<Exchange> createPollingConsumer() throws Exception {
+ public PollingConsumer createPollingConsumer() throws Exception {
return new EventDrivenPollingConsumer<Exchange>(this);
}
@Override
- public Consumer<Exchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new DataSetConsumer(this, processor);
}
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=712603&r1=712602&r2=712603&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 18:40:43 2008
@@ -44,11 +44,11 @@
super(endpointUri);
}
- public Producer createProducer() throws Exception {
+ public Producer<E> createProducer() throws Exception {
return new DirectProducer<E>(this);
}
- public Consumer<E> createConsumer(Processor processor) throws Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new DefaultConsumer<E>(this, processor) {
@Override
public void start() throws Exception {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -89,8 +89,8 @@
return result;
}
- public Consumer<FileExchange> createConsumer(Processor processor) throws
Exception {
- Consumer<FileExchange> result = new FileConsumer(this, processor);
+ public Consumer createConsumer(Processor processor) throws Exception {
+ Consumer result = new FileConsumer(this, processor);
configureConsumer(result);
return result;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -60,7 +60,7 @@
throw new UnsupportedOperationException("Producer not supported");
}
- public Consumer<JMXExchange> createConsumer(Processor proc) throws
Exception {
+ public Consumer createConsumer(Processor proc) throws Exception {
ObjectName observedName = new ObjectName(observedObjectName);
if (name == null) {
String type = observedName.getKeyProperty("type");
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -86,7 +86,7 @@
};
}
- public Consumer<Exchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new LoadBalancerConsumer(this, processor, loadBalancer);
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -162,7 +162,7 @@
propertyChangeSupport.removePropertyChangeListener(listener);
}
- public Consumer<Exchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
throw new UnsupportedOperationException("You cannot consume from this
endpoint");
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -59,7 +59,7 @@
throw new RuntimeCamelException("Cannot produce to a TimerEndpoint: "
+ getEndpointUri());
}
- public Consumer<Exchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new TimerConsumer(this, processor);
}
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=712603&r1=712602&r2=712603&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 18:40:43 2008
@@ -30,7 +30,7 @@
*
* @version $Revision$
*/
-public class DefaultConsumer<E extends Exchange> extends ServiceSupport
implements Consumer<E> {
+public class DefaultConsumer<E extends Exchange> extends ServiceSupport
implements Consumer {
private Endpoint<E> endpoint;
private Processor processor;
private AsyncProcessor asyncProcessor;
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=712603&r1=712602&r2=712603&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
Sun Nov 9 18:40:43 2008
@@ -119,7 +119,7 @@
this.executorService = executorService;
}
- public PollingConsumer<E> createPollingConsumer() throws Exception {
+ public PollingConsumer createPollingConsumer() throws Exception {
return new EventDrivenPollingConsumer<E>(this);
}
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=712603&r1=712602&r2=712603&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
Sun Nov 9 18:40:43 2008
@@ -45,7 +45,7 @@
super(endpointUri, context);
}
- public Consumer<E> createConsumer(Processor processor) throws Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
DefaultScheduledPollConsumer result = new
DefaultScheduledPollConsumer(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=712603&r1=712602&r2=712603&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
Sun Nov 9 18:40:43 2008
@@ -31,7 +31,7 @@
* @version $Revision$
*/
public class DefaultScheduledPollConsumer<E extends Exchange> extends
ScheduledPollConsumer<E> {
- private PollingConsumer<E> pollingConsumer;
+ private PollingConsumer pollingConsumer;
public DefaultScheduledPollConsumer(DefaultEndpoint<E> defaultEndpoint,
Processor processor) {
super(defaultEndpoint, processor);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
Sun Nov 9 18:40:43 2008
@@ -59,7 +59,7 @@
@Override
protected void addServices(List<Service> services) throws Exception {
Endpoint<E> endpoint = getEndpoint();
- Consumer<E> consumer = endpoint.createConsumer(processor);
+ Consumer consumer = endpoint.createConsumer(processor);
if (consumer != null) {
services.add(consumer);
}
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=712603&r1=712602&r2=712603&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
Sun Nov 9 18:40:43 2008
@@ -41,7 +41,7 @@
private static final transient Log LOG =
LogFactory.getLog(EventDrivenPollingConsumer.class);
private BlockingQueue<E> queue;
private ExceptionHandler interuptedExceptionHandler = new
LoggingExceptionHandler(new Logger(LOG));
- private Consumer<E> consumer;
+ private Consumer consumer;
public EventDrivenPollingConsumer(Endpoint<E> endpoint) {
this(endpoint, new ArrayBlockingQueue<E>(1000));
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=712603&r1=712602&r2=712603&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
Sun Nov 9 18:40:43 2008
@@ -26,7 +26,7 @@
*
* @version $Revision$
*/
-public abstract class PollingConsumerSupport<E extends Exchange> extends
ServiceSupport implements PollingConsumer<E> {
+public abstract class PollingConsumerSupport<E extends Exchange> extends
ServiceSupport implements PollingConsumer {
private final Endpoint<E> endpoint;
private ExceptionHandler exceptionHandler;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -69,7 +69,7 @@
}
@Override
- public PollingConsumer<Exchange> createPollingConsumer() throws Exception {
+ public PollingConsumer createPollingConsumer() throws Exception {
return new ProcessorPollingConsumer(this, getProcessor());
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -57,7 +57,7 @@
this.consumerProperties = consumerProperties;
}
- protected void configureConsumer(Consumer<E> consumer) throws Exception {
+ protected void configureConsumer(Consumer consumer) throws Exception {
if (consumerProperties != null) {
// TODO pass in type converter
IntrospectionSupport.setProperties(getCamelContext().getTypeConverter(),
consumer, consumerProperties);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
Sun Nov 9 18:40:43 2008
@@ -56,7 +56,7 @@
private ExceptionHandler exceptionHandler;
private ResequencerEngine<Exchange> engine;
- private PollingConsumer<? extends Exchange> consumer;
+ private PollingConsumer consumer;
private Endpoint<? extends Exchange> endpoint;
private Processor processor;
private Thread worker;
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
Sun Nov 9 18:40:43 2008
@@ -42,7 +42,7 @@
}
}) {
- public Consumer<MyExchange> createConsumer(Processor processor)
throws Exception {
+ public Consumer createConsumer(Processor processor) throws
Exception {
return null;
}
Modified:
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -70,7 +70,7 @@
throw new UnsupportedOperationException("AtomProducer is not
implemented");
}
- public Consumer<Exchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
AtomConsumerSupport answer;
if (isSplitEntries()) {
answer = new AtomEntryPollingConsumer(this, processor, filter,
lastUpdate);
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -75,7 +75,7 @@
return new CxfProducer(this);
}
- public Consumer<CxfExchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new CxfConsumer(this, processor);
}
Modified:
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -63,7 +63,7 @@
return new FlatpackProducer(this);
}
- public Consumer<Exchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new LoadBalancerConsumer(this, processor, loadBalancer);
}
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -66,7 +66,7 @@
}
@Override
- public PollingConsumer<HttpExchange> createPollingConsumer() throws
Exception {
+ public PollingConsumer createPollingConsumer() throws Exception {
return new HttpPollingConsumer(this);
}
Modified:
activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -68,7 +68,7 @@
* Currently unsupported
* @throws RuntimeCamelException
*/
- public Consumer<DefaultExchange> createConsumer(Processor processor)
throws Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
throw new RuntimeCamelException("No consumer endpoint support for JCR
available");
}
Modified:
activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -52,7 +52,7 @@
return false;
}
- public Consumer<DefaultExchange> createConsumer(Processor processor)
throws Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
throw new RuntimeCamelException("A JDBC Consumer would be the server
side of database! No such support here");
}
Modified:
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -47,12 +47,12 @@
}
@Override
- public Consumer<HttpExchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new HttpConsumer(this, processor);
}
@Override
- public PollingConsumer<HttpExchange> createPollingConsumer() throws
Exception {
+ public PollingConsumer createPollingConsumer() throws Exception {
return new HttpPollingConsumer(this);
}
Modified:
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -98,7 +98,7 @@
return new JhcProducer(this);
}
- public Consumer<JhcExchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new JhcConsumer(this, processor);
}
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -109,7 +109,7 @@
}
@Override
- public PollingConsumer<JmsExchange> createPollingConsumer() throws
Exception {
+ public PollingConsumer createPollingConsumer() throws Exception {
JmsOperations template = createInOnlyTemplate();
return new JmsPollingConsumer(this, template);
}
Modified:
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -69,7 +69,7 @@
return new JpaProducer(this, getProducerExpression());
}
- public Consumer<Exchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
validate();
JpaConsumer consumer = new JpaConsumer(this, processor);
configureConsumer(consumer);
Modified:
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
(original)
+++
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
Sun Nov 9 18:40:43 2008
@@ -50,7 +50,7 @@
protected JpaEndpoint endpoint;
protected TransactionStrategy transactionStrategy;
protected JpaTemplate jpaTemplate;
- protected Consumer<Exchange> consumer;
+ protected Consumer consumer;
protected Exchange receivedExchange;
protected CountDownLatch latch = new CountDownLatch(1);
protected String entityName = SendEmail.class.getName();
Modified:
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
(original)
+++
activemq/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
Sun Nov 9 18:40:43 2008
@@ -49,7 +49,7 @@
protected JpaEndpoint endpoint;
protected TransactionStrategy transactionStrategy;
protected JpaTemplate jpaTemplate;
- protected Consumer<Exchange> consumer;
+ protected Consumer consumer;
protected Exchange receivedExchange;
protected CountDownLatch latch = new CountDownLatch(1);
protected String entityName = MultiSteps.class.getName();
Modified:
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -83,7 +83,7 @@
}
@Override
- public PollingConsumer<Exchange> createPollingConsumer() throws Exception {
+ public PollingConsumer createPollingConsumer() throws Exception {
return new Jt400DataQueueConsumer(this);
}
Modified:
activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -52,7 +52,7 @@
this.remaining = remaining;
}
- public Consumer<E> createConsumer(Processor processor) throws Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
throw new RuntimeCamelException("An LDAP Consumer would be the LDAP
server itself! No such support here");
}
Modified:
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -63,7 +63,7 @@
return new MailProducer(this, sender);
}
- public Consumer<MailExchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
if (configuration.getProtocol().startsWith("smtp")) {
throw new IllegalArgumentException("Protocol " +
configuration.getProtocol()
+ " can not be used for a MailConsumer. Please use another
protocol such as pop3 or imap.");
@@ -76,7 +76,7 @@
/**
* Creates a consumer using the given processor and sender
*/
- public Consumer<MailExchange> createConsumer(Processor processor,
JavaMailSenderImpl sender) throws Exception {
+ public Consumer createConsumer(Processor processor, JavaMailSenderImpl
sender) throws Exception {
MailConsumer answer = new MailConsumer(this, processor, sender);
// ScheduledPollConsumer default delay is 500 millis and that is too
often for polling a mailbox,
Modified:
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -76,7 +76,7 @@
return new MinaProducer(this);
}
- public Consumer<MinaExchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new MinaConsumer(this, processor);
}
Modified:
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -63,7 +63,7 @@
return new BeanExchange(getCamelContext(), pattern);
}
- public Consumer<BeanExchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
if (remoteInterfaces == null || remoteInterfaces.size() == 0) {
throw new RuntimeCamelException("To create a RMI consumer, the RMI
endpoint's remoteInterfaces property must be be configured.");
}
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -60,7 +60,7 @@
return new SpringIntegrationProducer(this);
}
- public Consumer<SpringIntegrationExchange> createConsumer(Processor
processor) throws Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new SpringIntegrationConsumer(this, processor);
}
Modified:
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -46,7 +46,7 @@
this.uri = endpointUri;
}
- public Consumer<Exchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new StreamConsumer(this, processor, uri);
}
Modified:
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=712603&r1=712602&r2=712603&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
Sun Nov 9 18:40:43 2008
@@ -83,7 +83,7 @@
return new XmppPrivateChatProducer(this, participant);
}
- public Consumer<XmppExchange> createConsumer(Processor processor) throws
Exception {
+ public Consumer createConsumer(Processor processor) throws Exception {
return new XmppConsumer(this, processor);
}
