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 2016/01/03 12:15:33 UTC
[2/4] camel git commit: Component docs - Add missing options and
fixed invalid configurations
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/0ddf543c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0ddf543c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0ddf543c
Branch: refs/heads/camel-2.16.x
Commit: 0ddf543cb5940d066aa8ddee8fbf9795c9d695e2
Parents: 367eb65
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jan 3 12:01:16 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jan 3 12:07:12 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/0ddf543c/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/0ddf543c/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 672e902..b38a7cc 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
@@ -131,6 +131,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;
@@ -1217,6 +1219,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/0ddf543c/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/0ddf543c/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 {