You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2007/05/01 18:23:54 UTC
svn commit: r534145 [2/3] - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/compone...
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DelegateProcessor.java Tue May 1 09:23:37 2007
@@ -18,6 +18,7 @@
package org.apache.camel.processor;
import org.apache.camel.Processor;
+import org.apache.camel.Exchange;
import org.apache.camel.spi.Policy;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
@@ -28,21 +29,21 @@
*
* @version $Revision: 519941 $
*/
-public class DelegateProcessor<E> extends ServiceSupport implements Processor<E> {
- protected Processor<E> next;
+public class DelegateProcessor extends ServiceSupport implements Processor {
+ protected Processor next;
public DelegateProcessor() {
}
- public DelegateProcessor(Processor<E> next) {
+ public DelegateProcessor(Processor next) {
this.next = next;
}
- public void process(E exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
processNext(exchange);
}
- protected void processNext(E exchange) throws Exception {
+ protected void processNext(Exchange exchange) throws Exception {
if (next != null) {
next.process(exchange);
}
@@ -53,11 +54,11 @@
return "delegate(" + next + ")";
}
- public Processor<E> getNext() {
+ public Processor getNext() {
return next;
}
- public void setNext(Processor<E> next) {
+ public void setNext(Processor next) {
this.next = next;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandler.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandler.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandler.java Tue May 1 09:23:37 2007
@@ -25,5 +25,5 @@
*
* @version $Revision$
*/
-public interface ErrorHandler<E extends Exchange> extends Processor<E> {
+public interface ErrorHandler extends Processor {
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java Tue May 1 09:23:37 2007
@@ -19,22 +19,23 @@
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
+import org.apache.camel.Exchange;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
/**
* @version $Revision$
*/
-public class FilterProcessor<E> extends ServiceSupport implements Processor<E> {
- private Predicate<E> predicate;
- private Processor<E> processor;
+public class FilterProcessor extends ServiceSupport implements Processor {
+ private Predicate<Exchange> predicate;
+ private Processor processor;
- public FilterProcessor(Predicate<E> predicate, Processor<E> processor) {
+ public FilterProcessor(Predicate<Exchange> predicate, Processor processor) {
this.predicate = predicate;
this.processor = processor;
}
- public void process(E exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
if (predicate.matches(exchange)) {
processor.process(exchange);
}
@@ -45,11 +46,11 @@
return "if (" + predicate + ") " + processor;
}
- public Predicate<E> getPredicate() {
+ public Predicate<Exchange> getPredicate() {
return predicate;
}
- public Processor<E> getProcessor() {
+ public Processor getProcessor() {
return processor;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java Tue May 1 09:23:37 2007
@@ -28,7 +28,7 @@
*
* @version $Revision$
*/
-public class Logger<E extends Exchange> implements Processor<E> {
+public class Logger implements Processor {
private Log log;
private LoggingLevel level;
@@ -50,7 +50,7 @@
return "Logger[" + log + "]";
}
- public void process(E exchange) {
+ public void process(Exchange exchange) {
switch (level) {
case DEBUG:
if (log.isDebugEnabled()) {
@@ -161,7 +161,7 @@
}
}
- protected Object logMessage(E exchange) {
+ protected Object logMessage(Exchange exchange) {
return exchange;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java Tue May 1 09:23:37 2007
@@ -29,16 +29,16 @@
*
* @version $Revision$
*/
-public class LoggingErrorHandler<E extends Exchange> extends ServiceSupport implements ErrorHandler<E> {
- private Processor<E> output;
+public class LoggingErrorHandler extends ServiceSupport implements ErrorHandler {
+ private Processor output;
private Log log;
private LoggingLevel level;
- public LoggingErrorHandler(Processor<E> output) {
+ public LoggingErrorHandler(Processor output) {
this(output, LogFactory.getLog(LoggingErrorHandler.class), LoggingLevel.INFO);
}
- public LoggingErrorHandler(Processor<E> output, Log log, LoggingLevel level) {
+ public LoggingErrorHandler(Processor output, Log log, LoggingLevel level) {
this.output = output;
this.log = log;
this.level = level;
@@ -49,7 +49,7 @@
return "LoggingErrorHandler[" + output + "]";
}
- public void process(E exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
try {
output.process(exchange);
}
@@ -64,7 +64,7 @@
/**
* Returns the output processor
*/
- public Processor<E> getOutput() {
+ public Processor getOutput() {
return output;
}
@@ -86,7 +86,7 @@
// Implementation methods
//-------------------------------------------------------------------------
- protected void logError(E exchange, RuntimeException e) {
+ protected void logError(Exchange exchange, RuntimeException e) {
switch (level) {
case DEBUG:
if (log.isDebugEnabled()) {
@@ -123,7 +123,7 @@
}
}
- protected Object logMessage(E exchange, RuntimeException e) {
+ protected Object logMessage(Exchange exchange, RuntimeException e) {
return e + " while processing exchange: " + exchange;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java Tue May 1 09:23:37 2007
@@ -32,21 +32,21 @@
*
* @version $Revision$
*/
-public class MulticastProcessor<E extends Exchange> extends ServiceSupport implements Processor<E> {
- private Collection<Producer<E>> producers;
+public class MulticastProcessor extends ServiceSupport implements Processor {
+ private Collection<Producer> producers;
/**
* A helper method to convert a list of endpoints into a list of processors
*/
- public static <E extends Exchange> Collection<Producer<E>> toProducers(Collection<Endpoint<E>> endpoints) throws Exception {
- Collection<Producer<E>> answer = new ArrayList<Producer<E>>();
- for (Endpoint<E> endpoint : endpoints) {
+ public static <E extends Exchange> Collection<Producer> toProducers(Collection<Endpoint> endpoints) throws Exception {
+ Collection<Producer> answer = new ArrayList<Producer>();
+ for (Endpoint endpoint : endpoints) {
answer.add(endpoint.createProducer());
}
return answer;
}
- public MulticastProcessor(Collection<Endpoint<E>> endpoints) throws Exception {
+ public MulticastProcessor(Collection<Endpoint> endpoints) throws Exception {
this.producers = toProducers(endpoints);
}
@@ -55,21 +55,21 @@
return "Multicast" + getEndpoints();
}
- public void process(E exchange) throws Exception {
- for (Producer<E> producer : producers) {
- E copy = copyExchangeStrategy(producer, exchange);
+ public void process(Exchange exchange) throws Exception {
+ for (Producer producer : producers) {
+ Exchange copy = copyExchangeStrategy(producer, exchange);
producer.process(copy);
}
}
protected void doStop() throws Exception {
- for (Producer<E> producer : producers) {
+ for (Producer producer : producers) {
producer.stop();
}
}
protected void doStart() throws Exception {
- for (Producer<E> producer : producers) {
+ for (Producer producer : producers) {
producer.start();
}
}
@@ -77,16 +77,16 @@
/**
* Returns the producers to multicast to
*/
- public Collection<Producer<E>> getProducers() {
+ public Collection<Producer> getProducers() {
return producers;
}
/**
* Returns the list of endpoints
*/
- public Collection<Endpoint<E>> getEndpoints() {
- Collection<Endpoint<E>> answer = new ArrayList<Endpoint<E>>();
- for (Producer<E> producer : producers) {
+ public Collection<Endpoint> getEndpoints() {
+ Collection<Endpoint> answer = new ArrayList<Endpoint>();
+ for (Producer producer : producers) {
answer.add(producer.getEndpoint());
}
return answer;
@@ -99,7 +99,7 @@
* @param producer the producer that will send the exchange
* @param exchange @return the current exchange if no copying is required such as for a pipeline otherwise a new copy of the exchange is returned.
*/
- protected E copyExchangeStrategy(Producer<E> producer, E exchange) {
+ protected Exchange copyExchangeStrategy(Producer producer, Exchange exchange) {
return producer.createExchange(exchange);
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java Tue May 1 09:23:37 2007
@@ -30,15 +30,15 @@
*
* @version $Revision$
*/
-public class Pipeline<E extends Exchange> extends MulticastProcessor<E> implements Processor<E> {
- public Pipeline(Collection<Endpoint<E>> endpoints) throws Exception {
+public class Pipeline extends MulticastProcessor implements Processor {
+ public Pipeline(Collection<Endpoint> endpoints) throws Exception {
super(endpoints);
}
- public void process(E exchange) throws Exception {
- E nextExchange = exchange;
+ public void process(Exchange exchange) throws Exception {
+ Exchange nextExchange = exchange;
boolean first = true;
- for (Producer<E> producer : getProducers()) {
+ for (Producer producer : getProducers()) {
if (first) {
first = false;
}
@@ -56,8 +56,8 @@
* @param previousExchange the previous exchange
* @return a new exchange
*/
- protected E createNextExchange(Producer<E> producer, E previousExchange) {
- E answer = producer.createExchange(previousExchange);
+ protected Exchange createNextExchange(Producer producer, Exchange previousExchange) {
+ Exchange answer = producer.createExchange(previousExchange);
// now lets set the input of the next exchange to the output of the previous message if it is not null
Object output = previousExchange.getOut().getBody();
@@ -74,8 +74,8 @@
* @param exchange
* @return the current exchange if no copying is required such as for a pipeline otherwise a new copy of the exchange is returned.
*/
- protected E copyExchangeStrategy(E exchange) {
- return (E) exchange.copy();
+ protected Exchange copyExchangeStrategy(Exchange exchange) {
+ return exchange.copy();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java Tue May 1 09:23:37 2007
@@ -35,11 +35,11 @@
*
* @version $Revision$
*/
-public class RecipientList<E extends Exchange> extends ServiceSupport implements Processor<E> {
- private final Expression<E> expression;
- private ProducerCache<E> producerCache = new ProducerCache<E>();
+public class RecipientList extends ServiceSupport implements Processor {
+ private final Expression<Exchange> expression;
+ private ProducerCache<Exchange> producerCache = new ProducerCache<Exchange>();
- public RecipientList(Expression<E> expression) {
+ public RecipientList(Expression<Exchange> expression) {
notNull(expression, "expression");
this.expression = expression;
}
@@ -49,17 +49,17 @@
return "RecipientList[" + expression + "]";
}
- public void process(E exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
Object receipientList = expression.evaluate(exchange);
Iterator iter = ObjectConverter.iterator(receipientList);
while (iter.hasNext()) {
Object recipient = iter.next();
- Endpoint<E> endpoint = resolveEndpoint(exchange, recipient);
+ Endpoint<Exchange> endpoint = resolveEndpoint(exchange, recipient);
producerCache.getProducer(endpoint).process(exchange);
}
}
- protected Endpoint<E> resolveEndpoint(E exchange, Object recipient) {
+ protected Endpoint<Exchange> resolveEndpoint(Exchange exchange, Object recipient) {
return ExchangeHelper.resolveEndpoint(exchange, recipient);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java Tue May 1 09:23:37 2007
@@ -27,11 +27,11 @@
/**
* @version $Revision$
*/
-public class SendProcessor<E extends Exchange> extends ServiceSupport implements Processor<E>, Service {
- private Endpoint<E> destination;
- private Producer<E> producer;
+public class SendProcessor extends ServiceSupport implements Processor, Service {
+ private Endpoint destination;
+ private Producer producer;
- public SendProcessor(Endpoint<E> destination) {
+ public SendProcessor(Endpoint destination) {
this.destination = destination;
}
@@ -50,14 +50,14 @@
this.producer = destination.createProducer();
}
- public void process(E exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
if (producer == null) {
throw new IllegalStateException("No producer, this processor has not been started!");
}
producer.process(exchange);
}
- public Endpoint<E> getDestination() {
+ public Endpoint getDestination() {
return destination;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java Tue May 1 09:23:37 2007
@@ -33,11 +33,11 @@
*
* @version $Revision$
*/
-public class Splitter<E extends Exchange> extends ServiceSupport implements Processor<E> {
- private final Processor<E> processor;
- private final Expression<E> expression;
+public class Splitter extends ServiceSupport implements Processor {
+ private final Processor processor;
+ private final Expression expression;
- public Splitter(Processor<E> destination, Expression<E> expression) {
+ public Splitter(Processor destination, Expression expression) {
this.processor = destination;
this.expression = expression;
notNull(destination, "destination");
@@ -49,12 +49,12 @@
return "Splitter[on: " + expression + " to: " + processor + "]";
}
- public void process(E exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
Object value = expression.evaluate(exchange);
Iterator iter = ObjectConverter.iterator(value);
while (iter.hasNext()) {
Object part = iter.next();
- E newExchange = (E) exchange.copy();
+ Exchange newExchange = exchange.copy();
newExchange.getIn().setBody(part);
processor.process(newExchange);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java Tue May 1 09:23:37 2007
@@ -32,13 +32,13 @@
*
* @version $Revision: 1.1 $
*/
-public class IdempotentConsumer<E extends Exchange> extends ServiceSupport implements Processor<E> {
+public class IdempotentConsumer extends ServiceSupport implements Processor {
private static final transient Log log = LogFactory.getLog(IdempotentConsumer.class);
- private Expression<E> messageIdExpression;
- private Processor<E> nextProcessor;
+ private Expression<Exchange> messageIdExpression;
+ private Processor nextProcessor;
private MessageIdRepository messageIdRepository;
- public IdempotentConsumer(Expression<E> messageIdExpression, MessageIdRepository messageIdRepository, Processor<E> nextProcessor) {
+ public IdempotentConsumer(Expression<Exchange> messageIdExpression, MessageIdRepository messageIdRepository, Processor nextProcessor) {
this.messageIdExpression = messageIdExpression;
this.messageIdRepository = messageIdRepository;
this.nextProcessor = nextProcessor;
@@ -49,7 +49,7 @@
return "IdempotentConsumer[expression=" + messageIdExpression + ", repository=" + messageIdRepository + ", processor=" + nextProcessor + "]";
}
- public void process(E exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
String messageId = ExpressionHelper.evaluateAsString(messageIdExpression, exchange);
if (messageId == null) {
throw new NoMessageIdException(exchange, messageIdExpression);
@@ -64,7 +64,7 @@
// Properties
//-------------------------------------------------------------------------
- public Expression<E> getMessageIdExpression() {
+ public Expression<Exchange> getMessageIdExpression() {
return messageIdExpression;
}
@@ -72,7 +72,7 @@
return messageIdRepository;
}
- public Processor<E> getNextProcessor() {
+ public Processor getNextProcessor() {
return nextProcessor;
}
@@ -94,7 +94,7 @@
* @param exchange the exchange
* @param messageId the message ID of this exchange
*/
- protected void onDuplicateMessage(E exchange, String messageId) {
+ protected void onDuplicateMessage(Exchange exchange, String messageId) {
if (log.isDebugEnabled()) {
log.debug("Ignoring duplicate message with id: " + messageId + " for exchange: " + exchange);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java Tue May 1 09:23:37 2007
@@ -26,18 +26,18 @@
*
* @version $Revision: 1.1 $
*/
-public interface LoadBalancer<E extends Exchange> extends Processor<E> {
+public interface LoadBalancer extends Processor {
/**
* Adds a new processor to the load balancer
*
* @param processor the processor to be added to the load balancer
*/
- void addProcessor(Processor<E> processor);
+ void addProcessor(Processor processor);
/**
* Removes the given processor from the load balancer
*
* @param processor the processor to be removed from the load balancer
*/
- void removeProcessor(Processor<E> processor);
+ void removeProcessor(Processor processor);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java Tue May 1 09:23:37 2007
@@ -28,14 +28,14 @@
*
* @version $Revision: 1.1 $
*/
-public abstract class LoadBalancerSupport<E extends Exchange> implements LoadBalancer<E> {
- private List<Processor<E>> processors = new CopyOnWriteArrayList<Processor<E>>();
+public abstract class LoadBalancerSupport implements LoadBalancer {
+ private List<Processor> processors = new CopyOnWriteArrayList<Processor>();
- public void addProcessor(Processor<E> processor) {
+ public void addProcessor(Processor processor) {
processors.add(processor);
}
- public void removeProcessor(Processor<E> processor) {
+ public void removeProcessor(Processor processor) {
processors.remove(processor);
}
@@ -44,7 +44,7 @@
*
* @return the processors available
*/
- public List<Processor<E>> getProcessors() {
+ public List<Processor> getProcessors() {
return processors;
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java Tue May 1 09:23:37 2007
@@ -28,14 +28,14 @@
*
* @version $Revision: 1.1 $
*/
-public abstract class QueueLoadBalancer<E extends Exchange> extends LoadBalancerSupport<E> {
+public abstract class QueueLoadBalancer extends LoadBalancerSupport {
- public void process(E exchange) throws Exception {
- List<Processor<E>> list = getProcessors();
+ public void process(Exchange exchange) throws Exception {
+ List<Processor> list = getProcessors();
if (list.isEmpty()) {
throw new IllegalStateException("No processors available to process " + exchange);
}
- Processor<E> processor = chooseProcessor(list, exchange);
+ Processor processor = chooseProcessor(list, exchange);
if (processor == null) {
throw new IllegalStateException("No processors could be chosen to process " + exchange);
}
@@ -44,5 +44,5 @@
}
}
- protected abstract Processor<E> chooseProcessor(List<Processor<E>> processors, E exchange);
+ protected abstract Processor chooseProcessor(List<Processor> processors, Exchange exchange);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java Tue May 1 09:23:37 2007
@@ -27,9 +27,9 @@
*
* @version $Revision: 1.1 $
*/
-public class RandomLoadBalancer<E extends Exchange> extends QueueLoadBalancer<E> {
+public class RandomLoadBalancer extends QueueLoadBalancer {
- protected synchronized Processor<E> chooseProcessor(List<Processor<E>> processors, E exchange) {
+ protected synchronized Processor chooseProcessor(List<Processor> processors, Exchange exchange) {
int size = processors.size();
while (true) {
int index = (int) Math.round(Math.random() * size);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java Tue May 1 09:23:37 2007
@@ -27,10 +27,10 @@
*
* @version $Revision: 1.1 $
*/
-public class RoundRobinLoadBalancer<E extends Exchange> extends QueueLoadBalancer<E> {
+public class RoundRobinLoadBalancer extends QueueLoadBalancer {
private int counter = -1;
- protected synchronized Processor<E> chooseProcessor(List<Processor<E>> processors, E exchange) {
+ protected synchronized Processor chooseProcessor(List<Processor> processors, Exchange exchange) {
int size = processors.size();
if (++counter >= size) {
counter = 0;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java Tue May 1 09:23:37 2007
@@ -34,26 +34,26 @@
*
* @version $Revision: 1.1 $
*/
-public class StickyLoadBalancer<E extends Exchange> extends QueueLoadBalancer<E> {
- private Expression<E> correlationExpression;
+public class StickyLoadBalancer extends QueueLoadBalancer {
+ private Expression<Exchange> correlationExpression;
private QueueLoadBalancer loadBalancer;
private int numberOfHashGroups = 64 * 1024;
- private Map<Object, Processor<E>> stickyMap = new HashMap<Object, Processor<E>>();
+ private Map<Object, Processor> stickyMap = new HashMap<Object, Processor>();
- public StickyLoadBalancer(Expression<E> correlationExpression) {
+ public StickyLoadBalancer(Expression<Exchange> correlationExpression) {
this(correlationExpression, new RoundRobinLoadBalancer());
}
- public StickyLoadBalancer(Expression<E> correlationExpression, QueueLoadBalancer loadBalancer) {
+ public StickyLoadBalancer(Expression<Exchange> correlationExpression, QueueLoadBalancer loadBalancer) {
this.correlationExpression = correlationExpression;
this.loadBalancer = loadBalancer;
}
- protected synchronized Processor<E> chooseProcessor(List<Processor<E>> processors, E exchange) {
+ protected synchronized Processor chooseProcessor(List<Processor> processors, Exchange exchange) {
Object value = correlationExpression.evaluate(exchange);
Object key = getStickyKey(value);
- Processor<E> processor;
+ Processor processor;
synchronized (stickyMap) {
processor = stickyMap.get(key);
if (processor == null) {
@@ -65,11 +65,11 @@
}
@Override
- public void removeProcessor(Processor<E> processor) {
+ public void removeProcessor(Processor processor) {
synchronized (stickyMap) {
- Iterator<Map.Entry<Object,Processor<E>>> iter = stickyMap.entrySet().iterator();
+ Iterator<Map.Entry<Object,Processor>> iter = stickyMap.entrySet().iterator();
while (iter.hasNext()) {
- Map.Entry<Object, Processor<E>> entry = iter.next();
+ Map.Entry<Object, Processor> entry = iter.next();
if (processor.equals(entry.getValue())) {
iter.remove();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java Tue May 1 09:23:37 2007
@@ -28,11 +28,11 @@
*
* @version $Revision: 1.1 $
*/
-public class TopicLoadBalancer<E extends Exchange> extends LoadBalancerSupport<E> {
- public void process(E exchange) throws Exception {
- List<Processor<E>> list = getProcessors();
- for (Processor<E> processor : list) {
- E copy = copyExchangeStrategy(processor, exchange);
+public class TopicLoadBalancer extends LoadBalancerSupport {
+ public void process(Exchange exchange) throws Exception {
+ List<Processor> list = getProcessors();
+ for (Processor processor : list) {
+ Exchange copy = copyExchangeStrategy(processor, exchange);
processor.process(copy);
}
}
@@ -44,7 +44,7 @@
* @param processor the processor that will send the exchange
* @param exchange @return the current exchange if no copying is required such as for a pipeline otherwise a new copy of the exchange is returned.
*/
- protected E copyExchangeStrategy(Processor<E> processor, E exchange) {
- return (E) exchange.copy();
+ protected Exchange copyExchangeStrategy(Processor processor, Exchange exchange) {
+ return exchange.copy();
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Policy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Policy.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Policy.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Policy.java Tue May 1 09:23:37 2007
@@ -33,5 +33,5 @@
* @param processor the processor to be intercepted
* @return either the original processor or a processor wrapped in one or more interceptors
*/
- Processor<E> wrap(Processor<E> processor);
+ Processor wrap(Processor processor);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ProducerCache.java Tue May 1 09:23:37 2007
@@ -72,7 +72,7 @@
* @param endpoint the endpoint to send the exchange to
* @param processor the transformer used to populate the new exchange
*/
- public E send(Endpoint<E> endpoint, Processor<E> processor) {
+ public E send(Endpoint<E> endpoint, Processor processor) {
try {
Producer<E> producer = getProducer(endpoint);
E exchange = producer.createExchange();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Tue May 1 09:23:37 2007
@@ -70,7 +70,7 @@
* @param body the body for the message
*/
protected void send(String endpointUri, final Object body) {
- client.send(endpointUri, new Processor<Exchange>() {
+ client.send(endpointUri, new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody(body);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java Tue May 1 09:23:37 2007
@@ -45,10 +45,10 @@
};
// END SNIPPET: e1
- Map<Endpoint<Exchange>, Processor<Exchange>> routeMap = builder.getRouteMap();
- Set<Map.Entry<Endpoint<Exchange>, Processor<Exchange>>> routes = routeMap.entrySet();
+ Map<Endpoint<Exchange>, Processor> routeMap = builder.getRouteMap();
+ Set<Map.Entry<Endpoint<Exchange>, Processor>> routes = routeMap.entrySet();
assertEquals("Number routes created", 1, routes.size());
- for (Map.Entry<Endpoint<Exchange>, Processor<Exchange>> route : routes) {
+ for (Map.Entry<Endpoint<Exchange>, Processor> route : routes) {
Endpoint<Exchange> key = route.getKey();
assertEquals("From endpoint", "queue:a", key.getEndpointUri());
Processor processor = route.getValue();
@@ -70,12 +70,12 @@
};
// END SNIPPET: e2
- Map<Endpoint<Exchange>, Processor<Exchange>> routeMap = builder.getRouteMap();
+ Map<Endpoint<Exchange>, Processor> routeMap = builder.getRouteMap();
log.info(routeMap);
- Set<Map.Entry<Endpoint<Exchange>, Processor<Exchange>>> routes = routeMap.entrySet();
+ Set<Map.Entry<Endpoint<Exchange>, Processor>> routes = routeMap.entrySet();
assertEquals("Number routes created", 2, routes.size());
- for (Map.Entry<Endpoint<Exchange>, Processor<Exchange>> route : routes) {
+ for (Map.Entry<Endpoint<Exchange>, Processor> route : routes) {
Endpoint<Exchange> key = route.getKey();
String endpointUri = key.getEndpointUri();
Processor processor = route.getValue();
@@ -108,10 +108,10 @@
};
// END SNIPPET: e3
- Map<Endpoint<Exchange>, Processor<Exchange>> routeMap = builder.getRouteMap();
- Set<Map.Entry<Endpoint<Exchange>, Processor<Exchange>>> routes = routeMap.entrySet();
+ Map<Endpoint<Exchange>, Processor> routeMap = builder.getRouteMap();
+ Set<Map.Entry<Endpoint<Exchange>, Processor>> routes = routeMap.entrySet();
assertEquals("Number routes created", 1, routes.size());
- for (Map.Entry<Endpoint<Exchange>, Processor<Exchange>> route : routes) {
+ for (Map.Entry<Endpoint<Exchange>, Processor> route : routes) {
Endpoint<Exchange> key = route.getKey();
assertEquals("From endpoint", "queue:a", key.getEndpointUri());
Processor processor = route.getValue();
@@ -134,10 +134,10 @@
};
// END SNIPPET: e4
- Map<Endpoint<Exchange>, Processor<Exchange>> routeMap = builder.getRouteMap();
- Set<Map.Entry<Endpoint<Exchange>, Processor<Exchange>>> routes = routeMap.entrySet();
+ Map<Endpoint<Exchange>, Processor> routeMap = builder.getRouteMap();
+ Set<Map.Entry<Endpoint<Exchange>, Processor>> routes = routeMap.entrySet();
assertEquals("Number routes created", 1, routes.size());
- for (Map.Entry<Endpoint<Exchange>, Processor<Exchange>> route : routes) {
+ for (Map.Entry<Endpoint<Exchange>, Processor> route : routes) {
Endpoint<Exchange> key = route.getKey();
assertEquals("From endpoint", "queue:a", key.getEndpointUri());
Processor processor = route.getValue();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/InterceptorBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/InterceptorBuilderTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/InterceptorBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/InterceptorBuilderTest.java Tue May 1 09:23:37 2007
@@ -41,7 +41,7 @@
CamelContext container = new DefaultCamelContext();
final ArrayList<String> order = new ArrayList<String>();
- final DelegateProcessor<Exchange> interceptor1 = new DelegateProcessor<Exchange>() {
+ final DelegateProcessor interceptor1 = new DelegateProcessor() {
@Override
public void process(Exchange exchange) throws Exception {
order.add("START:1");
@@ -49,7 +49,7 @@
order.add("END:1");
}
};
- final DelegateProcessor<Exchange> interceptor2 = new DelegateProcessor<Exchange>() {
+ final DelegateProcessor interceptor2 = new DelegateProcessor() {
@Override
public void process(Exchange exchange) throws Exception {
order.add("START:2");
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyInterceptorProcessor.java Tue May 1 09:23:37 2007
@@ -6,7 +6,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.processor.DelegateProcessor;
-public class MyInterceptorProcessor extends DelegateProcessor<Exchange> {
+public class MyInterceptorProcessor extends DelegateProcessor {
public void process(Exchange exchange) throws Exception {
System.out.println("START of onExchange: "+exchange);
next.process(exchange);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/MyProcessor.java Tue May 1 09:23:37 2007
@@ -19,7 +19,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-public class MyProcessor implements Processor<Exchange> {
+public class MyProcessor implements Processor {
public void process(Exchange exchange) {
System.out.println("Called with exchange: " + exchange);
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java Tue May 1 09:23:37 2007
@@ -41,9 +41,9 @@
* @version $Revision$
*/
public class RouteBuilderTest extends TestSupport {
- protected Processor<Exchange> myProcessor = new MyProcessor();
- protected DelegateProcessor<Exchange> interceptor1;
- protected DelegateProcessor<Exchange> interceptor2;
+ protected Processor myProcessor = new MyProcessor();
+ protected DelegateProcessor interceptor1;
+ protected DelegateProcessor interceptor2;
protected RouteBuilder buildSimpleRoute() {
// START SNIPPET: e1
@@ -142,7 +142,7 @@
protected RouteBuilder buildCustomProcessor() {
// START SNIPPET: e4
- myProcessor = new Processor<Exchange>() {
+ myProcessor = new Processor() {
public void process(Exchange exchange) {
System.out.println("Called with exchange: " + exchange);
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java Tue May 1 09:23:37 2007
@@ -44,7 +44,7 @@
container.addRoutes(new RouteBuilder() {
public void configure() {
from("direct:test.a").to("direct:test.b");
- from("direct:test.b").process(new Processor<Exchange>() {
+ from("direct:test.b").process(new Processor() {
public void process(Exchange e) {
invoked.set(true);
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java Tue May 1 09:23:37 2007
@@ -25,6 +25,7 @@
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.commons.logging.Log;
@@ -37,7 +38,7 @@
private static final transient Log log = LogFactory.getLog(FileRouteTest.class);
protected CamelContext container = new DefaultCamelContext();
protected CountDownLatch latch = new CountDownLatch(1);
- protected FileExchange receivedExchange;
+ protected Exchange receivedExchange;
protected String uri = "file://foo.txt";
protected Producer<FileExchange> producer;
@@ -77,8 +78,8 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(uri).process(new Processor<FileExchange>() {
- public void process(FileExchange e) {
+ from(uri).process(new Processor() {
+ public void process(Exchange e) {
System.out.println("Received exchange: " + e.getIn());
receivedExchange = e;
latch.countDown();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java Tue May 1 09:23:37 2007
@@ -45,7 +45,7 @@
container.addRoutes(new RouteBuilder() {
public void configure() {
from("queue:test.a").to("queue:test.b");
- from("queue:test.b").process(new Processor<Exchange>() {
+ from("queue:test.b").process(new Processor() {
public void process(Exchange e) {
System.out.println("Received exchange: " + e.getIn());
latch.countDown();
@@ -82,7 +82,7 @@
container.addRoutes(new RouteBuilder() {
public void configure() {
from("queue:test.a").to("queue:test.b");
- from("queue:test.b").process(new Processor<Exchange>() {
+ from("queue:test.b").process(new Processor() {
public void process(Exchange e) {
System.out.println("Received exchange: " + e.getIn());
latch.countDown();
Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MyExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MyExchange.java?view=auto&rev=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MyExchange.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MyExchange.java Tue May 1 09:23:37 2007
@@ -0,0 +1,30 @@
+/**
+ *
+ * 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.impl;
+
+import org.apache.camel.CamelContext;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class MyExchange extends DefaultExchange {
+
+ public MyExchange(CamelContext context) {
+ super(context);
+ }
+}
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/MyExchange.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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?view=auto&rev=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java Tue May 1 09:23:37 2007
@@ -0,0 +1,64 @@
+/**
+ *
+ * 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.impl;
+
+import junit.framework.TestCase;
+import org.apache.camel.TestSupport;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.Exchange;
+import org.apache.camel.CamelContext;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class ProducerTest extends TestSupport {
+ private CamelContext context = new DefaultCamelContext();
+
+ public void testUsingADerivedExchange() throws Exception {
+ Endpoint<MyExchange> endpoint = new DefaultEndpoint<MyExchange>("foo", new DefaultComponent()) {
+ public Consumer<MyExchange> createConsumer(Processor processor) throws Exception {
+ return null;
+ }
+
+ public MyExchange createExchange() {
+ return new MyExchange(getContext());
+ }
+
+ public Producer<MyExchange> createProducer() throws Exception {
+ return null;
+ }
+
+ public boolean isSingleton() {
+ return false;
+ }
+ };
+
+ DefaultProducer producer = new DefaultProducer(endpoint) {
+ public void process(Exchange exchange) throws Exception {
+ log.info("Received: " + exchange);
+ }
+ };
+
+ // now lets try send in a normal exchange
+ Exchange exchange = new DefaultExchange(context);
+ producer.process(exchange);
+ }
+}
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java Tue May 1 09:23:37 2007
@@ -62,7 +62,7 @@
}
protected void sendMessage(final Object headerValue, final Object body) throws Exception {
- client.send(startEndpoint, new Processor<Exchange>() {
+ client.send(startEndpoint, new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java Tue May 1 09:23:37 2007
@@ -70,7 +70,7 @@
}
protected RouteBuilder createRouteBuilder() {
- final Processor<Exchange> processor = new Processor<Exchange>() {
+ final Processor processor = new Processor() {
public void process(Exchange exchange) {
Integer counter = exchange.getIn().getHeader(DeadLetterChannel.REDELIVERY_COUNTER, Integer.class);
int attempt = (counter == null) ? 1 : counter + 1;
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java Tue May 1 09:23:37 2007
@@ -65,7 +65,7 @@
}
protected void sendMessage(final Object headerValue, final Object body) throws Exception {
- client.send(startEndpoint, new Processor<Exchange>() {
+ client.send(startEndpoint, new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java Tue May 1 09:23:37 2007
@@ -48,7 +48,7 @@
}
protected void sendMessage(final Object messageId, final Object body) {
- client.send(startEndpoint, new Processor<Exchange>() {
+ client.send(startEndpoint, new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java Tue May 1 09:23:37 2007
@@ -42,7 +42,7 @@
}
protected void sendMessage(final Object headerValue, final Object body) throws Exception {
- client.send(startEndpoint, new Processor<Exchange>() {
+ client.send(startEndpoint, new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java Tue May 1 09:23:37 2007
@@ -38,7 +38,7 @@
y.expectedBodiesReceived("input+output");
z.expectedBodiesReceived("input+output");
- client.send("direct:a", new Processor<Exchange>() {
+ client.send("direct:a", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody("input");
@@ -59,7 +59,7 @@
}
protected RouteBuilder createRouteBuilder() {
- final Processor<Exchange> processor = new Processor<Exchange>() {
+ final Processor processor = new Processor() {
public void process(Exchange exchange) {
// lets transform the IN message
Message in = exchange.getIn();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java Tue May 1 09:23:37 2007
@@ -33,7 +33,7 @@
public void testSendMessageThroughAPipeline() throws Exception {
resultEndpoint.expectedBodiesReceived(4);
- client.send("direct:a", new Processor<Exchange>() {
+ client.send("direct:a", new Processor() {
public void process(Exchange exchange) {
// now lets fire in a message
Message in = exchange.getIn();
@@ -53,7 +53,7 @@
}
protected RouteBuilder createRouteBuilder() {
- final Processor<Exchange> processor = new Processor<Exchange>() {
+ final Processor processor = new Processor() {
public void process(Exchange exchange) {
Integer number = exchange.getIn().getBody(Integer.class);
if (number == null) {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java Tue May 1 09:23:37 2007
@@ -35,7 +35,7 @@
y.expectedBodiesReceived("answer");
z.expectedBodiesReceived("answer");
- client.send("direct:a", new Processor<Exchange>() {
+ client.send("direct:a", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody("answer");
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java Tue May 1 09:23:37 2007
@@ -35,7 +35,7 @@
public void testSendingAMessageUsingMulticastReceivesItsOwnExchange() throws Exception {
resultEndpoint.expectedBodiesReceived("James", "Guillaume", "Hiram", "Rob");
- client.send("direct:a", new Processor<Exchange>() {
+ client.send("direct:a", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody("James,Guillaume,Hiram,Rob");
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java Tue May 1 09:23:37 2007
@@ -49,7 +49,7 @@
return new RouteBuilder() {
public void configure() {
// START SNIPPET: example
- from("direct:start").process(new Processor<Exchange>() {
+ from("direct:start").process(new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody(in.getBody(String.class) + " World!");
Modified: activemq/camel/trunk/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/pom.xml?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/camel-cxf/pom.xml Tue May 1 09:23:37 2007
@@ -167,6 +167,7 @@
</includes>
<excludes>
<!-- TODO re-enable ASAP! -->
+ <exclude>**/CxfInvokeTest.*</exclude>
<exclude>**/CxfTest.*</exclude>
<exclude>**/transport/*Test.*</exclude>
</excludes>
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java Tue May 1 09:23:37 2007
@@ -34,7 +34,7 @@
private final LocalTransportFactory transportFactory;
private Destination destination;
- public CxfConsumer(CxfEndpoint endpoint, Processor<CxfExchange> processor, LocalTransportFactory transportFactory) {
+ public CxfConsumer(CxfEndpoint endpoint, Processor processor, LocalTransportFactory transportFactory) {
super(endpoint, processor);
this.endpoint = endpoint;
this.transportFactory = transportFactory;
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Tue May 1 09:23:37 2007
@@ -47,7 +47,7 @@
return startService(new CxfProducer(this, getLocalTransportFactory()));
}
- public Consumer<CxfExchange> createConsumer(Processor<CxfExchange> processor) throws Exception {
+ public Consumer<CxfExchange> createConsumer(Processor processor) throws Exception {
return startService(new CxfConsumer(this, processor, getLocalTransportFactory()));
}
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeConsumer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeConsumer.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeConsumer.java Tue May 1 09:23:37 2007
@@ -32,7 +32,7 @@
protected CxfInvokeEndpoint cxfEndpoint;
private ServerImpl server;
- public CxfInvokeConsumer(CxfInvokeEndpoint endpoint, Processor<CxfExchange> processor) {
+ public CxfInvokeConsumer(CxfInvokeEndpoint endpoint, Processor processor) {
super(endpoint, processor);
this.cxfEndpoint = endpoint;
}
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeEndpoint.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeEndpoint.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeEndpoint.java Tue May 1 09:23:37 2007
@@ -47,7 +47,7 @@
return startService(new CxfInvokeProducer(this));
}
- public Consumer<CxfExchange> createConsumer(Processor<CxfExchange> processor) throws Exception {
+ public Consumer<CxfExchange> createConsumer(Processor processor) throws Exception {
return startService(new CxfInvokeConsumer(this, processor));
}
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java Tue May 1 09:23:37 2007
@@ -18,6 +18,7 @@
package org.apache.camel.component.cxf;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientFactoryBean;
@@ -29,26 +30,31 @@
*
* @version $Revision$
*/
-public class CxfInvokeProducer extends DefaultProducer<CxfExchange> {
- private CxfInvokeEndpoint cxfEndpoint;
+public class CxfInvokeProducer extends DefaultProducer {
+ private CxfInvokeEndpoint endpoint;
private Client client;
public CxfInvokeProducer(CxfInvokeEndpoint endpoint) {
super(endpoint);
- cxfEndpoint = endpoint;
+ this.endpoint = endpoint;
+ }
+
+ public void process(Exchange exchange) {
+ CxfExchange cxfExchange = endpoint.toExchangeType(exchange);
+ process(cxfExchange);
}
public void process(CxfExchange exchange) {
List params = exchange.getIn().getBody(List.class);
Object[] response = null;
try {
- response = client.invoke(cxfEndpoint.getProperty(CxfConstants.METHOD), params.toArray());
+ response = client.invoke(endpoint.getProperty(CxfConstants.METHOD), params.toArray());
}
catch (Exception e) {
throw new RuntimeCamelException(e);
}
- CxfBinding binding = cxfEndpoint.getBinding();
+ CxfBinding binding = endpoint.getBinding();
binding.storeCxfResponse(exchange, response);
}
@@ -61,8 +67,8 @@
if (client == null) {
ClientFactoryBean cfBean = new ClientFactoryBean();
cfBean.setAddress(getEndpoint().getEndpointUri());
- cfBean.setBus(cxfEndpoint.getBus());
- cfBean.setServiceClass(Class.forName(cxfEndpoint.getProperty(CxfConstants.SEI)));
+ cfBean.setBus(endpoint.getBus());
+ cfBean.setServiceClass(Class.forName(endpoint.getProperty(CxfConstants.SEI)));
client = cfBean.create();
}
}
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Tue May 1 09:23:37 2007
@@ -18,6 +18,7 @@
package org.apache.camel.component.cxf;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
@@ -37,7 +38,7 @@
*
* @version $Revision$
*/
-public class CxfProducer extends DefaultProducer<CxfExchange> {
+public class CxfProducer extends DefaultProducer {
private CxfEndpoint endpoint;
private final LocalTransportFactory transportFactory;
private Destination destination;
@@ -48,6 +49,11 @@
super(endpoint);
this.endpoint = endpoint;
this.transportFactory = transportFactory;
+ }
+
+ public void process(Exchange exchange) {
+ CxfExchange cxfExchange = endpoint.toExchangeType(exchange);
+ process(cxfExchange);
}
public void process(CxfExchange exchange) {
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java Tue May 1 09:23:37 2007
@@ -142,7 +142,7 @@
}
private void commitOutputMessage() {
- base.client.send(targetCamelEndpointUri, new Processor<org.apache.camel.Exchange>() {
+ base.client.send(targetCamelEndpointUri, new Processor() {
public void process(org.apache.camel.Exchange reply) {
Object request = null;
Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java (original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Tue May 1 09:23:37 2007
@@ -135,7 +135,7 @@
*/
}
- protected class ConsumerProcessor implements Processor<Exchange> {
+ protected class ConsumerProcessor implements Processor {
public void process(Exchange exchange) {
try {
incoming(exchange);
@@ -201,7 +201,7 @@
//setup the reply message
final String replyToUri = getReplyToDestination(inMessage);
- base.client.send(replyToUri, new Processor<Exchange>() {
+ base.client.send(replyToUri, new Processor() {
public void process(Exchange reply) {
base.marshal(currentStream.toString(), replyToUri, reply);
Modified: activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java (original)
+++ activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java Tue May 1 09:23:37 2007
@@ -23,6 +23,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
import org.apache.camel.CamelClient;
+import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.frontend.ServerFactoryBean;
@@ -68,8 +69,8 @@
CxfExchange exchange =
client.send(getUri(),
- new Processor<CxfExchange>() {
- public void process(final CxfExchange exchange) {
+ new Processor() {
+ public void process(final Exchange exchange) {
final List<String> params = new ArrayList<String>();
params.add(testMessage);
exchange.getIn().setBody(params);
Modified: activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java (original)
+++ activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java Tue May 1 09:23:37 2007
@@ -85,8 +85,8 @@
CxfExchange exchange = (CxfExchange)
client.send(getUri(),
- new Processor<CxfExchange>() {
- public void process(final CxfExchange exchange) {
+ new Processor() {
+ public void process(final Exchange exchange) {
final List<String> params = new ArrayList<String>();
params.add(testMessage);
exchange.getIn().setBody(params);
Modified: activemq/camel/trunk/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java (original)
+++ activemq/camel/trunk/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java Tue May 1 09:23:37 2007
@@ -23,6 +23,7 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -41,14 +42,14 @@
}
public Producer<HttpExchange> createProducer() throws Exception {
- return startService(new DefaultProducer<HttpExchange>(this) {
- public void process(HttpExchange exchange) {
+ return startService(new DefaultProducer(this) {
+ public void process(Exchange exchange) {
/** TODO */
}
});
}
- public Consumer<HttpExchange> createConsumer(Processor<HttpExchange> processor) throws Exception {
+ public Consumer<HttpExchange> createConsumer(Processor processor) throws Exception {
// TODO
return startService(new DefaultConsumer<HttpExchange>(this, processor) {});
}
Modified: activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiComponent.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiComponent.java (original)
+++ activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiComponent.java Tue May 1 09:23:37 2007
@@ -101,7 +101,7 @@
Map map = URISupport.parseQuery(uri.getQuery());
String camelUri = uri.getSchemeSpecificPart();
Endpoint camelEndpoint = getCamelContext().getEndpoint(camelUri);
- Processor<Exchange> processor = null;
+ Processor processor = null;
try {
processor = camelEndpoint.createProducer();
}
@@ -147,7 +147,7 @@
/**
* Returns a JBI endpoint created for the given Camel endpoint
*/
- public CamelJbiEndpoint activateJbiEndpoint(JbiEndpoint camelEndpoint, Processor<Exchange> processor) throws Exception {
+ public CamelJbiEndpoint activateJbiEndpoint(JbiEndpoint camelEndpoint, Processor processor) throws Exception {
CamelJbiEndpoint jbiEndpoint;
String endpointUri = camelEndpoint.getEndpointUri();
if (endpointUri.startsWith("endpoint:")) {
Modified: activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiEndpoint.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiEndpoint.java (original)
+++ activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/CamelJbiEndpoint.java Tue May 1 09:23:37 2007
@@ -34,16 +34,16 @@
private static final QName SERVICE_NAME = new QName("http://camel.apache.org/service", "CamelEndpointComponent");
private Endpoint camelEndpoint;
private JbiBinding binding;
- private Processor<Exchange> processor;
+ private Processor processor;
- public CamelJbiEndpoint(ServiceUnit serviceUnit, QName service, String endpoint, Endpoint camelEndpoint, JbiBinding binding, Processor<Exchange> processor) {
+ public CamelJbiEndpoint(ServiceUnit serviceUnit, QName service, String endpoint, Endpoint camelEndpoint, JbiBinding binding, Processor processor) {
super(serviceUnit, service, endpoint);
this.processor = processor;
this.camelEndpoint = camelEndpoint;
this.binding = binding;
}
- public CamelJbiEndpoint(ServiceUnit serviceUnit, Endpoint camelEndpoint, JbiBinding binding, Processor<Exchange> processor) {
+ public CamelJbiEndpoint(ServiceUnit serviceUnit, Endpoint camelEndpoint, JbiBinding binding, Processor processor) {
this(serviceUnit, SERVICE_NAME, camelEndpoint.getEndpointUri(), camelEndpoint, binding, processor);
}
Modified: activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/FromJbiProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/FromJbiProcessor.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/FromJbiProcessor.java (original)
+++ activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/FromJbiProcessor.java Tue May 1 09:23:37 2007
@@ -30,9 +30,9 @@
public class FromJbiProcessor implements MessageExchangeListener {
private CamelContext context;
private JbiBinding binding;
- private Processor<JbiExchange> processor;
+ private Processor processor;
- public FromJbiProcessor(CamelContext context, JbiBinding binding, Processor<JbiExchange> processor) {
+ public FromJbiProcessor(CamelContext context, JbiBinding binding, Processor processor) {
this.context = context;
this.binding = binding;
this.processor = processor;
Modified: activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/JbiEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/JbiEndpoint.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/JbiEndpoint.java (original)
+++ activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/JbiEndpoint.java Tue May 1 09:23:37 2007
@@ -32,7 +32,7 @@
* @version $Revision$
*/
public class JbiEndpoint extends DefaultEndpoint<Exchange> {
- private Processor<Exchange> toJbiProcessor;
+ private Processor toJbiProcessor;
private final CamelJbiComponent jbiComponent;
public JbiEndpoint(CamelJbiComponent jbiComponent, String uri) {
@@ -49,7 +49,7 @@
});
}
- public Consumer<Exchange> createConsumer(final Processor<Exchange> processor) throws Exception {
+ public Consumer<Exchange> createConsumer(final Processor processor) throws Exception {
return startService(new DefaultConsumer<Exchange>(this, processor) {
CamelJbiEndpoint jbiEndpoint;
Modified: activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/ToJbiProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/ToJbiProcessor.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/ToJbiProcessor.java (original)
+++ activemq/camel/trunk/camel-jbi/src/main/java/org/apache/camel/component/jbi/ToJbiProcessor.java Tue May 1 09:23:37 2007
@@ -32,7 +32,7 @@
*
* @version $Revision$
*/
-public class ToJbiProcessor implements Processor<Exchange> {
+public class ToJbiProcessor implements Processor {
private JbiBinding binding;
private ComponentContext componentContext;
private String destinationUri;
Modified: activemq/camel/trunk/camel-jbi/src/test/java/org/apache/camel/component/jbi/JbiTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jbi/src/test/java/org/apache/camel/component/jbi/JbiTestSupport.java?view=diff&rev=534145&r1=534144&r2=534145
==============================================================================
--- activemq/camel/trunk/camel-jbi/src/test/java/org/apache/camel/component/jbi/JbiTestSupport.java (original)
+++ activemq/camel/trunk/camel-jbi/src/test/java/org/apache/camel/component/jbi/JbiTestSupport.java Tue May 1 09:23:37 2007
@@ -51,7 +51,7 @@
* Sends an exchange to the endpoint
*/
protected void sendExchange(final Object expectedBody) {
- client.send(endpoint, new Processor<Exchange>() {
+ client.send(endpoint, new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setBody(expectedBody);