Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void testFtpSimpleConsume() throws Exception {
mock.expectedBodiesReceived(expected);

ProducerTemplate triggerTemplate = context.createProducerTemplate();
triggerTemplate.sendBody("vm:trigger", "");
triggerTemplate.sendBody("seda:trigger", "");

mock.setResultWaitTime(TimeUnit.MINUTES.toMillis(3));
mock.assertIsSatisfied();
Expand All @@ -62,7 +62,7 @@ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
from("vm:trigger").pollEnrich("ftp://admin@localhost:{{ftp.server.port}}/poll?password=admin&delete=true")
from("seda:trigger").pollEnrich("ftp://admin@localhost:{{ftp.server.port}}/poll?password=admin&delete=true")
.routeId("foo").to("mock:result");
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void testSftpSimpleConsume() throws Exception {
mock.expectedBodiesReceived(expected);

ProducerTemplate triggerTemplate = context.createProducerTemplate();
triggerTemplate.sendBody("vm:trigger", "");
triggerTemplate.sendBody("seda:trigger", "");

mock.setResultWaitTime(TimeUnit.MINUTES.toMillis(3));
mock.assertIsSatisfied();
Expand All @@ -65,7 +65,7 @@ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
from("vm:trigger")
from("seda:trigger")
.pollEnrich("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
+ "?username=admin&password=admin&delay=10000&disconnect=true&delete=true")
.routeId("foo").to("mock:result");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void testMoveFileForMultiplePollEnrich() {
template.sendBodyAndHeader("file://" + service.getFtpRootDir(), expected, Exchange.FILE_NAME, "hello2.txt");

ProducerTemplate triggerTemplate = context.createProducerTemplate();
triggerTemplate.sendBody("vm:trigger", "");
triggerTemplate.sendBody("seda:trigger", "");

File fileInArchive = ftpFile("archive/hello1.txt").toFile();
await().atMost(15, TimeUnit.SECONDS)
Expand All @@ -73,7 +73,7 @@ protected RouteBuilder[] createRouteBuilders() {
return new RouteBuilder[] { new RouteBuilder() {
@Override
public void configure() {
from("vm:trigger")
from("seda:trigger")
.pollEnrich(
"sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&delay=10000&disconnect=true&move=archive")
.pollEnrich(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</filter>
</route>
<route>
<from uri="vm:test"/>
<from uri="seda:test"/>
<to uri="lazyQuickfix:example"/>
</route>
</camelContext>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class MyVmConsumer {
@EndpointInject("mock:result")
private ProducerTemplate destination;

@Consume("vm:start")
@Consume("seda:start")
public void doSomething(String body, Exchange exchange) {
ObjectHelper.notNull(destination, "destination");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void testMessagesSentToConsumerArrive() throws Exception {
String body = "<hello>world!</hello>";
resultEndpoint.expectedBodiesReceived(body);

template.sendBody("vm:start", body);
template.sendBody("seda:start", body);

resultEndpoint.assertIsSatisfied();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.seda.SedaComponent;
import org.apache.camel.component.zookeepermaster.CuratorFactoryBean;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
Expand Down Expand Up @@ -61,35 +62,39 @@ public void beforeRun() throws Exception {
registry.bind("curator", client);

producerContext = new DefaultCamelContext(registry);
// Add the vm:start endpoint to avoid the NPE before starting the consumerContext1
// Add the seda:start endpoint to avoid the NPE before starting the consumerContext1
producerContext.addRoutes(new RouteBuilder() {
@Override
public void configure() {
from("direct:start").to("vm:start");
from("direct:start").to("seda:start");
}
});
SedaComponent sedaComponent = new SedaComponent();
producerContext.addComponent("seda", sedaComponent);

template = producerContext.createProducerTemplate();

consumerContext1 = new DefaultCamelContext(registry);
consumerContext1.addRoutes(new RouteBuilder() {
@Override
public void configure() {
from("zookeeper-master:MasterEndpointFailoverTest:vm:start")
from("zookeeper-master:MasterEndpointFailoverTest:seda:start")
.to("log:result1")
.to("mock:result1");
}
});
consumerContext1.addComponent("seda", sedaComponent);
consumerContext2 = new DefaultCamelContext(registry);
consumerContext2.addRoutes(new RouteBuilder() {
@Override
public void configure() {
from("zookeeper-master:MasterEndpointFailoverTest:vm:start")
from("zookeeper-master:MasterEndpointFailoverTest:seda:start")
.to("log:result2")
.to("mock:result2");
}
});
// Need to start at less one consumerContext to enable the vm queue for producerContext
consumerContext2.addComponent("seda", sedaComponent);
// Need to start at less one consumerContext to enable the seda queue for producerContext
producerContext.start();
consumerContext1.start();

Expand Down