Repository: camel Updated Branches: refs/heads/camel-2.16.x 367eb6573 -> b98c8ae65 refs/heads/master 1e5bc2487 -> ec91dc5af
Component docs - Add missing options and fixed invalid configurations Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5633d3f3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5633d3f3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5633d3f3 Branch: refs/heads/master Commit: 5633d3f32f4961705916c3a49bd880727231afe2 Parents: 1e5bc24 Author: Claus Ibsen <[email protected]> Authored: Sun Jan 3 12:01:16 2016 +0100 Committer: Claus Ibsen <[email protected]> Committed: Sun Jan 3 12:01:16 2016 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/mock/MockComponent.java | 1 + .../org/apache/camel/component/mock/MockEndpoint.java | 13 +++++++++++++ .../camel/component/file/FileNoOpLockFileTest.java | 2 +- .../stress/FileAsyncStressReadLockLockFileTest.java | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5633d3f3/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java index 3bd356e..7f42a89 100644 --- a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java @@ -44,6 +44,7 @@ public class MockComponent extends UriEndpointComponent { if (value != null) { Processor reporter = new ThroughputLogger(new CamelLogger("org.apache.camel.component.mock:" + remaining), value); endpoint.setReporter(reporter); + endpoint.setReportGroup(value); } return endpoint; } http://git-wip-us.apache.org/repos/asf/camel/blob/5633d3f3/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java index ab4801d..8c4157e 100644 --- a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java @@ -133,6 +133,8 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint { private int retainFirst; @UriParam(label = "producer", defaultValue = "-1") private int retainLast; + @UriParam(label = "producer") + private int reportGroup; @UriParam(label = "producer,advanced", defaultValue = "true") private boolean copyOnExchange = true; @@ -1219,6 +1221,17 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint { this.retainLast = retainLast; } + public int isReportGroup() { + return reportGroup; + } + + /** + * A number that is used to turn on throughput logging based on groups of the size. + */ + public void setReportGroup(int reportGroup) { + this.reportGroup = reportGroup; + } + public boolean isCopyOnExchange() { return copyOnExchange; } http://git-wip-us.apache.org/repos/asf/camel/blob/5633d3f3/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java index 248973a..afe7642 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileNoOpLockFileTest.java @@ -84,7 +84,7 @@ public class FileNoOpLockFileTest extends ContextTestSupport { to("mock:report"); // for no locks - from("file://target/reports/notlocked/?noop=true&readLock=false").process(new MyNoopProcessor()). + from("file://target/reports/notlocked/?noop=true&readLock=none").process(new MyNoopProcessor()). to("mock:report"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/5633d3f3/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java b/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java index 5668e3a..4aaf5a1 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java @@ -35,7 +35,7 @@ public class FileAsyncStressReadLockLockFileTest extends FileAsyncStressTest { // leverage the fact that we can limit to max 50 files per poll // this will result in polling again and potentially picking up files // that already are in progress - from("file:target/filestress?maxMessagesPerPoll=50&readLock=lockFile").routeId("foo").noAutoStartup() + from("file:target/filestress?maxMessagesPerPoll=50&readLock=fileLock").routeId("foo").noAutoStartup() .threads(10) .process(new Processor() { public void process(Exchange exchange) throws Exception {
