You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/03/20 18:00:25 UTC
[camel] branch CAMEL-19132/replace-vm-with-seda created (now ba4355a89a9)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch CAMEL-19132/replace-vm-with-seda
in repository https://gitbox.apache.org/repos/asf/camel.git
at ba4355a89a9 CAMEL-19132: Replace vm with seda endpoint
This branch includes the following new commits:
new ba4355a89a9 CAMEL-19132: Replace vm with seda endpoint
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/01: CAMEL-19132: Replace vm with seda endpoint
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-19132/replace-vm-with-seda
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ba4355a89a907cc0810adf2c11fdf5f3097141cc
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Mon Mar 20 18:59:59 2023 +0100
CAMEL-19132: Replace vm with seda endpoint
---
.../FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java | 4 ++--
.../SftpPollEnrichConsumeWithDisconnectAndDeleteIT.java | 4 ++--
.../remote/sftp/integration/SftpMoveWithOutMessageTest.java | 4 ++--
.../camel/component/quickfixj/QuickfixjSpringTest-context.xml | 2 +-
.../java/org/apache/camel/spring/example/MyVmConsumer.java | 2 +-
.../org/apache/camel/spring/example/PojoVmConsumerTest.java | 2 +-
.../zookeepermaster/integration/MasterEndpointFailoverIT.java | 10 +++++-----
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java
index bf36fd9f470..08e92f8f459 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java
@@ -48,7 +48,7 @@ class FtpPollEnrichConsumeWithDisconnectAndDeleteIT extends FtpServerTestSupport
mock.expectedBodiesReceived(expected);
ProducerTemplate triggerTemplate = context.createProducerTemplate();
- triggerTemplate.sendBody("vm:trigger", "");
+ triggerTemplate.sendBody("seda:trigger", "");
mock.setResultWaitTime(TimeUnit.MINUTES.toMillis(3));
mock.assertIsSatisfied();
@@ -62,7 +62,7 @@ class FtpPollEnrichConsumeWithDisconnectAndDeleteIT extends FtpServerTestSupport
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");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpPollEnrichConsumeWithDisconnectAndDeleteIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpPollEnrichConsumeWithDisconnectAndDeleteIT.java
index 117e104853e..3056cc72514 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpPollEnrichConsumeWithDisconnectAndDeleteIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/SftpPollEnrichConsumeWithDisconnectAndDeleteIT.java
@@ -51,7 +51,7 @@ class SftpPollEnrichConsumeWithDisconnectAndDeleteIT extends SftpServerTestSuppo
mock.expectedBodiesReceived(expected);
ProducerTemplate triggerTemplate = context.createProducerTemplate();
- triggerTemplate.sendBody("vm:trigger", "");
+ triggerTemplate.sendBody("seda:trigger", "");
mock.setResultWaitTime(TimeUnit.MINUTES.toMillis(3));
mock.assertIsSatisfied();
@@ -65,7 +65,7 @@ class SftpPollEnrichConsumeWithDisconnectAndDeleteIT extends SftpServerTestSuppo
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");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpMoveWithOutMessageTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpMoveWithOutMessageTest.java
index 663ca0c0031..58f356ea57e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpMoveWithOutMessageTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpMoveWithOutMessageTest.java
@@ -48,7 +48,7 @@ public class SftpMoveWithOutMessageTest extends SftpServerTestSupport {
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)
@@ -73,7 +73,7 @@ public class SftpMoveWithOutMessageTest extends SftpServerTestSupport {
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(
diff --git a/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml b/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
index 577c4a3a5b6..3859d68ced7 100644
--- a/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
+++ b/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
@@ -38,7 +38,7 @@
</filter>
</route>
<route>
- <from uri="vm:test"/>
+ <from uri="seda:test"/>
<to uri="lazyQuickfix:example"/>
</route>
</camelContext>
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java
index 23567d20b8c..6f54b0ad588 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java
@@ -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");
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
index e4ca6244c5d..d1b643f76f2 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/PojoVmConsumerTest.java
@@ -33,7 +33,7 @@ public class PojoVmConsumerTest extends SpringTestSupport {
String body = "<hello>world!</hello>";
resultEndpoint.expectedBodiesReceived(body);
- template.sendBody("vm:start", body);
+ template.sendBody("seda:start", body);
resultEndpoint.assertIsSatisfied();
}
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java
index a016a03c1e7..1320cdadbd4 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java
@@ -61,11 +61,11 @@ public class MasterEndpointFailoverIT {
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");
}
});
@@ -75,7 +75,7 @@ public class MasterEndpointFailoverIT {
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");
}
@@ -84,12 +84,12 @@ public class MasterEndpointFailoverIT {
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
+ // Need to start at less one consumerContext to enable the seda queue for producerContext
producerContext.start();
consumerContext1.start();