You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/05/30 15:33:07 UTC
svn commit: r780262 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/seda/
main/java/org/apache/camel/processor/
test/java/org/apache/camel/component/seda/
Author: davsclaus
Date: Sat May 30 13:33:07 2009
New Revision: 780262
URL: http://svn.apache.org/viewvc?rev=780262&view=rev
Log:
CAMEL-825: seda component now supports request/reply. When sending to a seda endpoint the caller thread will wait for the reply if its InOut.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskIfReplyExpectedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java?rev=780262&r1=780261&r2=780262&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java Sat May 30 13:33:07 2009
@@ -44,7 +44,7 @@
private BlockingQueue<Exchange> queue;
private int size = 1000;
private int concurrentConsumers = 1;
- private WaitForTaskToComplete waitTaskComplete = WaitForTaskToComplete.IfReplyExpected;
+ private WaitForTaskToComplete waitForTaskToComplete = WaitForTaskToComplete.IfReplyExpected;
private Set<SedaProducer> producers = new CopyOnWriteArraySet<SedaProducer>();
private Set<SedaConsumer> consumers = new CopyOnWriteArraySet<SedaConsumer>();
@@ -72,7 +72,7 @@
}
public Producer createProducer() throws Exception {
- return new SedaProducer(this, getQueue(), getWaitTaskComplete());
+ return new SedaProducer(this, getQueue(), getWaitForTaskToComplete());
}
public Consumer createConsumer(Processor processor) throws Exception {
@@ -106,12 +106,12 @@
return concurrentConsumers;
}
- public WaitForTaskToComplete getWaitTaskComplete() {
- return waitTaskComplete;
+ public WaitForTaskToComplete getWaitForTaskToComplete() {
+ return waitForTaskToComplete;
}
- public void setWaitTaskComplete(WaitForTaskToComplete waitTaskComplete) {
- this.waitTaskComplete = waitTaskComplete;
+ public void setWaitForTaskToComplete(WaitForTaskToComplete waitForTaskToComplete) {
+ this.waitForTaskToComplete = waitForTaskToComplete;
}
public boolean isSingleton() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java?rev=780262&r1=780261&r2=780262&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java Sat May 30 13:33:07 2009
@@ -29,12 +29,12 @@
*/
public class SedaProducer extends CollectionProducer {
private final SedaEndpoint endpoint;
- private final WaitForTaskToComplete waitTaskComplete;
+ private final WaitForTaskToComplete waitForTaskToComplete;
- public SedaProducer(SedaEndpoint endpoint, BlockingQueue<Exchange> queue, WaitForTaskToComplete waitTaskComplete) {
+ public SedaProducer(SedaEndpoint endpoint, BlockingQueue<Exchange> queue, WaitForTaskToComplete waitForTaskToComplete) {
super(endpoint, queue);
this.endpoint = endpoint;
- this.waitTaskComplete = waitTaskComplete;
+ this.waitForTaskToComplete = waitForTaskToComplete;
}
@Override
@@ -45,7 +45,7 @@
// set a new from endpoint to be the seda queue
copy.setFromEndpoint(endpoint);
- WaitForTaskToComplete wait = waitTaskComplete;
+ WaitForTaskToComplete wait = waitForTaskToComplete;
if (exchange.getIn().getHeader(Exchange.ASYNC_WAIT) != null) {
wait = exchange.getIn().getHeader(Exchange.ASYNC_WAIT, WaitForTaskToComplete.class);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java?rev=780262&r1=780261&r2=780262&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java Sat May 30 13:33:07 2009
@@ -41,12 +41,12 @@
protected static final int DEFAULT_THREADPOOL_SIZE = 5;
protected ExecutorService executorService;
- protected WaitForTaskToComplete waitTaskComplete;
+ protected WaitForTaskToComplete waitForTaskToComplete;
- public ThreadsProcessor(Processor output, ExecutorService executorService, WaitForTaskToComplete waitTaskComplete) {
+ public ThreadsProcessor(Processor output, ExecutorService executorService, WaitForTaskToComplete waitForTaskToComplete) {
super(output);
this.executorService = executorService;
- this.waitTaskComplete = waitTaskComplete;
+ this.waitForTaskToComplete = waitForTaskToComplete;
}
public void process(final Exchange exchange) throws Exception {
@@ -67,7 +67,7 @@
Future<Exchange> future = getExecutorService().submit(task);
// compute if we should wait for task to complete or not
- WaitForTaskToComplete wait = waitTaskComplete;
+ WaitForTaskToComplete wait = waitForTaskToComplete;
if (exchange.getIn().getHeader(Exchange.ASYNC_WAIT) != null) {
wait = exchange.getIn().getHeader(Exchange.ASYNC_WAIT, WaitForTaskToComplete.class);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteTest.java?rev=780262&r1=780261&r2=780262&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskCompleteTest.java Sat May 30 13:33:07 2009
@@ -57,9 +57,9 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start").to("seda:foo?waitTaskComplete=Always");
+ from("direct:start").to("seda:foo?waitForTaskToComplete=Always");
- from("seda:foo?waitTaskComplete=Always").transform(constant("Bye World")).to("mock:result");
+ from("seda:foo?waitForTaskToComplete=Always").transform(constant("Bye World")).to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskIfReplyExpectedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskIfReplyExpectedTest.java?rev=780262&r1=780261&r2=780262&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskIfReplyExpectedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskIfReplyExpectedTest.java Sat May 30 13:33:07 2009
@@ -57,9 +57,9 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start").to("seda:foo?waitTaskComplete=IfReplyExpected");
+ from("direct:start").to("seda:foo?waitForTaskToComplete=IfReplyExpected");
- from("seda:foo?waitTaskComplete=IfReplyExpected").transform(constant("Bye World")).to("mock:result");
+ from("seda:foo?waitForTaskToComplete=IfReplyExpected").transform(constant("Bye World")).to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerTest.java?rev=780262&r1=780261&r2=780262&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaWaitForTaskNewerTest.java Sat May 30 13:33:07 2009
@@ -58,9 +58,9 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start").to("seda:foo?waitTaskComplete=Newer");
+ from("direct:start").to("seda:foo?waitForTaskToComplete=Newer");
- from("seda:foo?waitTaskComplete=Newer").transform(constant("Bye World")).to("mock:result");
+ from("seda:foo?waitForTaskToComplete=Newer").transform(constant("Bye World")).to("mock:result");
}
};
}