Repository: camel Updated Branches: refs/heads/master 1c7a2d749 -> 35cc8902b
CAMEL-8023: Model and component javadoc documentation Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a28d0e4a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a28d0e4a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a28d0e4a Branch: refs/heads/master Commit: a28d0e4af5dd4b9b5a7684ab7e6560a040d0b21e Parents: 1c7a2d7 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Feb 7 10:50:03 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Feb 7 10:50:03 2015 +0100 ---------------------------------------------------------------------- .../component/dataset/DataSetEndpoint.java | 22 +++++++++++++------- .../camel/component/mock/MockEndpoint.java | 17 ++++++++++++++- .../component/seda/SedaConcurrentTest.java | 8 +++---- .../processor/DelayerAsyncDelayedTest.java | 2 +- .../org/apache/camel/processor/DelayerTest.java | 6 +++--- .../aggregator/AggregateTimeoutManualTest.java | 2 +- .../aggregator/AggregateTimeoutOnlyTest.java | 2 +- 7 files changed, 40 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a28d0e4a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java index ae949e6..a628605 100644 --- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java @@ -110,14 +110,6 @@ public class DataSetEndpoint extends MockEndpoint implements Service { return exchange; } - public int getMinRate() { - return minRate; - } - - public void setMinRate(int minRate) { - this.minRate = minRate; - } - @Override protected void waitForCompleteLatch(long timeout) throws InterruptedException { super.waitForCompleteLatch(timeout); @@ -143,6 +135,17 @@ public class DataSetEndpoint extends MockEndpoint implements Service { this.dataSet = dataSet; } + public int getMinRate() { + return minRate; + } + + /** + * Wait until the DataSet contains at least this number of messages + */ + public void setMinRate(int minRate) { + this.minRate = minRate; + } + public long getPreloadSize() { return preloadSize; } @@ -180,6 +183,9 @@ public class DataSetEndpoint extends MockEndpoint implements Service { return initialDelay; } + /** + * Time period in millis to wait before starting sending messages. + */ public void setInitialDelay(long initialDelay) { this.initialDelay = initialDelay; } http://git-wip-us.apache.org/repos/asf/camel/blob/a28d0e4a/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 25cf56e..088f983 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 @@ -1047,11 +1047,19 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint { * Sets the minimum expected amount of time (in millis) the {@link #assertIsSatisfied()} will * wait on a latch until it is satisfied */ - public void setMinimumResultWaitTime(long resultMinimumWaitTime) { + public void setResultMinimumWaitTime(long resultMinimumWaitTime) { this.resultMinimumWaitTime = resultMinimumWaitTime; } /** + * @deprecated use {@link #setResultMinimumWaitTime(long)} + */ + @Deprecated + public void setMinimumResultWaitTime(long resultMinimumWaitTime) { + setResultMinimumWaitTime(resultMinimumWaitTime); + } + + /** * Specifies the expected number of message exchanges that should be * received by this endpoint. * <p/> @@ -1070,6 +1078,13 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint { * expected by this endpoint * @see #setAssertPeriod(long) */ + public void setExpectedCount(int expectedCount) { + setExpectedMessageCount(expectedCount); + } + + /** + * @see #setExpectedCount(int) + */ public void setExpectedMessageCount(int expectedCount) { this.expectedCount = expectedCount; if (expectedCount <= 0) { http://git-wip-us.apache.org/repos/asf/camel/blob/a28d0e4a/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java index 5cbbf5a..9682485 100644 --- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java @@ -39,7 +39,7 @@ public class SedaConcurrentTest extends ContextTestSupport { mock.expectedMessageCount(20); // should at least take 3 sec - mock.setMinimumResultWaitTime(3000); + mock.setResultMinimumWaitTime(3000); for (int i = 0; i < 20; i++) { template.sendBody("seda:foo", "Message " + i); @@ -53,7 +53,7 @@ public class SedaConcurrentTest extends ContextTestSupport { mock.expectedMessageCount(20); // should at least take 3 sec - mock.setMinimumResultWaitTime(3000); + mock.setResultMinimumWaitTime(3000); for (int i = 0; i < 20; i++) { template.asyncSendBody("seda:foo", "Message " + i); @@ -68,7 +68,7 @@ public class SedaConcurrentTest extends ContextTestSupport { mock.allMessages().body().startsWith("Bye"); // should at least take 3 sec - mock.setMinimumResultWaitTime(3000); + mock.setResultMinimumWaitTime(3000); ExecutorService executors = Executors.newFixedThreadPool(10); List<Object> replies = new ArrayList<Object>(20); @@ -94,7 +94,7 @@ public class SedaConcurrentTest extends ContextTestSupport { mock.allMessages().body().startsWith("Bye"); // should at least take 3 sec - mock.setMinimumResultWaitTime(3000); + mock.setResultMinimumWaitTime(3000); // use our own template that has a higher thread pool than default camel that uses 5 ExecutorService executor = Executors.newFixedThreadPool(10); http://git-wip-us.apache.org/repos/asf/camel/blob/a28d0e4a/camel-core/src/test/java/org/apache/camel/processor/DelayerAsyncDelayedTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/DelayerAsyncDelayedTest.java b/camel-core/src/test/java/org/apache/camel/processor/DelayerAsyncDelayedTest.java index ec42ef6..9a99057 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/DelayerAsyncDelayedTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/DelayerAsyncDelayedTest.java @@ -45,7 +45,7 @@ public class DelayerAsyncDelayedTest extends ContextTestSupport { MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class); resultEndpoint.expectedMessageCount(1); // should at least take 1 sec to complete - resultEndpoint.setMinimumResultWaitTime(900); + resultEndpoint.setResultMinimumWaitTime(900); template.sendBody("seda:b", "<hello>world!</hello>"); resultEndpoint.assertIsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/a28d0e4a/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java b/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java index b846001..16b60fa 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java @@ -51,7 +51,7 @@ public class DelayerTest extends ContextTestSupport { MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class); resultEndpoint.expectedMessageCount(1); // should at least take 1 sec to complete - resultEndpoint.setMinimumResultWaitTime(900); + resultEndpoint.setResultMinimumWaitTime(900); template.sendBody("seda:b", "<hello>world!</hello>"); resultEndpoint.assertIsSatisfied(); } @@ -60,7 +60,7 @@ public class DelayerTest extends ContextTestSupport { MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class); resultEndpoint.expectedMessageCount(1); // should at least take 1 sec to complete - resultEndpoint.setMinimumResultWaitTime(900); + resultEndpoint.setResultMinimumWaitTime(900); template.sendBody("seda:c", "<hello>world!</hello>"); resultEndpoint.assertIsSatisfied(); } @@ -69,7 +69,7 @@ public class DelayerTest extends ContextTestSupport { MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class); resultEndpoint.expectedMessageCount(1); // should at least take 1 sec to complete - resultEndpoint.setMinimumResultWaitTime(900); + resultEndpoint.setResultMinimumWaitTime(900); template.sendBodyAndHeader("seda:d", "<hello>world!</hello>", BEAN_DELAYER_HEADER, 1000); resultEndpoint.assertIsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/a28d0e4a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutManualTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutManualTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutManualTest.java index 08b1ca4..8028391 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutManualTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutManualTest.java @@ -37,7 +37,7 @@ public class AggregateTimeoutManualTest extends ContextTestSupport { // by default the use latest aggregation strategy result.expectedBodiesReceived("Message 1999"); // should take at least 3 seconds to complete this one - result.setMinimumResultWaitTime(2500); + result.setResultMinimumWaitTime(2500); for (int i = 0; i < 2000; i++) { template.sendBodyAndHeader("direct:start", "Message " + i, "id", "1"); http://git-wip-us.apache.org/repos/asf/camel/blob/a28d0e4a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java index ce6503f..86e94d0 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java @@ -33,7 +33,7 @@ public class AggregateTimeoutOnlyTest extends ContextTestSupport { // by default the use latest aggregation strategy is used so we get message 9 result.expectedBodiesReceived("Message 9"); // should take 3 seconds to complete this one - result.setMinimumResultWaitTime(2500); + result.setResultMinimumWaitTime(2500); for (int i = 0; i < 10; i++) { template.sendBodyAndHeader("direct:start", "Message " + i, "id", "1");
