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/21 10:07:58 UTC
[camel] branch main updated: CAMEL-19132: Replace vm with seda endpoint (#9587)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 0898a2cf308 CAMEL-19132: Replace vm with seda endpoint (#9587)
0898a2cf308 is described below
commit 0898a2cf3086ae066c3bf4c81ed7d8a0af1b6b95
Author: Nicolas Filotto <es...@users.noreply.github.com>
AuthorDate: Tue Mar 21 11:07:50 2023 +0100
CAMEL-19132: Replace vm with seda endpoint (#9587)
## Motivation
There are some failing tests that seem to be related to the removal of the VM component in favor of seda
## Modifications
* Replace VM endpoints with Seda endpoints
---
.../FtpPollEnrichConsumeWithDisconnectAndDeleteIT.java | 4 ++--
.../SftpPollEnrichConsumeWithDisconnectAndDeleteIT.java | 4 ++--
.../sftp/integration/SftpMoveWithOutMessageTest.java | 4 ++--
.../component/quickfixj/QuickfixjSpringTest-context.xml | 2 +-
.../org/apache/camel/spring/example/MyVmConsumer.java | 2 +-
.../apache/camel/spring/example/PojoVmConsumerTest.java | 2 +-
.../integration/MasterEndpointFailoverIT.java | 15 ++++++++++-----
7 files changed, 19 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..7f00cf8a750 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
@@ -22,6 +22,7 @@ import org.apache.camel.CamelContext;
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;
@@ -61,13 +62,15 @@ 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");
}
});
+ SedaComponent sedaComponent = new SedaComponent();
+ producerContext.addComponent("seda", sedaComponent);
template = producerContext.createProducerTemplate();
@@ -75,21 +78,23 @@ 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");
}
});
+ 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();