Lets not deprecate InvalidPayloadException as its used for the getMandatoryBody and we would need an exception to be thrown if not body could be retrieved. Though the name of the class could possible be aligned better with the NoSuchHeaderException we have for getMandatoryHeader
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9db3f7a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9db3f7a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9db3f7a Branch: refs/heads/master Commit: a9db3f7ac38767a4b2da99f6fd2fa985c373d77d Parents: e138484 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Aug 31 11:27:14 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Aug 31 11:44:09 2013 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/InvalidPayloadException.java | 7 +------ .../java/org/apache/camel/InvalidPayloadRuntimeException.java | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a9db3f7a/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java b/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java index ceb3ae2..37e6c3a 100644 --- a/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java +++ b/camel-core/src/main/java/org/apache/camel/InvalidPayloadException.java @@ -19,15 +19,10 @@ package org.apache.camel; /** * Is thrown if the payload from the exchange could not be retrieved because of being null, wrong class type etc. * - * @deprecated will be removed in Camel 3.0 - * @version + * @version */ -@Deprecated public class InvalidPayloadException extends CamelExchangeException { - // TODO: We should have NoSuchBodyException to be consistent with NoSuchHeaderException - // TODO: We should remove this class in Camel 3.0, and just rely on the other exceptions for type conversion issues - private static final long serialVersionUID = -1689157578733908632L; private final transient Class<?> type; http://git-wip-us.apache.org/repos/asf/camel/blob/a9db3f7a/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java b/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java index 55dcbde..2b433bb 100644 --- a/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java +++ b/camel-core/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java @@ -19,14 +19,10 @@ package org.apache.camel; /** * Runtime version of the {@link InvalidPayloadException}. * - * @deprecated will be removed in Camel 3.0, use org.apache.camel.util.ObjectHelper#wrapRuntimeCamelException * @version */ -@Deprecated public class InvalidPayloadRuntimeException extends RuntimeExchangeException { - // TODO: Use org.apache.camel.util.ObjectHelper#wrapRuntimeCamelException to wrap as runtime - private static final long serialVersionUID = -155083097523464793L; private final transient Class<?> type;