CAMEL-8316: Rename property language to exchangeProperty to avoid ambiguity, confusion and clash with properties as a general term.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/88642501 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/88642501 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/88642501 Branch: refs/heads/master Commit: 8864250163fb3a96810c5d756bccb34a86fd10c6 Parents: d162527 Author: Claus Ibsen <[email protected]> Authored: Thu Feb 5 11:52:49 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Feb 5 15:51:23 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/builder/ExpressionClause.java | 12 +++++++- .../file/FileConsumeMaxMessagesPerPollTest.java | 4 +-- .../component/file/FileConsumerBatchTest.java | 6 ++-- .../mock/MockEndpointTimeClauseTest.java | 8 ++--- .../camel/issues/MockValueBuilderIssueTest.java | 8 ++--- .../issues/SplitStopOnExceptionIssueTest.java | 2 +- .../issues/TryCatchWithSplitIssueTest.java | 8 ++--- .../TryCatchWithSplitNotHandledIssueTest.java | 2 +- .../org/apache/camel/language/PropertyTest.java | 4 +-- .../apache/camel/processor/ConvertBodyTest.java | 2 +- ...tterChannelExceptionCausePropagatedTest.java | 2 +- .../camel/processor/FilterNotMatchedTest.java | 10 +++--- .../apache/camel/processor/FilterNotTest.java | 2 +- .../org/apache/camel/processor/FilterTest.java | 2 +- .../camel/processor/IdempotentConsumerTest.java | 14 ++++----- .../MulticastCompletedPropertyTest.java | 6 ++-- .../OnExceptionContinueToRouteTest.java | 4 +-- .../RecipientListExchangePropertyTest.java | 8 ++--- .../RecipientListNoErrorHandlerTest.java | 2 +- ...ientListWithStringDelimitedPropertyTest.java | 6 ++-- .../RoutingSlipNoErrorHandlerTest.java | 2 +- .../processor/SendToNoErrorHandlerTest.java | 2 +- .../SplitterCompletedPropertyTest.java | 12 ++++---- .../SplitterPropertyContinuedTest.java | 6 ++-- .../camel/processor/ToEndpointPropertyTest.java | 32 ++++++++++---------- .../processor/TryCatchContinueToRouteTest.java | 4 +-- .../processor/TryCatchRecipientListTest.java | 12 ++++---- ...egateCompletionSizeAndBatchConsumerTest.java | 8 ++--- ...pointFailedAfterOnExceptionContinueTest.java | 2 +- .../camel/processor/enricher/EnricherTest.java | 2 +- .../AdviceWithTwoRoutesOnExceptionTest.java | 8 ++--- .../OnExceptionContinueSubRouteTest.java | 2 +- .../OnExceptionContinueSubSubRouteTest.java | 2 +- .../onexception/OnExceptionContinueTest.java | 2 +- .../onexception/OnExceptionContinueTwoTest.java | 2 +- .../onexception/OnExceptionHandledTest.java | 6 ++-- .../OnExceptionUseOriginalMessageTest.java | 8 ++--- .../OnExceptionWithRouteAndContinueTest.java | 4 +-- .../FlexibleAggregationStrategiesTest.java | 4 +-- 39 files changed, 121 insertions(+), 111 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java index b6af214..2fc59bc 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java +++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java @@ -145,9 +145,19 @@ public class ExpressionClause<T> extends ExpressionDefinition { /** * An expression of an exchange property of the given name + * + * @deprecated use {@link #exchangeProperty(String)} instead */ + @Deprecated public T property(String name) { - return delegate.property(name); + return exchangeProperty(name); + } + + /** + * An expression of an exchange property of the given name + */ + public T exchangeProperty(String name) { + return delegate.exchangeProperty(name); } /** http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java index 508a688..84457cc 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java @@ -38,8 +38,8 @@ public class FileConsumeMaxMessagesPerPollTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); // we should poll at most 2 mock.expectedMinimumMessageCount(2); - mock.message(0).property(Exchange.BATCH_SIZE).isEqualTo(2); - mock.message(1).property(Exchange.BATCH_SIZE).isEqualTo(2); + mock.message(0).exchangeProperty(Exchange.BATCH_SIZE).isEqualTo(2); + mock.message(1).exchangeProperty(Exchange.BATCH_SIZE).isEqualTo(2); template.sendBodyAndHeader(fileUrl, "Bye World", Exchange.FILE_NAME, "bye.txt"); template.sendBodyAndHeader(fileUrl, "Hello World", Exchange.FILE_NAME, "hello.txt"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java index 4b29365..adddc0f 100644 --- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBatchTest.java @@ -48,9 +48,9 @@ public class FileConsumerBatchTest extends ContextTestSupport { mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World"); // test header keys - mock.message(0).property(Exchange.BATCH_SIZE).isEqualTo(2); - mock.message(0).property(Exchange.BATCH_INDEX).isEqualTo(0); - mock.message(1).property(Exchange.BATCH_INDEX).isEqualTo(1); + mock.message(0).exchangeProperty(Exchange.BATCH_SIZE).isEqualTo(2); + mock.message(0).exchangeProperty(Exchange.BATCH_INDEX).isEqualTo(0); + mock.message(1).exchangeProperty(Exchange.BATCH_INDEX).isEqualTo(1); assertMockEndpointsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java b/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java index edbcfc2..90293b3 100644 --- a/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java @@ -35,10 +35,10 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport { public void testReceivedTimestamp() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); - mock.message(0).property(Exchange.CREATED_TIMESTAMP).isNotNull(); - mock.message(0).property(Exchange.CREATED_TIMESTAMP).isInstanceOf(Date.class); - mock.message(0).property(Exchange.RECEIVED_TIMESTAMP).isNotNull(); - mock.message(0).property(Exchange.RECEIVED_TIMESTAMP).isInstanceOf(Date.class); + mock.message(0).exchangeProperty(Exchange.CREATED_TIMESTAMP).isNotNull(); + mock.message(0).exchangeProperty(Exchange.CREATED_TIMESTAMP).isInstanceOf(Date.class); + mock.message(0).exchangeProperty(Exchange.RECEIVED_TIMESTAMP).isNotNull(); + mock.message(0).exchangeProperty(Exchange.RECEIVED_TIMESTAMP).isInstanceOf(Date.class); template.sendBody("direct:a", "A"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/issues/MockValueBuilderIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/MockValueBuilderIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/MockValueBuilderIssueTest.java index 920c312..7d64925 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/MockValueBuilderIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/MockValueBuilderIssueTest.java @@ -25,7 +25,7 @@ public class MockValueBuilderIssueTest extends ContextTestSupport { public void testMockValueBuilder() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).property("foo").convertTo(String.class).contains("2"); + mock.message(0).exchangeProperty("foo").convertTo(String.class).contains("2"); template.sendBody("direct:start", "Hello World"); @@ -35,7 +35,7 @@ public class MockValueBuilderIssueTest extends ContextTestSupport { public void testMockValueBuilderFail() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).property("foo").convertTo(String.class).contains("4"); + mock.message(0).exchangeProperty("foo").convertTo(String.class).contains("4"); template.sendBody("direct:start", "Hello World"); @@ -43,7 +43,7 @@ public class MockValueBuilderIssueTest extends ContextTestSupport { assertMockEndpointsSatisfied(); fail("Should fail"); } catch (Throwable e) { - assertEquals("Assertion error at index 0 on mock mock://result with predicate: property(foo) contains 4" + assertEquals("Assertion error at index 0 on mock mock://result with predicate: exchangeProperty(foo) contains 4" + " evaluated as: 123 contains 4 on Exchange[Message: Hello World]", e.getMessage()); } } @@ -51,7 +51,7 @@ public class MockValueBuilderIssueTest extends ContextTestSupport { public void testMockValueBuilderNotSatisfied() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).property("foo").convertTo(String.class).contains("4"); + mock.message(0).exchangeProperty("foo").convertTo(String.class).contains("4"); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/issues/SplitStopOnExceptionIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/SplitStopOnExceptionIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/SplitStopOnExceptionIssueTest.java index c968835..e4c7d1d 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/SplitStopOnExceptionIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/SplitStopOnExceptionIssueTest.java @@ -28,7 +28,7 @@ public class SplitStopOnExceptionIssueTest extends ContextTestSupport { public void testSplit() throws Exception { getMockEndpoint("mock:line").expectedBodiesReceived("Hello", "World", "Kaboom"); - getMockEndpoint("mock:line").allMessages().property("foo").isEqualTo("changed"); + getMockEndpoint("mock:line").allMessages().exchangeProperty("foo").isEqualTo("changed"); getMockEndpoint("mock:result").expectedMessageCount(0); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitIssueTest.java index 043b902..bb3b64f 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitIssueTest.java @@ -30,8 +30,8 @@ public class TryCatchWithSplitIssueTest extends ContextTestSupport { public void testSplitWithErrorIsHandled() throws Exception { MockEndpoint error = getMockEndpoint("mock:error"); error.expectedBodiesReceived("James"); - error.message(0).property(Exchange.EXCEPTION_CAUGHT).isNotNull(); - error.message(0).property(Exchange.EXCEPTION_CAUGHT).method("getMessage").isEqualTo("This is a dummy error James!"); + error.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isNotNull(); + error.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).method("getMessage").isEqualTo("This is a dummy error James!"); MockEndpoint result = getMockEndpoint("mock:result"); result.expectedBodiesReceived("Hi Claus", "Hi Willem"); @@ -44,8 +44,8 @@ public class TryCatchWithSplitIssueTest extends ContextTestSupport { public void testSplitOnlyWithErrorIsHandled() throws Exception { MockEndpoint error = getMockEndpoint("mock:error"); error.expectedBodiesReceived("James"); - error.message(0).property(Exchange.EXCEPTION_CAUGHT).isNotNull(); - error.message(0).property(Exchange.EXCEPTION_CAUGHT).method("getMessage").isEqualTo("This is a dummy error James!"); + error.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isNotNull(); + error.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).method("getMessage").isEqualTo("This is a dummy error James!"); template.sendBody("direct:start", "James"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitNotHandledIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitNotHandledIssueTest.java b/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitNotHandledIssueTest.java index 56a312e..c5913ab 100644 --- a/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitNotHandledIssueTest.java +++ b/camel-core/src/test/java/org/apache/camel/issues/TryCatchWithSplitNotHandledIssueTest.java @@ -30,7 +30,7 @@ public class TryCatchWithSplitNotHandledIssueTest extends ContextTestSupport { public void testSplitWithErrorIsNotHandled() throws Exception { MockEndpoint error = getMockEndpoint("mock:error"); error.expectedBodiesReceived("James"); - error.message(0).property(Exchange.EXCEPTION_CAUGHT).isNotNull(); + error.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isNotNull(); MockEndpoint result = getMockEndpoint("mock:result"); result.expectedBodiesReceived("Hi Claus", "Hi Willem"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java b/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java index 1537eb1..8b607ed 100644 --- a/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java +++ b/camel-core/src/test/java/org/apache/camel/language/PropertyTest.java @@ -22,7 +22,7 @@ import org.apache.camel.language.property.ExchangePropertyLanguage; public class PropertyTest extends LanguageTestSupport { - public void testProertyExpressions() throws Exception { + public void testPropertyExpressions() throws Exception { assertExpression("quote", "Camel rocks"); } @@ -31,7 +31,7 @@ public class PropertyTest extends LanguageTestSupport { } protected String getLanguageName() { - return "property"; + return "exchangeProperty"; } public void testSingleton() { http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java b/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java index 7f64790..af22643 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java @@ -53,7 +53,7 @@ public class ConvertBodyTest extends ContextTestSupport { getMockEndpoint("mock:foo").expectedMessageCount(1); // do not propagate charset to avoid side effects with double conversion etc - getMockEndpoint("mock:foo").message(0).property(Exchange.CHARSET_NAME).isNull(); + getMockEndpoint("mock:foo").message(0).exchangeProperty(Exchange.CHARSET_NAME).isNull(); template.sendBody("direct:foo", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java index 0d82683..9f99fba 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelExceptionCausePropagatedTest.java @@ -31,7 +31,7 @@ public class DeadLetterChannelExceptionCausePropagatedTest extends ContextTestSu MockEndpoint successEndpoint = getMockEndpoint("mock:success"); failedEndpoint.expectedBodiesReceived(body); - failedEndpoint.message(0).property(Exchange.EXCEPTION_CAUGHT).isEqualTo(RUNTIME_EXCEPTION); + failedEndpoint.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isEqualTo(RUNTIME_EXCEPTION); failedEndpoint.expectedMessageCount(1); successEndpoint.expectedMessageCount(0); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/FilterNotMatchedTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/FilterNotMatchedTest.java b/camel-core/src/test/java/org/apache/camel/processor/FilterNotMatchedTest.java index 1dfbb8b..83fe5cb 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/FilterNotMatchedTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/FilterNotMatchedTest.java @@ -29,10 +29,10 @@ public class FilterNotMatchedTest extends ContextTestSupport { public void testSendMatchingMessage() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).property(Exchange.FILTER_MATCHED).isEqualTo(true); + mock.message(0).exchangeProperty(Exchange.FILTER_MATCHED).isEqualTo(true); - getMockEndpoint("mock:end").message(0).property(Exchange.FILTER_MATCHED).isNotNull(); - getMockEndpoint("mock:end").message(0).property(Exchange.FILTER_MATCHED).isEqualTo(true); + getMockEndpoint("mock:end").message(0).exchangeProperty(Exchange.FILTER_MATCHED).isNotNull(); + getMockEndpoint("mock:end").message(0).exchangeProperty(Exchange.FILTER_MATCHED).isEqualTo(true); template.sendBodyAndHeader("direct:start", "<matched/>", "foo", "bar"); @@ -43,8 +43,8 @@ public class FilterNotMatchedTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(0); - getMockEndpoint("mock:end").message(0).property(Exchange.FILTER_MATCHED).isNotNull(); - getMockEndpoint("mock:end").message(0).property(Exchange.FILTER_MATCHED).isEqualTo(false); + getMockEndpoint("mock:end").message(0).exchangeProperty(Exchange.FILTER_MATCHED).isNotNull(); + getMockEndpoint("mock:end").message(0).exchangeProperty(Exchange.FILTER_MATCHED).isEqualTo(false); template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java b/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java index 7e7d963..53f612e 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/FilterNotTest.java @@ -40,7 +40,7 @@ public class FilterNotTest extends ContextTestSupport { public void testSendNotMatchingMessage() throws Exception { MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class); resultEndpoint.expectedMessageCount(1); - resultEndpoint.message(0).property(Exchange.FILTER_MATCHED).isEqualTo(true); + resultEndpoint.message(0).exchangeProperty(Exchange.FILTER_MATCHED).isEqualTo(true); template.sendBody("direct:start", "<notMatched/>"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java b/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java index 650e3e1..198d304 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java @@ -29,7 +29,7 @@ public class FilterTest extends ContextTestSupport { public void testSendMatchingMessage() throws Exception { MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class); resultEndpoint.expectedMessageCount(1); - resultEndpoint.message(0).property(Exchange.FILTER_MATCHED).isEqualTo(true); + resultEndpoint.message(0).exchangeProperty(Exchange.FILTER_MATCHED).isEqualTo(true); template.sendBodyAndHeader("direct:start", "<matched/>", "foo", "bar"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java b/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java index d1b0e8f..139910e 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java @@ -75,12 +75,12 @@ public class IdempotentConsumerTest extends ContextTestSupport { context.start(); resultEndpoint.expectedBodiesReceived("one", "two", "one", "two", "one", "three"); - resultEndpoint.message(0).property(Exchange.DUPLICATE_MESSAGE).isNull(); - resultEndpoint.message(1).property(Exchange.DUPLICATE_MESSAGE).isNull(); - resultEndpoint.message(2).property(Exchange.DUPLICATE_MESSAGE).isEqualTo(Boolean.TRUE); - resultEndpoint.message(3).property(Exchange.DUPLICATE_MESSAGE).isEqualTo(Boolean.TRUE); - resultEndpoint.message(4).property(Exchange.DUPLICATE_MESSAGE).isEqualTo(Boolean.TRUE); - resultEndpoint.message(5).property(Exchange.DUPLICATE_MESSAGE).isNull(); + resultEndpoint.message(0).exchangeProperty(Exchange.DUPLICATE_MESSAGE).isNull(); + resultEndpoint.message(1).exchangeProperty(Exchange.DUPLICATE_MESSAGE).isNull(); + resultEndpoint.message(2).exchangeProperty(Exchange.DUPLICATE_MESSAGE).isEqualTo(Boolean.TRUE); + resultEndpoint.message(3).exchangeProperty(Exchange.DUPLICATE_MESSAGE).isEqualTo(Boolean.TRUE); + resultEndpoint.message(4).exchangeProperty(Exchange.DUPLICATE_MESSAGE).isEqualTo(Boolean.TRUE); + resultEndpoint.message(5).exchangeProperty(Exchange.DUPLICATE_MESSAGE).isNull(); sendMessage("1", "one"); sendMessage("2", "two"); @@ -117,7 +117,7 @@ public class IdempotentConsumerTest extends ContextTestSupport { resultEndpoint.expectedBodiesReceived("one", "two", "three"); getMockEndpoint("mock:duplicate").expectedBodiesReceived("one", "two", "one"); - getMockEndpoint("mock:duplicate").allMessages().property(Exchange.DUPLICATE_MESSAGE).isEqualTo(Boolean.TRUE); + getMockEndpoint("mock:duplicate").allMessages().exchangeProperty(Exchange.DUPLICATE_MESSAGE).isEqualTo(Boolean.TRUE); sendMessage("1", "one"); sendMessage("2", "two"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/MulticastCompletedPropertyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/MulticastCompletedPropertyTest.java b/camel-core/src/test/java/org/apache/camel/processor/MulticastCompletedPropertyTest.java index 419dbab..5c969e9 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/MulticastCompletedPropertyTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/MulticastCompletedPropertyTest.java @@ -29,15 +29,15 @@ public class MulticastCompletedPropertyTest extends ContextTestSupport { public void testMulticastCompleted() throws Exception { MockEndpoint a = getMockEndpoint("mock:a"); a.expectedMessageCount(1); - a.message(0).property(Exchange.MULTICAST_COMPLETE).isEqualTo(false); + a.message(0).exchangeProperty(Exchange.MULTICAST_COMPLETE).isEqualTo(false); MockEndpoint b = getMockEndpoint("mock:b"); b.expectedMessageCount(1); - b.message(0).property(Exchange.MULTICAST_COMPLETE).isEqualTo(false); + b.message(0).exchangeProperty(Exchange.MULTICAST_COMPLETE).isEqualTo(false); MockEndpoint c = getMockEndpoint("mock:c"); c.expectedMessageCount(1); - c.message(0).property(Exchange.MULTICAST_COMPLETE).isEqualTo(true); + c.message(0).exchangeProperty(Exchange.MULTICAST_COMPLETE).isEqualTo(true); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/OnExceptionContinueToRouteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/OnExceptionContinueToRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/OnExceptionContinueToRouteTest.java index a0cf535..e3493d0 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/OnExceptionContinueToRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/OnExceptionContinueToRouteTest.java @@ -29,9 +29,9 @@ public class OnExceptionContinueToRouteTest extends ContextTestSupport { getMockEndpoint("mock:a").expectedBodiesReceived("Hello World"); getMockEndpoint("mock:b").expectedBodiesReceived("Hello World"); getMockEndpoint("mock:catch").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:catch").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:catch").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); getMockEndpoint("mock:c").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:c").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:c").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:a", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java b/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java index 04f83b8..5bdfcd8 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RecipientListExchangePropertyTest.java @@ -28,13 +28,13 @@ public class RecipientListExchangePropertyTest extends ContextTestSupport { public void testExchangeProperty() throws Exception { getMockEndpoint("mock:x").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:x").message(0).property("foo").isEqualTo(myStuff); + getMockEndpoint("mock:x").message(0).exchangeProperty("foo").isEqualTo(myStuff); getMockEndpoint("mock:y").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:y").message(0).property("foo").isEqualTo(myStuff); + getMockEndpoint("mock:y").message(0).exchangeProperty("foo").isEqualTo(myStuff); getMockEndpoint("mock:z").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:z").message(0).property("foo").isEqualTo(myStuff); + getMockEndpoint("mock:z").message(0).exchangeProperty("foo").isEqualTo(myStuff); getMockEndpoint("mock:result").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:result").message(0).property("foo").isEqualTo(myStuff); + getMockEndpoint("mock:result").message(0).exchangeProperty("foo").isEqualTo(myStuff); template.sendBodyAndProperty("direct:a", "Hello World", "foo", myStuff); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/RecipientListNoErrorHandlerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RecipientListNoErrorHandlerTest.java b/camel-core/src/test/java/org/apache/camel/processor/RecipientListNoErrorHandlerTest.java index f037e52..0380e59 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RecipientListNoErrorHandlerTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RecipientListNoErrorHandlerTest.java @@ -27,7 +27,7 @@ public class RecipientListNoErrorHandlerTest extends ContextTestSupport { getMockEndpoint("mock:foo").expectedMessageCount(1); getMockEndpoint("mock:result").expectedMessageCount(0); getMockEndpoint("mock:dead").expectedMessageCount(1); - getMockEndpoint("mock:dead").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:dead").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithStringDelimitedPropertyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithStringDelimitedPropertyTest.java b/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithStringDelimitedPropertyTest.java index c272078..01e3cb2 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithStringDelimitedPropertyTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithStringDelimitedPropertyTest.java @@ -37,9 +37,9 @@ public class RecipientListWithStringDelimitedPropertyTest extends ContextTestSup y.expectedBodiesReceived(BODY); z.expectedBodiesReceived(BODY); - x.message(0).property("myProperty").isEqualTo(PROPERTY_VALUE); - y.message(0).property("myProperty").isEqualTo(PROPERTY_VALUE); - z.message(0).property("myProperty").isEqualTo(PROPERTY_VALUE); + x.message(0).exchangeProperty("myProperty").isEqualTo(PROPERTY_VALUE); + y.message(0).exchangeProperty("myProperty").isEqualTo(PROPERTY_VALUE); + z.message(0).exchangeProperty("myProperty").isEqualTo(PROPERTY_VALUE); sendBody(); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoErrorHandlerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoErrorHandlerTest.java b/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoErrorHandlerTest.java index 0bd644c..19189b4 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoErrorHandlerTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipNoErrorHandlerTest.java @@ -27,7 +27,7 @@ public class RoutingSlipNoErrorHandlerTest extends ContextTestSupport { getMockEndpoint("mock:foo").expectedMessageCount(1); getMockEndpoint("mock:result").expectedMessageCount(0); getMockEndpoint("mock:dead").expectedMessageCount(1); - getMockEndpoint("mock:dead").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:dead").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/SendToNoErrorHandlerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/SendToNoErrorHandlerTest.java b/camel-core/src/test/java/org/apache/camel/processor/SendToNoErrorHandlerTest.java index aece2d4..fedf9fb 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/SendToNoErrorHandlerTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/SendToNoErrorHandlerTest.java @@ -27,7 +27,7 @@ public class SendToNoErrorHandlerTest extends ContextTestSupport { getMockEndpoint("mock:foo").expectedMessageCount(1); getMockEndpoint("mock:result").expectedMessageCount(0); getMockEndpoint("mock:dead").expectedMessageCount(1); - getMockEndpoint("mock:dead").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:dead").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/SplitterCompletedPropertyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitterCompletedPropertyTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitterCompletedPropertyTest.java index 26f8bcf..2cf4412 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/SplitterCompletedPropertyTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/SplitterCompletedPropertyTest.java @@ -29,9 +29,9 @@ public class SplitterCompletedPropertyTest extends ContextTestSupport { public void testSplitterCompleted() throws Exception { MockEndpoint mock = getMockEndpoint("mock:split"); mock.expectedBodiesReceived("Hello World", "Bye World", "Bye Moon"); - mock.message(0).property(Exchange.SPLIT_COMPLETE).isEqualTo(false); - mock.message(1).property(Exchange.SPLIT_COMPLETE).isEqualTo(false); - mock.message(2).property(Exchange.SPLIT_COMPLETE).isEqualTo(true); + mock.message(0).exchangeProperty(Exchange.SPLIT_COMPLETE).isEqualTo(false); + mock.message(1).exchangeProperty(Exchange.SPLIT_COMPLETE).isEqualTo(false); + mock.message(2).exchangeProperty(Exchange.SPLIT_COMPLETE).isEqualTo(true); template.sendBody("direct:start", "Hello World,Bye World,Bye Moon"); @@ -41,9 +41,9 @@ public class SplitterCompletedPropertyTest extends ContextTestSupport { public void testSplitterStreamingCompleted() throws Exception { MockEndpoint mock = getMockEndpoint("mock:split"); mock.expectedBodiesReceived("Hello World", "Bye World", "Bye Moon"); - mock.message(0).property(Exchange.SPLIT_COMPLETE).isEqualTo(false); - mock.message(1).property(Exchange.SPLIT_COMPLETE).isEqualTo(false); - mock.message(2).property(Exchange.SPLIT_COMPLETE).isEqualTo(true); + mock.message(0).exchangeProperty(Exchange.SPLIT_COMPLETE).isEqualTo(false); + mock.message(1).exchangeProperty(Exchange.SPLIT_COMPLETE).isEqualTo(false); + mock.message(2).exchangeProperty(Exchange.SPLIT_COMPLETE).isEqualTo(true); template.sendBody("direct:streaming", "Hello World,Bye World,Bye Moon"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java b/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java index 5c2935d..82c1af4 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/SplitterPropertyContinuedTest.java @@ -26,11 +26,11 @@ public class SplitterPropertyContinuedTest extends ContextTestSupport { public void testSplitterPropertyContinued() throws Exception { getMockEndpoint("mock:end").expectedBodiesReceived("A,Kaboom,B,C"); - getMockEndpoint("mock:end").message(0).property("errorCode").isNull(); + getMockEndpoint("mock:end").message(0).exchangeProperty("errorCode").isNull(); getMockEndpoint("mock:error").expectedBodiesReceived("Kaboom"); - getMockEndpoint("mock:error").message(0).property("errorCode").isEqualTo("ERR-1"); + getMockEndpoint("mock:error").message(0).exchangeProperty("errorCode").isEqualTo("ERR-1"); getMockEndpoint("mock:split").expectedBodiesReceived("A", "B", "C"); - getMockEndpoint("mock:split").allMessages().property("errorCode").isNull(); + getMockEndpoint("mock:split").allMessages().exchangeProperty("errorCode").isNull(); template.sendBody("direct:start", "A,Kaboom,B,C"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/ToEndpointPropertyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/ToEndpointPropertyTest.java b/camel-core/src/test/java/org/apache/camel/processor/ToEndpointPropertyTest.java index bc6d3cb..a211c3f 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/ToEndpointPropertyTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/ToEndpointPropertyTest.java @@ -43,7 +43,7 @@ public class ToEndpointPropertyTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); + mock.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); template.sendBody("direct:start", "Hello World"); @@ -64,7 +64,7 @@ public class ToEndpointPropertyTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); + mock.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); template.sendBody("direct:start", "Hello World"); @@ -82,7 +82,7 @@ public class ToEndpointPropertyTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); + mock.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); template.sendBodyAndHeader("direct:start", "Hello World", "foo", "mock:result"); @@ -100,15 +100,15 @@ public class ToEndpointPropertyTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); + mock.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); MockEndpoint a = getMockEndpoint("mock:a"); a.expectedMessageCount(1); - a.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://a"); + a.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://a"); MockEndpoint b = getMockEndpoint("mock:b"); b.expectedMessageCount(1); - b.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://b"); + b.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://b"); template.sendBodyAndHeader("direct:start", "Hello World", "foo", "mock:a,mock:b,mock:result"); @@ -126,11 +126,11 @@ public class ToEndpointPropertyTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); + mock.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); MockEndpoint tap = getMockEndpoint("mock:tap"); tap.expectedMessageCount(1); - tap.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://tap"); + tap.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://tap"); template.sendBody("direct:start", "Hello World"); @@ -156,8 +156,8 @@ public class ToEndpointPropertyTest extends ContextTestSupport { MockEndpoint result = getMockEndpoint("mock:result"); result.expectedMessageCount(1); - result.message(0).property(Exchange.FAILURE_ENDPOINT).isNull(); - result.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); + result.message(0).exchangeProperty(Exchange.FAILURE_ENDPOINT).isNull(); + result.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://result"); template.sendBody("direct:start", "Hello World"); @@ -179,8 +179,8 @@ public class ToEndpointPropertyTest extends ContextTestSupport { getMockEndpoint("mock:result").expectedMessageCount(0); MockEndpoint dead = getMockEndpoint("mock:dead"); - dead.message(0).property(Exchange.FAILURE_ENDPOINT).isEqualTo("direct://foo"); - dead.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://dead"); + dead.message(0).exchangeProperty(Exchange.FAILURE_ENDPOINT).isEqualTo("direct://foo"); + dead.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://dead"); template.sendBody("direct:start", "Hello World"); @@ -204,8 +204,8 @@ public class ToEndpointPropertyTest extends ContextTestSupport { getMockEndpoint("mock:result").expectedMessageCount(0); MockEndpoint dead = getMockEndpoint("mock:dead"); - dead.message(0).property(Exchange.FAILURE_ENDPOINT).isEqualTo("direct://foo"); - dead.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://dead"); + dead.message(0).exchangeProperty(Exchange.FAILURE_ENDPOINT).isEqualTo("direct://foo"); + dead.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://dead"); template.sendBody("direct:start", "Hello World"); @@ -230,8 +230,8 @@ public class ToEndpointPropertyTest extends ContextTestSupport { getMockEndpoint("mock:result").expectedMessageCount(0); MockEndpoint dead = getMockEndpoint("mock:dead"); - dead.message(0).property(Exchange.FAILURE_ENDPOINT).isEqualTo("direct://b"); - dead.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://dead"); + dead.message(0).exchangeProperty(Exchange.FAILURE_ENDPOINT).isEqualTo("direct://b"); + dead.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://dead"); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/TryCatchContinueToRouteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/TryCatchContinueToRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/TryCatchContinueToRouteTest.java index 522f5c2..de40d68 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/TryCatchContinueToRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/TryCatchContinueToRouteTest.java @@ -29,9 +29,9 @@ public class TryCatchContinueToRouteTest extends ContextTestSupport { getMockEndpoint("mock:a").expectedBodiesReceived("Hello World"); getMockEndpoint("mock:b").expectedBodiesReceived("Hello World"); getMockEndpoint("mock:catch").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:catch").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:catch").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); getMockEndpoint("mock:c").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:c").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:c").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:a", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/TryCatchRecipientListTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/TryCatchRecipientListTest.java b/camel-core/src/test/java/org/apache/camel/processor/TryCatchRecipientListTest.java index 9bb927c..ebda64f 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/TryCatchRecipientListTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/TryCatchRecipientListTest.java @@ -36,7 +36,7 @@ public class TryCatchRecipientListTest extends ContextTestSupport { getMockEndpoint("mock:result").expectedBodiesReceived("doCatch"); getMockEndpoint("mock:dead").expectedMessageCount(0); getMockEndpoint("mock:catch").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:catch").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:catch").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); @@ -51,7 +51,7 @@ public class TryCatchRecipientListTest extends ContextTestSupport { getMockEndpoint("mock:result").expectedBodiesReceived("doCatch"); getMockEndpoint("mock:dead").expectedMessageCount(0); getMockEndpoint("mock:catch").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:catch").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:catch").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); @@ -68,9 +68,9 @@ public class TryCatchRecipientListTest extends ContextTestSupport { getMockEndpoint("mock:result2").expectedBodiesReceived("doCatch2"); getMockEndpoint("mock:dead").expectedMessageCount(0); getMockEndpoint("mock:catch").expectedBodiesReceived("Hello World"); - getMockEndpoint("mock:catch").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:catch").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); getMockEndpoint("mock:catch2").expectedBodiesReceived("doCatch"); - getMockEndpoint("mock:catch2").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:catch2").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); @@ -84,7 +84,7 @@ public class TryCatchRecipientListTest extends ContextTestSupport { getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World"); getMockEndpoint("mock:result").expectedMessageCount(0); getMockEndpoint("mock:dead").expectedMessageCount(1); - getMockEndpoint("mock:dead").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:dead").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); @@ -98,7 +98,7 @@ public class TryCatchRecipientListTest extends ContextTestSupport { getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World"); getMockEndpoint("mock:result").expectedMessageCount(0); getMockEndpoint("mock:dead").expectedMessageCount(1); - getMockEndpoint("mock:dead").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:dead").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionSizeAndBatchConsumerTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionSizeAndBatchConsumerTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionSizeAndBatchConsumerTest.java index 33e25fa..6c1ff69 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionSizeAndBatchConsumerTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompletionSizeAndBatchConsumerTest.java @@ -28,10 +28,10 @@ public class AggregateCompletionSizeAndBatchConsumerTest extends ContextTestSupp MockEndpoint result = getMockEndpoint("mock:result"); // A+A+A gets completed by size, the others by consumer result.expectedBodiesReceived("A+A+A", "A", "B+B", "Z"); - result.message(0).property(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("size"); - result.message(1).property(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("consumer"); - result.message(2).property(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("consumer"); - result.message(3).property(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("consumer"); + result.message(0).exchangeProperty(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("size"); + result.message(1).exchangeProperty(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("consumer"); + result.message(2).exchangeProperty(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("consumer"); + result.message(3).exchangeProperty(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("consumer"); template.sendBody("direct:start", "A"); template.sendBody("direct:start", "A"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailedAfterOnExceptionContinueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailedAfterOnExceptionContinueTest.java b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailedAfterOnExceptionContinueTest.java index 698b81e..77e648f 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailedAfterOnExceptionContinueTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailedAfterOnExceptionContinueTest.java @@ -34,7 +34,7 @@ public class AsyncEndpointFailedAfterOnExceptionContinueTest extends ContextTest getMockEndpoint("mock:after").expectedBodiesReceived("Bye Camel"); getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel"); // and we should keep the exception so we know what caused the failure - getMockEndpoint("mock:result").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:result").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); String reply = template.requestBody("direct:start", "Hello Camel", String.class); assertEquals("Bye Camel", reply); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java b/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java index f66ca6d..caeebf0 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java @@ -41,7 +41,7 @@ public class EnricherTest extends ContextTestSupport { public void testEnrichInOnly() throws InterruptedException { mock.expectedBodiesReceived("test:blah"); - mock.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://mock"); + mock.message(0).exchangeProperty(Exchange.TO_ENDPOINT).isEqualTo("mock://mock"); template.sendBody("direct:enricher-test-1", "test"); mock.assertIsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTwoRoutesOnExceptionTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTwoRoutesOnExceptionTest.java b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTwoRoutesOnExceptionTest.java index 0835dcc..e8ff022 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTwoRoutesOnExceptionTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithTwoRoutesOnExceptionTest.java @@ -40,7 +40,7 @@ public class AdviceWithTwoRoutesOnExceptionTest extends ContextTestSupport { getMockEndpoint("mock:a").expectedMessageCount(0); getMockEndpoint("mock:error").expectedMessageCount(1); - getMockEndpoint("mock:error").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:error").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:a", "Hello World"); @@ -60,7 +60,7 @@ public class AdviceWithTwoRoutesOnExceptionTest extends ContextTestSupport { getMockEndpoint("mock:b").expectedMessageCount(0); getMockEndpoint("mock:error").expectedMessageCount(1); - getMockEndpoint("mock:error").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:error").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:b", "Hello World"); @@ -91,8 +91,8 @@ public class AdviceWithTwoRoutesOnExceptionTest extends ContextTestSupport { getMockEndpoint("mock:a").expectedMessageCount(0); getMockEndpoint("mock:b").expectedMessageCount(0); getMockEndpoint("mock:error").expectedMessageCount(2); - getMockEndpoint("mock:error").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); - getMockEndpoint("mock:error").message(1).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:error").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:error").message(1).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:a", "Hello World"); template.sendBody("direct:b", "Bye World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubRouteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubRouteTest.java index 62b91da..ec59dce 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubRouteTest.java @@ -34,7 +34,7 @@ public class OnExceptionContinueSubRouteTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); // and we should keep the exception so we know what caused the failure - mock.message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + mock.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubSubRouteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubSubRouteTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubSubRouteTest.java index 0739bbb..ec43252 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubSubRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueSubSubRouteTest.java @@ -35,7 +35,7 @@ public class OnExceptionContinueSubSubRouteTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); // and we should keep the exception so we know what caused the failure - mock.message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + mock.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTest.java index 74b8a17..e4904b3 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTest.java @@ -32,7 +32,7 @@ public class OnExceptionContinueTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); // and we should keep the exception so we know what caused the failure - mock.message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + mock.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTwoTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTwoTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTwoTest.java index 7a26566..5a761f0 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTwoTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionContinueTwoTest.java @@ -33,7 +33,7 @@ public class OnExceptionContinueTwoTest extends ContextTestSupport { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedBodiesReceived("Hello World"); // and we should keep the exception so we know what caused the failure - mock.message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + mock.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionHandledTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionHandledTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionHandledTest.java index 7f9f69f..dc9d544 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionHandledTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionHandledTest.java @@ -29,9 +29,9 @@ public class OnExceptionHandledTest extends ContextTestSupport { public void testHandled() throws Exception { MockEndpoint mock = getMockEndpoint("mock:handled"); mock.expectedBodiesReceived("Hello World"); - mock.message(0).property(Exchange.EXCEPTION_CAUGHT).isNotNull(); - mock.message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); - mock.message(0).property(Exchange.EXCEPTION_CAUGHT).method("getMessage").isEqualTo("Forced"); + mock.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isNotNull(); + mock.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + mock.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).method("getMessage").isEqualTo("Forced"); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java index 010fe64..920d599 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java @@ -34,9 +34,9 @@ public class OnExceptionUseOriginalMessageTest extends ContextTestSupport { public void testOnExceptionError() throws Exception { getMockEndpoint("mock:middle").expectedBodiesReceived(HELLO_WORLD); - getMockEndpoint("mock:middle").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:middle").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); getMockEndpoint("mock:end").expectedBodiesReceived(HELLO_WORLD); - getMockEndpoint("mock:end").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:end").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:a", "Hello World"); @@ -46,9 +46,9 @@ public class OnExceptionUseOriginalMessageTest extends ContextTestSupport { public void testOnExceptionStreamReset() throws Exception { getMockEndpoint("mock:middle").expectedMessageCount(1); - getMockEndpoint("mock:middle").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:middle").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); getMockEndpoint("mock:end").expectedMessageCount(1); - getMockEndpoint("mock:end").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + getMockEndpoint("mock:end").message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); InputStreamCache cache = new InputStreamCache(TEST_STRING.getBytes()); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWithRouteAndContinueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWithRouteAndContinueTest.java b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWithRouteAndContinueTest.java index bf5b681..ab567f6 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWithRouteAndContinueTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionWithRouteAndContinueTest.java @@ -31,12 +31,12 @@ public class OnExceptionWithRouteAndContinueTest extends ContextTestSupport { // catch should see the exception also MockEndpoint mock = getMockEndpoint("mock:catch"); - mock.message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + mock.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); MockEndpoint result = getMockEndpoint("mock:result"); result.expectedBodiesReceived("Hello World"); // and we should keep the exception so we know what caused the failure - result.message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); + result.message(0).exchangeProperty(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class); template.sendBody("direct:start", "Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/88642501/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java b/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java index 8d050b4..e062dab 100644 --- a/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/toolbox/FlexibleAggregationStrategiesTest.java @@ -85,7 +85,7 @@ public class FlexibleAggregationStrategiesTest extends ContextTestSupport { @Test @SuppressWarnings("unchecked") public void testFlexibleAggregationStrategyStoreInPropertyHashSet() throws Exception { getMockEndpoint("mock:result2").expectedMessageCount(1); - getMockEndpoint("mock:result2").message(0).property("AggregationResult").isInstanceOf(HashSet.class); + getMockEndpoint("mock:result2").message(0).exchangeProperty("AggregationResult").isInstanceOf(HashSet.class); template.sendBodyAndHeader("direct:start2", "ignored body", "input", "AGGREGATE1"); template.sendBodyAndHeader("direct:start2", "ignored body", "input", "DISCARD"); @@ -168,7 +168,7 @@ public class FlexibleAggregationStrategiesTest extends ContextTestSupport { public void testFlexibleAggregationStrategyTimeoutCompletionMixins() throws Exception { getMockEndpoint("mock:result.timeoutAndCompletionAware").expectedMessageCount(2); getMockEndpoint("mock:result.timeoutAndCompletionAware").message(0).body().isEqualTo("AGGREGATE1"); - getMockEndpoint("mock:result.timeoutAndCompletionAware").message(0).property("Timeout").isEqualTo(true); + getMockEndpoint("mock:result.timeoutAndCompletionAware").message(0).exchangeProperty("Timeout").isEqualTo(true); getMockEndpoint("mock:result.timeoutAndCompletionAware").message(1).body().isEqualTo("AGGREGATE3"); template.sendBody("direct:start.timeoutAndCompletionAware", "AGGREGATE1");
