This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.x in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push: new 3a307dc Deprecated stuff on 2.x that are removed in camel 3 3a307dc is described below commit 3a307dc194f1ce50fe75c68d5e5ae1da7d01ed6b Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Apr 17 15:12:16 2019 +0200 Deprecated stuff on 2.x that are removed in camel 3 --- camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java | 5 +++++ camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java | 2 ++ .../main/java/org/apache/camel/component/bean/BeanInvocation.java | 1 + 3 files changed, 8 insertions(+) diff --git a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java index 41d190a..275bd25 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java @@ -812,6 +812,7 @@ public class NotifyBuilder { * @param mock the mock * @return the builder */ + @Deprecated public NotifyBuilder whenDoneSatisfied(final MockEndpoint mock) { return doWhenSatisfied(mock, false); } @@ -829,6 +830,7 @@ public class NotifyBuilder { * @param mock the mock * @return the builder */ + @Deprecated public NotifyBuilder whenReceivedSatisfied(final MockEndpoint mock) { return doWhenSatisfied(mock, true); } @@ -911,6 +913,7 @@ public class NotifyBuilder { * @param mock the mock * @return the builder */ + @Deprecated public NotifyBuilder whenReceivedNotSatisfied(final MockEndpoint mock) { return doWhenNotSatisfied(mock, true); } @@ -928,6 +931,7 @@ public class NotifyBuilder { * @param mock the mock * @return the builder */ + @Deprecated public NotifyBuilder whenDoneNotSatisfied(final MockEndpoint mock) { return doWhenNotSatisfied(mock, false); } @@ -1236,6 +1240,7 @@ public class NotifyBuilder { * * @return <tt>true</tt> if matching, <tt>false</tt> otherwise due to timeout */ + @Deprecated public boolean matchesMockWaitTime() { if (!created) { throw new IllegalStateException("NotifyBuilder has not been created. Invoke the create() method before matching."); diff --git a/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java index 6bee379..bfc69b5 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java @@ -69,7 +69,9 @@ public final class ProxyBuilder { * @param binding <tt>true</tt> to use binding, <tt>false</tt> to use the old behavior with using a {@link org.apache.camel.component.bean.BeanInvocation} * as a provisional message body * @return the builder + * @deprecated binding will be default true in Camel 3 onwards */ + @Deprecated public ProxyBuilder binding(boolean binding) { this.binding = binding; return this; diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java index e3414c7..b0ad36b 100644 --- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java +++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java @@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; /** * Invocation of beans that can handle being serialized. */ +@Deprecated public class BeanInvocation implements Externalizable { private static final Logger LOG = LoggerFactory.getLogger(BeanInvocation.class); private Object[] args;