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 2020/03/15 11:27:40 UTC
[camel] 02/02: CAMEL-14575: camel-core - TypeConverter from String
to Long - drop time pattern
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a3bc85ffd17a26d2fee74807c73a8c32e4702341
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 15 12:27:17 2020 +0100
CAMEL-14575: camel-core - TypeConverter from String to Long - drop time pattern
---
.../test/java/org/apache/camel/catalog/CamelCatalogTest.java | 2 +-
.../cluster/AtomixClientClusteredRoutePolicyFactoryMain.java | 2 +-
.../cluster/AtomixClientRoutePolicyFactoryTestSupport.java | 2 +-
.../atomix/cluster/AtomixClientRoutePolicyTestSupport.java | 2 +-
.../atomix/cluster/AtomixRoutePolicyFactoryTest.java | 2 +-
.../component/atomix/cluster/AtomixRoutePolicyTest.java | 2 +-
.../cluster/ConsulClusteredRoutePolicyFactoryMain.java | 2 +-
.../cluster/ConsulClusteredRoutePolicyFactoryTest.java | 2 +-
.../consul/cluster/ConsulClusteredRoutePolicyTest.java | 2 +-
.../camel/component/consul/cluster/ConsulMasterTest.java | 2 +-
.../component/file/remote/FtpSimpleConsumeAbsoluteTest.java | 2 +-
...ConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java | 2 +-
.../remote/FtpSimpleConsumeStreamingPartialReadTest.java | 2 +-
.../remote/FtpSimpleConsumeStreamingStepwiseFalseTest.java | 2 +-
.../FtpSimpleConsumeStreamingWithMultipleFilesTest.java | 2 +-
.../SftpPollEnrichConsumeWithDisconnectAndDeleteTest.java | 2 +-
.../component/file/remote/sftp/SftpECKeyFileConsumeTest.java | 2 +-
.../camel/component/file/remote/sftp/SftpKeyConsumeTest.java | 2 +-
.../component/file/remote/sftp/SftpKeyFileConsumeTest.java | 2 +-
.../file/remote/sftp/SftpKeyPairDSAConsumeTest.java | 2 +-
.../file/remote/sftp/SftpKeyPairRSAConsumeTest.java | 2 +-
.../file/remote/sftp/SftpKeyUriConsumeFromClasspathTest.java | 2 +-
.../component/file/remote/sftp/SftpKeyUriConsumeTest.java | 2 +-
.../file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java | 2 +-
.../sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java | 2 +-
.../file/remote/sftp/SftpSimpleConsumeRecursiveTest.java | 2 +-
.../sftp/SftpSimpleConsumeStreamingPartialReadTest.java | 2 +-
.../file/remote/sftp/SftpSimpleConsumeStreamingTest.java | 2 +-
.../SftpSimpleConsumeStreamingWithMultipleFilesTest.java | 2 +-
.../component/file/remote/sftp/SftpSimpleConsumeTest.java | 2 +-
.../file/remote/sftp/SftpSimpleConsumeThroughProxyTest.java | 2 +-
.../file/remote/sftp/SftpSimpleIPV6ConsumeTest.java | 2 +-
.../component/file/remote/sftp/SftpUseListFalseTest.java | 2 +-
.../apache/camel/component/jdbc/JdbcAnotherRouteTest.java | 2 +-
.../org/apache/camel/component/jdbc/camelContext.xml | 2 +-
.../raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java | 2 +-
.../jgroups/raft/cluster/JGroupsRaftMasterTest.java | 2 +-
.../component/jgroups/cluster/JGroupsLockMasterTest.java | 2 +-
.../apache/camel/component/master/MasterComponentTest.java | 2 +-
.../camel/component/pubnub/example/PubNubSensor2Example.java | 2 +-
components/camel-splunk/src/main/docs/splunk-component.adoc | 2 +-
.../apache/camel/component/splunk/ConsumerStreamingTest.java | 2 +-
.../java/org/apache/camel/component/splunk/ConsumerTest.java | 2 +-
.../component/splunk/SplunkComponentConfigurationTest.java | 2 +-
.../camel/component/splunk/integration/NormalSearchTest.java | 2 +-
.../component/splunk/integration/RealtimeSearchTest.java | 2 +-
.../camel/component/splunk/integration/SavedSearchTest.java | 2 +-
.../cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java | 2 +-
.../cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java | 2 +-
.../zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java | 2 +-
.../component/zookeeper/cluster/ZooKeeperMasterTest.java | 2 +-
.../file/cluster/FileLockClusteredRoutePolicyTest.java | 2 +-
docs/components/modules/ROOT/pages/splunk-component.adoc | 2 +-
.../modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/clustering.adoc | 12 ++++++------
docs/user-manual/modules/ROOT/pages/polling-consumer.adoc | 2 +-
.../camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java | 2 +-
57 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 0f0b0c7..707d7e6 100644
--- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -694,7 +694,7 @@ public class CamelCatalogTest {
assertTrue(result.isSuccess());
// time pattern
- result = catalog.validateEndpointProperties("timer://foo?fixedRate=true&delay=0&period=2s");
+ result = catalog.validateEndpointProperties("timer://foo?fixedRate=true&delay=0&period=2000");
assertTrue(result.isSuccess());
// reference lookup
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
index 6d4e962..ddcfa21 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientClusteredRoutePolicyFactoryMain.java
@@ -57,7 +57,7 @@ public final class AtomixClientClusteredRoutePolicyFactoryMain {
main.addRouteBuilder(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:clustered?delay=1s&period=1s")
+ from("timer:clustered?delay=1000&period=1000")
.routeId("route-" + id)
.log("Route ${routeId} is running ...");
}
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
index 95b79c9..6e40701 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyFactoryTestSupport.java
@@ -92,7 +92,7 @@ public abstract class AtomixClientRoutePolicyFactoryTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:atomix?delay=1s&period=1s")
+ from("timer:atomix?delay=1000&period=1000")
.routeId("route-" + id)
.log("From ${routeId}")
.process(e -> contextLatch.countDown());
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
index bfe7c2a..df21c45 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixClientRoutePolicyTestSupport.java
@@ -91,7 +91,7 @@ public abstract class AtomixClientRoutePolicyTestSupport {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:atomix?delay=1s&period=1s")
+ from("timer:atomix?delay=1000&period=1000")
.routeId("route-" + id)
.routePolicy(ClusteredRoutePolicy.forNamespace("my-ns"))
.log("From ${routeId}")
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
index 6fd4326..5d91e68 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyFactoryTest.java
@@ -90,7 +90,7 @@ public final class AtomixRoutePolicyFactoryTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:atomix?delay=1s&period=1s")
+ from("timer:atomix?delay=1000&period=1000")
.routeId("route-" + address.port())
.log("From ${routeId}")
.process(e -> contextLatch.countDown());
diff --git a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
index d11bfa0..9aecdba 100644
--- a/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
+++ b/components/camel-atomix/src/test/java/org/apache/camel/component/atomix/cluster/AtomixRoutePolicyTest.java
@@ -89,7 +89,7 @@ public final class AtomixRoutePolicyTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:atomix?delay=1s&period=1s")
+ from("timer:atomix?delay=1000&period=1000")
.routeId("route-" + address.port())
.routePolicy(ClusteredRoutePolicy.forNamespace("my-ns"))
.log("From ${routeId}")
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
index c633038..b41b14d 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryMain.java
@@ -53,7 +53,7 @@ public final class ConsulClusteredRoutePolicyFactoryMain {
main.addRoutesBuilder(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:clustered?delay=1s&period=1s").routeId("route-" + id).log("Route ${routeId} is running ...");
+ from("timer:clustered?delay=1000&period=1000").routeId("route-" + id).log("Route ${routeId} is running ...");
}
});
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
index 2a22429..188cf21 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryTest.java
@@ -91,7 +91,7 @@ public class ConsulClusteredRoutePolicyFactoryTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() {
- from("timer:consul?delay=1s&period=1s").routeId("route-" + id).log("From ${routeId}").process(e -> contextLatch.countDown());
+ from("timer:consul?delay=1000&period=1000").routeId("route-" + id).log("From ${routeId}").process(e -> contextLatch.countDown());
}
});
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
index 2aa9370..2fa6a1f 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyTest.java
@@ -90,7 +90,7 @@ public class ConsulClusteredRoutePolicyTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:consul?delay=1s&period=1s").routeId("route-" + id).routePolicy(ClusteredRoutePolicy.forNamespace("my-ns")).log("From ${routeId}")
+ from("timer:consul?delay=1000&period=1000").routeId("route-" + id).routePolicy(ClusteredRoutePolicy.forNamespace("my-ns")).log("From ${routeId}")
.process(e -> contextLatch.countDown());
}
});
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterTest.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterTest.java
index bd456ad..ea5c1d0 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterTest.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterTest.java
@@ -89,7 +89,7 @@ public class ConsulMasterTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("master:my-ns:timer:consul?delay=1s&period=1s").routeId("route-" + id).log("From ${routeId}").process(e -> contextLatch.countDown());
+ from("master:my-ns:timer:consul?delay=1000&period=1000").routeId("route-" + id).log("From ${routeId}").process(e -> contextLatch.countDown());
}
});
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java
index 69bcbb2..b20e3e7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeAbsoluteTest.java
@@ -54,7 +54,7 @@ public class FtpSimpleConsumeAbsoluteTest extends FtpServerTestSupport {
// notice we use an absolute starting path: /tmp/mytemp
// - we must remember to use // slash because of the url
// separator
- from("ftp://localhost:" + getPort() + "//tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true").routeId("foo").noAutoStartup().to("mock:result");
+ from("ftp://localhost:" + getPort() + "//tmp/mytemp?username=admin&password=admin&delay=10000&disconnect=true").routeId("foo").noAutoStartup().to("mock:result");
}
};
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java
index ebc4238..95979ec 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest.java
@@ -51,7 +51,7 @@ public class FtpSimpleConsumeDirectoryParseWithAbsoluteDepthNoStepwiseTest exten
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("ftp://localhost:" + getPort() + "//tmp/mytemp?username=admin&password=admin&delay=10s"
+ from("ftp://localhost:" + getPort() + "//tmp/mytemp?username=admin&password=admin&delay=10000"
+ "&disconnect=true&download=true&stepwise=false&delete=false&handleDirectoryParserAbsoluteResult=true").routeId("foo").noAutoStartup().to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingPartialReadTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingPartialReadTest.java
index 25277d1..55b10a5 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingPartialReadTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingPartialReadTest.java
@@ -68,7 +68,7 @@ public class FtpSimpleConsumeStreamingPartialReadTest extends FtpServerTestSuppo
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("ftp://localhost:" + getPort() + "/tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true&streamDownload=true" + "&move=done&moveFailed=failed&stepwise=false")
+ from("ftp://localhost:" + getPort() + "/tmp/mytemp?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true" + "&move=done&moveFailed=failed&stepwise=false")
.routeId("foo").noAutoStartup().process(new Processor() {
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingStepwiseFalseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingStepwiseFalseTest.java
index e4d1020..d17ad23 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingStepwiseFalseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingStepwiseFalseTest.java
@@ -71,7 +71,7 @@ public class FtpSimpleConsumeStreamingStepwiseFalseTest extends FtpServerTestSup
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("ftp://localhost:" + getPort() + "/tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true&streamDownload=true&stepwise=" + String.valueOf(isStepwise())).routeId("foo").noAutoStartup()
+ from("ftp://localhost:" + getPort() + "/tmp/mytemp?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true&stepwise=" + String.valueOf(isStepwise())).routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingWithMultipleFilesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingWithMultipleFilesTest.java
index fd2cfa5..8511a6f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingWithMultipleFilesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpSimpleConsumeStreamingWithMultipleFilesTest.java
@@ -63,7 +63,7 @@ public class FtpSimpleConsumeStreamingWithMultipleFilesTest extends FtpServerTes
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("ftp://localhost:" + getPort() + "/tmp/mytemp?username=admin&password=admin&delay=10s&disconnect=true&streamDownload=true&stepwise=false").routeId("foo").noAutoStartup()
+ from("ftp://localhost:" + getPort() + "/tmp/mytemp?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true&stepwise=false").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpPollEnrichConsumeWithDisconnectAndDeleteTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpPollEnrichConsumeWithDisconnectAndDeleteTest.java
index 97684ca..715c4b7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpPollEnrichConsumeWithDisconnectAndDeleteTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/SftpPollEnrichConsumeWithDisconnectAndDeleteTest.java
@@ -82,7 +82,7 @@ public class SftpPollEnrichConsumeWithDisconnectAndDeleteTest extends SftpServer
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("vm:trigger").pollEnrich("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&delete=true")
+ from("vm:trigger").pollEnrich("sftp://localhost:" + getPort() + "/" + 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/SftpECKeyFileConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpECKeyFileConsumeTest.java
index a0f94f3..f2c146b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpECKeyFileConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpECKeyFileConsumeTest.java
@@ -58,7 +58,7 @@ public class SftpECKeyFileConsumeTest extends SftpServerTestSupport {
@Override
public void configure() throws Exception {
from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&knownHostsFile=" + getKnownHostsFile()
- + "&privateKeyFile=./src/test/resources/ec.pem&delay=10s&disconnect=true").routeId("foo").noAutoStartup().to("mock:result");
+ + "&privateKeyFile=./src/test/resources/ec.pem&delay=10000&disconnect=true").routeId("foo").noAutoStartup().to("mock:result");
}
};
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyConsumeTest.java
index 5ab99d1..4cbba3f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyConsumeTest.java
@@ -78,7 +78,7 @@ public class SftpKeyConsumeTest extends SftpServerTestSupport {
@Override
public void configure() throws Exception {
from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR
- + "?username=admin&knownHosts=#knownHosts&privateKey=#privateKey&privateKeyPassphrase=secret&delay=10s&strictHostKeyChecking=yes&disconnect=true")
+ + "?username=admin&knownHosts=#knownHosts&privateKey=#privateKey&privateKeyPassphrase=secret&delay=10000&strictHostKeyChecking=yes&disconnect=true")
.routeId("foo").noAutoStartup().to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyFileConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyFileConsumeTest.java
index c1d6e9b..2c79ee8 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyFileConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyFileConsumeTest.java
@@ -58,7 +58,7 @@ public class SftpKeyFileConsumeTest extends SftpServerTestSupport {
@Override
public void configure() throws Exception {
from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&knownHostsFile=" + getKnownHostsFile()
- + "&privateKeyFile=./src/test/resources/id_rsa&privateKeyPassphrase=secret&delay=10s&disconnect=true").routeId("foo").noAutoStartup().to("mock:result");
+ + "&privateKeyFile=./src/test/resources/id_rsa&privateKeyPassphrase=secret&delay=10000&disconnect=true").routeId("foo").noAutoStartup().to("mock:result");
}
};
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java
index cb80bef..603e314 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairDSAConsumeTest.java
@@ -72,7 +72,7 @@ public class SftpKeyPairDSAConsumeTest extends SftpServerTestSupport {
@Override
public void configure() throws Exception {
from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR
- + "?username=admin&knownHosts=#knownHosts&keyPair=#keyPair&delay=10s&strictHostKeyChecking=yes&disconnect=true").routeId("foo").noAutoStartup()
+ + "?username=admin&knownHosts=#knownHosts&keyPair=#keyPair&delay=10000&strictHostKeyChecking=yes&disconnect=true").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairRSAConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairRSAConsumeTest.java
index 6fde554..204b01d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairRSAConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyPairRSAConsumeTest.java
@@ -86,7 +86,7 @@ public class SftpKeyPairRSAConsumeTest extends SftpServerTestSupport {
@Override
public void configure() throws Exception {
from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR
- + "?username=admin&knownHosts=#knownHosts&keyPair=#keyPair&delay=10s&strictHostKeyChecking=yes&disconnect=true").routeId("foo").noAutoStartup()
+ + "?username=admin&knownHosts=#knownHosts&keyPair=#keyPair&delay=10000&strictHostKeyChecking=yes&disconnect=true").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeFromClasspathTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeFromClasspathTest.java
index 0482a46..69bd9b1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeFromClasspathTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeFromClasspathTest.java
@@ -50,7 +50,7 @@ public class SftpKeyUriConsumeFromClasspathTest extends SftpServerTestSupport {
@Override
public void configure() throws Exception {
from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR
- + "?username=admin&knownHostsUri=known_hosts&privateKeyUri=id_rsa&privateKeyPassphrase=secret&delay=10s&disconnect=true").routeId("foo").noAutoStartup()
+ + "?username=admin&knownHostsUri=known_hosts&privateKeyUri=id_rsa&privateKeyPassphrase=secret&delay=10000&disconnect=true").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeTest.java
index 3562eb8..b6e9699 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpKeyUriConsumeTest.java
@@ -50,7 +50,7 @@ public class SftpKeyUriConsumeTest extends SftpServerTestSupport {
@Override
public void configure() throws Exception {
from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&knownHostsUri=file:" + getKnownHostsFile()
- + "&privateKeyUri=file:./src/test/resources/id_rsa&privateKeyPassphrase=secret&delay=10s&disconnect=true").routeId("foo").noAutoStartup().to("mock:result");
+ + "&privateKeyUri=file:./src/test/resources/id_rsa&privateKeyPassphrase=secret&delay=10000&disconnect=true").routeId("foo").noAutoStartup().to("mock:result");
}
};
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java
index 910efd4..48ca1e0 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeNotStepwiseTest.java
@@ -25,7 +25,7 @@ public class SftpSimpleConsumeNotStepwiseTest extends SftpSimpleConsumeTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&stepwise=false").routeId("foo")
+ from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10000&disconnect=true&stepwise=false").routeId("foo")
.noAutoStartup().to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java
index ecb24af..bbc01f9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveNotStepwiseTest.java
@@ -25,7 +25,7 @@ public class SftpSimpleConsumeRecursiveNotStepwiseTest extends SftpSimpleConsume
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&recursive=true&stepwise=false").routeId("foo")
+ from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10000&disconnect=true&recursive=true&stepwise=false").routeId("foo")
.noAutoStartup().to("log:result", "mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java
index 3ee1460..d105e9c 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeRecursiveTest.java
@@ -48,7 +48,7 @@ public class SftpSimpleConsumeRecursiveTest extends SftpServerTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&recursive=true").routeId("foo")
+ from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10000&disconnect=true&recursive=true").routeId("foo")
.noAutoStartup().to("log:result", "mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingPartialReadTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingPartialReadTest.java
index 8c59c21..7a3efa9 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingPartialReadTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingPartialReadTest.java
@@ -69,7 +69,7 @@ public class SftpSimpleConsumeStreamingPartialReadTest extends SftpServerTestSup
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&streamDownload=true"
+ from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true"
+ "&move=done&moveFailed=failed").routeId("foo").noAutoStartup().process(new Processor() {
@Override
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingTest.java
index b529b9d..c8eb763 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingTest.java
@@ -56,7 +56,7 @@ public class SftpSimpleConsumeStreamingTest extends SftpServerTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&streamDownload=true").routeId("foo")
+ from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true").routeId("foo")
.noAutoStartup().to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingWithMultipleFilesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingWithMultipleFilesTest.java
index 4028ee3..f075563 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingWithMultipleFilesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeStreamingWithMultipleFilesTest.java
@@ -60,7 +60,7 @@ public class SftpSimpleConsumeStreamingWithMultipleFilesTest extends SftpServerT
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&streamDownload=true").routeId("foo")
+ from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true").routeId("foo")
.noAutoStartup().to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java
index ea3a2c3..8810b08 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeTest.java
@@ -49,7 +49,7 @@ public class SftpSimpleConsumeTest extends SftpServerTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true").routeId("foo").noAutoStartup()
+ from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10000&disconnect=true").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeThroughProxyTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeThroughProxyTest.java
index 5293ecc..d0e37fe 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeThroughProxyTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleConsumeThroughProxyTest.java
@@ -69,7 +69,7 @@ public class SftpSimpleConsumeThroughProxyTest extends SftpServerTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true&proxy=#proxy").routeId("foo").noAutoStartup()
+ from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10000&disconnect=true&proxy=#proxy").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleIPV6ConsumeTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleIPV6ConsumeTest.java
index 45db7c8..b9d5d95 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleIPV6ConsumeTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpSimpleIPV6ConsumeTest.java
@@ -51,7 +51,7 @@ public class SftpSimpleIPV6ConsumeTest extends SftpServerTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sftp://[::1]:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10s&disconnect=true").routeId("foo").noAutoStartup()
+ from("sftp://[::1]:" + getPort() + "/" + FTP_ROOT_DIR + "?username=admin&password=admin&delay=10000&disconnect=true").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpUseListFalseTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpUseListFalseTest.java
index b488e84..cfecd23 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpUseListFalseTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/SftpUseListFalseTest.java
@@ -50,7 +50,7 @@ public class SftpUseListFalseTest extends SftpServerTestSupport {
@Override
public void configure() throws Exception {
from("sftp://localhost:" + getPort() + "/" + FTP_ROOT_DIR
- + "?username=admin&password=admin&delay=10s&disconnect=true&stepwise=false&useList=false&fileName=report.txt&delete=true").routeId("foo").noAutoStartup()
+ + "?username=admin&password=admin&delay=10000&disconnect=true&stepwise=false&useList=false&fileName=report.txt&delete=true").routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java
index 28225df..ad5026e 100644
--- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java
+++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcAnotherRouteTest.java
@@ -41,7 +41,7 @@ public class JdbcAnotherRouteTest extends AbstractJdbcTestSupport {
return new RouteBuilder() {
public void configure() throws Exception {
// trigger every second
- from("timer://kickoff?period=1s").
+ from("timer://kickoff?period=1000").
setBody(constant("select * from customer")).
to("jdbc:testdb").
to("mock:result");
diff --git a/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml b/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml
index c08b4ae..2e33116 100644
--- a/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml
+++ b/components/camel-jdbc/src/test/resources/org/apache/camel/component/jdbc/camelContext.xml
@@ -30,7 +30,7 @@
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<!-- trigger every second -->
- <from uri="timer://kickoff?period=1s"/>
+ <from uri="timer://kickoff?period=1000"/>
<setBody>
<constant>select * from customer</constant>
</setBody>
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
index 8160142..ea85caa 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftClusteredRoutePolicyTest.java
@@ -92,7 +92,7 @@ public class JGroupsRaftClusteredRoutePolicyTest extends JGroupsRaftClusterAbstr
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:master?delay=1s&period=1s")
+ from("timer:master?delay=1000&period=1000")
.routeId("route-" + id)
.routePolicy(ClusteredRoutePolicy.forNamespace("jgr"))
.log("From ${routeId}");
diff --git a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java
index dd9cd89..ae816b7 100644
--- a/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java
+++ b/components/camel-jgroups-raft/src/test/java/org/apache/camel/component/jgroups/raft/cluster/JGroupsRaftMasterTest.java
@@ -96,7 +96,7 @@ public class JGroupsRaftMasterTest extends JGroupsRaftClusterAbstractTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("master:jgr:timer:master?delay=1s&period=1s")
+ from("master:jgr:timer:master?delay=1000&period=1000")
.routeId("route-" + id)
.log("From ${routeId}");
}
diff --git a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
index 4955ad4..2662e90 100644
--- a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
+++ b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/cluster/JGroupsLockMasterTest.java
@@ -76,7 +76,7 @@ public class JGroupsLockMasterTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("master:jgl:timer:master?delay=1s&period=1s")
+ from("master:jgl:timer:master?delay=1000&period=1000")
.routeId("route-" + id)
.log("From ${routeId}")
.process(e -> contextLatch.countDown());
diff --git a/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java b/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java
index d35cc26..560b6d6 100644
--- a/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java
+++ b/components/camel-master/src/test/java/org/apache/camel/component/master/MasterComponentTest.java
@@ -76,7 +76,7 @@ public class MasterComponentTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("master:ns:timer:test?delay=1s&period=1s")
+ from("master:ns:timer:test?delay=1000&period=1000")
.routeId("route-" + id)
.log("From ${routeId}")
.process(e -> contextLatch.countDown());
diff --git a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubSensor2Example.java b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubSensor2Example.java
index d5055f6..d4e1d0b 100644
--- a/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubSensor2Example.java
+++ b/components/camel-pubnub/src/test/java/org/apache/camel/component/pubnub/example/PubNubSensor2Example.java
@@ -73,7 +73,7 @@ public final class PubNubSensor2Example {
.log("${body} headers : ${headers}").to("mock:result");
//TODO Could remote control device to turn on/off sensor measurement
- from("timer:master?delay=15s&period=5s").routeId("unicast2device-route")
+ from("timer:master?delay=15000&period=5000").routeId("unicast2device-route")
.setHeader(PubNubConstants.CHANNEL, method(PubNubSensor2Example.PubsubRoute.DataProcessorBean.class, "getUnicastChannelOfDevice()"))
.setBody(constant("Hello device"))
.to(masterEP);
diff --git a/components/camel-splunk/src/main/docs/splunk-component.adoc b/components/camel-splunk/src/main/docs/splunk-component.adoc
index 6758f8e..affb8a3 100644
--- a/components/camel-splunk/src/main/docs/splunk-component.adoc
+++ b/components/camel-splunk/src/main/docs/splunk-component.adoc
@@ -79,7 +79,7 @@ name of the query in the savedSearch option.
[source,java]
---------------------------------------------------------------------------------------------------------------------------------------------
- from("splunk://normal?delay=5s&username=user&password=123&initEarliestTime=-10s&search=search index=myindex sourcetype=someSourcetype")
+ from("splunk://normal?delay=5000&username=user&password=123&initEarliestTime=-10s&search=search index=myindex sourcetype=someSourcetype")
.to("direct:search-result");
---------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
index cde06f5..086dd9f 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerStreamingTest.java
@@ -65,7 +65,7 @@ public class ConsumerStreamingTest extends SplunkMockTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("splunk://normal?delay=5s&username=foo&password=bar&initEarliestTime=-10s&latestTime=now&search=search index=myindex&sourceType=testSource&streaming=true")
+ from("splunk://normal?delay=5000&username=foo&password=bar&initEarliestTime=-10s&latestTime=now&search=search index=myindex&sourceType=testSource&streaming=true")
.to("mock:search-result");
}
};
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
index 160e6ec..3f635dc 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/ConsumerTest.java
@@ -68,7 +68,7 @@ public class ConsumerTest extends SplunkMockTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("splunk://normal?delay=5s&username=foo&password=bar&initEarliestTime=-10s&latestTime=now&search=search index=myindex&sourceType=testSource")
+ from("splunk://normal?delay=5000&username=foo&password=bar&initEarliestTime=-10s&latestTime=now&search=search index=myindex&sourceType=testSource")
.to("mock:search-result");
}
};
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
index 2c7d156..cd33c2d 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/SplunkComponentConfigurationTest.java
@@ -87,7 +87,7 @@ public class SplunkComponentConfigurationTest extends CamelTestSupport {
SplunkComponent component = context.getComponent("splunk", SplunkComponent.class);
SplunkEndpoint endpoint = (SplunkEndpoint)component
- .createEndpoint("splunk://normal?username=test&password=pw&host=myhost&port=3333&delay=10s&" + "search=Splunk search query goes here&initEarliestTime=-1d"
+ .createEndpoint("splunk://normal?username=test&password=pw&host=myhost&port=3333&delay=10000&" + "search=Splunk search query goes here&initEarliestTime=-1d"
+ "&latestTime=now&count=10&" + "owner=me&app=fantasticapp");
assertEquals("myhost", endpoint.getConfiguration().getHost());
assertEquals(3333, endpoint.getConfiguration().getPort());
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
index aabe29d..9bd10b9 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/NormalSearchTest.java
@@ -50,7 +50,7 @@ public class NormalSearchTest extends SplunkTest {
from("direct:submit").to("splunk://submit?username=" + SPLUNK_USERNAME + "&password=" + SPLUNK_PASSWORD + "&index=" + INDEX + "&sourceType=testSource&source=test")
.to("mock:submit-result");
- from("splunk://normal?delay=5s&username=" + SPLUNK_USERNAME + "&password=" + SPLUNK_PASSWORD + "&initEarliestTime=-10s&latestTime=now" + "&search=search index="
+ from("splunk://normal?delay=5000&username=" + SPLUNK_USERNAME + "&password=" + SPLUNK_PASSWORD + "&initEarliestTime=-10s&latestTime=now" + "&search=search index="
+ INDEX + " sourcetype=testSource").to("mock:search-result");
}
};
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
index 1c9ddae..80db504 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/RealtimeSearchTest.java
@@ -48,7 +48,7 @@ public class RealtimeSearchTest extends SplunkTest {
from("direct:submit").to("splunk://submit?username=" + SPLUNK_USERNAME + "&password=" + SPLUNK_PASSWORD + "&index=" + INDEX + "&sourceType=testSource&source=test")
.to("mock:submit-result");
- from("splunk://realtime?delay=5s&username=" + SPLUNK_USERNAME + "&password=" + SPLUNK_PASSWORD + "&initEarliestTime=rt-10s&search=search index=" + INDEX
+ from("splunk://realtime?delay=5000&username=" + SPLUNK_USERNAME + "&password=" + SPLUNK_PASSWORD + "&initEarliestTime=rt-10s&search=search index=" + INDEX
+ " sourcetype=testSource").to("mock:search-saved");
}
};
diff --git a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
index 14e5998..bebb7ee 100644
--- a/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
+++ b/components/camel-splunk/src/test/java/org/apache/camel/component/splunk/integration/SavedSearchTest.java
@@ -51,7 +51,7 @@ public class SavedSearchTest extends SplunkTest {
from("direct:submit").to("splunk://submit?username=" + SPLUNK_USERNAME + "&password=" + SPLUNK_PASSWORD + "&index=" + INDEX + "&sourceType=testSource&source=test")
.to("mock:submit-result");
- from("splunk://savedsearch?delay=5s&username=" + SPLUNK_USERNAME + "&password=" + SPLUNK_PASSWORD + "&initEarliestTime=-10s&latestTime=now" + "&savedSearch=junit")
+ from("splunk://savedsearch?delay=5000&username=" + SPLUNK_USERNAME + "&password=" + SPLUNK_PASSWORD + "&initEarliestTime=-10s&latestTime=now" + "&savedSearch=junit")
.to("mock:search-saved");
}
};
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java
index 83f9853..7a8a81f 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryMain.java
@@ -54,7 +54,7 @@ public final class ZooKeeperClusteredRoutePolicyFactoryMain {
main.addRoutesBuilder(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:clustered?delay=1s&period=1s")
+ from("timer:clustered?delay=1000&period=1000")
.routeId("route-" + id)
.log("Route ${routeId} is running ...");
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
index 1b18580..482ed02 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
@@ -93,7 +93,7 @@ public final class ZooKeeperClusteredRoutePolicyFactoryTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:zookeeper?delay=1s&period=1s")
+ from("timer:zookeeper?delay=1000&period=1000")
.routeId("route-" + id)
.log("From ${routeId}")
.process(e -> contextLatch.countDown());
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
index 94aaffa..ff072a4 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
@@ -92,7 +92,7 @@ public final class ZooKeeperClusteredRoutePolicyTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:zookeeper?delay=1s&period=1s")
+ from("timer:zookeeper?delay=1000&period=1000")
.routeId("route-" + id)
.routePolicy(ClusteredRoutePolicy.forNamespace("my-ns"))
.log("From ${routeId}")
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
index a2f29c5..cb195c5 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
@@ -91,7 +91,7 @@ public final class ZooKeeperMasterTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("master:zk:timer:master?delay=1s&period=1s")
+ from("master:zk:timer:master?delay=1000&period=1000")
.routeId("route-" + id)
.log("From ${routeId}")
.process(e -> contextLatch.countDown());
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
index 0ea3354..cbf0151 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
@@ -80,7 +80,7 @@ public final class FileLockClusteredRoutePolicyTest {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:file-lock?delay=1s&period=1s").routeId("route-" + id).routePolicy(ClusteredRoutePolicy.forNamespace("my-ns")).log("From ${routeId}")
+ from("timer:file-lock?delay=1000&period=1000").routeId("route-" + id).routePolicy(ClusteredRoutePolicy.forNamespace("my-ns")).log("From ${routeId}")
.process(e -> contextLatch.countDown());
}
});
diff --git a/docs/components/modules/ROOT/pages/splunk-component.adoc b/docs/components/modules/ROOT/pages/splunk-component.adoc
index 56ae4b8..8aeaeb5 100644
--- a/docs/components/modules/ROOT/pages/splunk-component.adoc
+++ b/docs/components/modules/ROOT/pages/splunk-component.adoc
@@ -80,7 +80,7 @@ name of the query in the savedSearch option.
[source,java]
---------------------------------------------------------------------------------------------------------------------------------------------
- from("splunk://normal?delay=5s&username=user&password=123&initEarliestTime=-10s&search=search index=myindex sourcetype=someSourcetype")
+ from("splunk://normal?delay=5000&username=user&password=123&initEarliestTime=-10s&search=search index=myindex sourcetype=someSourcetype")
.to("direct:search-result");
---------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index 1298f61..ddef34b 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -786,7 +786,7 @@ For example a timer with a 5 second period
[source,java]
----
-from("timer:foo?period=5s")
+from("timer:foo?period=5000")
----
Should now be specified as numeric only:
diff --git a/docs/user-manual/modules/ROOT/pages/clustering.adoc b/docs/user-manual/modules/ROOT/pages/clustering.adoc
index fe286f2..dc2a692 100644
--- a/docs/user-manual/modules/ROOT/pages/clustering.adoc
+++ b/docs/user-manual/modules/ROOT/pages/clustering.adoc
@@ -110,7 +110,7 @@ context.addRoutes(new RouteBuilder {
RoutePolicy policy = ClusteredRoutePolicy.forNamespace("my-ns");
// bind the policy to one or more routes
- from("timer:clustered?delay=1s&period=1s")
+ from("timer:clustered?delay=1000&period=1000")
.routePolicy(policy)
.log("Route ${routeId} is running ...");
}
@@ -128,7 +128,7 @@ context.addRoutes(new RouteBuilder {
@Override
public void configure() throws Exception {
// bind the policy to one or more routes
- from("timer:clustered?delay=1s&period=1s")
+ from("timer:clustered?delay=1000&period=1000")
.log("Route ${routeId} is running ...");
}
});
@@ -145,10 +145,10 @@ public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:heartbeat?period=10s")
+ from("timer:heartbeat?period=10000")
.routeId("heartbeat")
.log("HeartBeat route (timer) ...");
- from("timer:clustered?period=5s")
+ from("timer:clustered?period=5000")
.routeId("clustered")
.log("Clustered route (timer) ...");
}
@@ -188,10 +188,10 @@ public RouteBuilder routeBuilder() {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("timer:heartbeat?period=10s")
+ from("timer:heartbeat?period=10000")
.routeId("heartbeat")
.log("HeartBeat route (timer) ...");
- from("master:my-ns:timer:clustered?period=5s")
+ from("master:my-ns:timer:clustered?period=5000")
.routeId("clustered")
.log("Clustered route (timer) ...");
}
diff --git a/docs/user-manual/modules/ROOT/pages/polling-consumer.adoc b/docs/user-manual/modules/ROOT/pages/polling-consumer.adoc
index fd28244..f3ffd39 100644
--- a/docs/user-manual/modules/ROOT/pages/polling-consumer.adoc
+++ b/docs/user-manual/modules/ROOT/pages/polling-consumer.adoc
@@ -297,7 +297,7 @@ while you can do:
[source,java]
----
-from("ftp://myserver?username=foo&password=secret&delete=true&delay=5s&backoffMultiplier=6&backoffIdleThreshold=5")
+from("ftp://myserver?username=foo&password=secret&delete=true&delay=5000&backoffMultiplier=6&backoffIdleThreshold=5")
.to("bean:processFile");
----
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java
index f32fd24..5b2d588 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java
@@ -43,7 +43,7 @@ import org.junit.Test;
public class FtpCronScheduledRoutePolicyTest extends CamelTestSupport {
protected FtpServer ftpServer;
- private String ftp = "ftp:localhost:20128/myapp?password=admin&username=admin&delay=5s&idempotent=false&localWorkDirectory=target/tmp";
+ private String ftp = "ftp:localhost:20128/myapp?password=admin&username=admin&delay=5000&idempotent=false&localWorkDirectory=target/tmp";
@Test
public void testFtpCronScheduledRoutePolicyTest() throws Exception {