Repository: camel Updated Branches: refs/heads/master 394960925 -> 4caa5c127
camel-test/camel-testng: Add #exchangeProperty(String) to TestSupport and deprecate methods which redirect to deprecated methods of org.apache.camel.builder.Builder Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4caa5c12 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4caa5c12 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4caa5c12 Branch: refs/heads/master Commit: 4caa5c1277f33921d76e18bed1cdbc4b5a45c261 Parents: 3949609 Author: Pascal Schumacher <pascalschumac...@gmx.net> Authored: Sun Nov 22 15:00:12 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Nov 22 15:24:24 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/test/junit4/TestSupport.java | 23 ++++++++++++++++++-- .../org/apache/camel/testng/TestSupport.java | 18 +++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4caa5c12/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java index 7c8d2b5..52eb1f7 100644 --- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java +++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java @@ -69,11 +69,21 @@ public abstract class TestSupport extends Assert { /** * Returns a value builder for the given property + * + * @deprecated use {@link #exchangeProperty(String)} */ + @Deprecated public static ValueBuilder property(String name) { return Builder.exchangeProperty(name); - } - + } + + /** + * Returns a value builder for the given exchange property + */ + public static ValueBuilder exchangeProperty(String name) { + return Builder.exchangeProperty(name); + } + /** * Returns a predicate and value builder for the inbound body on an exchange */ @@ -92,7 +102,10 @@ public abstract class TestSupport extends Assert { /** * Returns a predicate and value builder for the outbound body on an * exchange + * + * @deprecated use {@link #body()} */ + @Deprecated public static ValueBuilder outBody() { return Builder.outBody(); } @@ -100,7 +113,10 @@ public abstract class TestSupport extends Assert { /** * Returns a predicate and value builder for the outbound message body as a * specific type + * + * @deprecated use {@link #bodyAs(Class)} */ + @Deprecated public static <T> ValueBuilder outBodyAs(Class<T> type) { return Builder.outBodyAs(type); } @@ -116,7 +132,10 @@ public abstract class TestSupport extends Assert { /** * Returns a predicate and value builder for the fault message body as a * specific type + * + * @deprecated use {@link #bodyAs(Class)} */ + @Deprecated public static <T> ValueBuilder faultBodyAs(Class<T> type) { return Builder.faultBodyAs(type); } http://git-wip-us.apache.org/repos/asf/camel/blob/4caa5c12/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java index 98f0420..9bf5fe9 100644 --- a/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java +++ b/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java @@ -64,12 +64,22 @@ public abstract class TestSupport extends Assert { /** * Returns a value builder for the given property + * + * @deprecated use {@link #exchangeProperty(String)} */ + @Deprecated public static ValueBuilder property(String name) { return Builder.exchangeProperty(name); } /** + * Returns a value builder for the given exchange property + */ + public static ValueBuilder exchangeProperty(String name) { + return Builder.exchangeProperty(name); + } + + /** * Returns a predicate and value builder for the inbound body on an exchange */ public static ValueBuilder body() { @@ -87,7 +97,10 @@ public abstract class TestSupport extends Assert { /** * Returns a predicate and value builder for the outbound body on an * exchange + * + * @deprecated use {@link #body()} */ + @Deprecated public static ValueBuilder outBody() { return Builder.outBody(); } @@ -95,6 +108,8 @@ public abstract class TestSupport extends Assert { /** * Returns a predicate and value builder for the outbound message body as a * specific type + * + * @deprecated use {@link #bodyAs(Class)} */ public static <T> ValueBuilder outBodyAs(Class<T> type) { return Builder.outBodyAs(type); @@ -111,7 +126,10 @@ public abstract class TestSupport extends Assert { /** * Returns a predicate and value builder for the fault message body as a * specific type + * + * @deprecated use {@link #bodyAs(Class)} */ + @Deprecated public static <T> ValueBuilder faultBodyAs(Class<T> type) { return Builder.faultBodyAs(type); }
