Updated Branches: refs/heads/master 07f304e95 -> a0ae8a31d
Prefer the type safe enums (ErrorCode) to int. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0ae8a31 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0ae8a31 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0ae8a31 Branch: refs/heads/master Commit: a0ae8a31d807ec85d9353b15c9efcb9906542323 Parents: 07f304e Author: Babak Vahdat <bvah...@apache.org> Authored: Tue May 21 22:39:03 2013 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Tue May 21 22:39:03 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/hl7/HL7.java | 13 ++++++++++--- .../camel/component/hl7/AckExpressionTest.java | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a0ae8a31/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java ---------------------------------------------------------------------- diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java index e03fc70..d477f06 100644 --- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java +++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/HL7.java @@ -55,9 +55,16 @@ public final class HL7 { }; } - public static Expression ack(AckCode code, String errorMessage, - int errorCode) { - return new AckExpression(code, errorMessage, ErrorCode.errorCodeFor(errorCode)); + /** + * @deprecated Use {@link #ack(AckCode, String, ErrorCode)} + */ + @Deprecated + public static Expression ack(AckCode code, String errorMessage, int errorCode) { + return ack(code, errorMessage, ErrorCode.errorCodeFor(errorCode)); + } + + public static Expression ack(AckCode code, String errorMessage, ErrorCode errorCode) { + return new AckExpression(code, errorMessage, errorCode); } public static Predicate messageConformsTo( http://git-wip-us.apache.org/repos/asf/camel/blob/a0ae8a31/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java index f25ffa3..e9be437 100644 --- a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java +++ b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/AckExpressionTest.java @@ -95,9 +95,9 @@ public class AckExpressionTest extends CamelTestSupport { from("direct:test3").onException(HL7Exception.class).handled(true).transform(ack()).end() .transform(terser("/.BLORG")); from("direct:test4").onException(HL7Exception.class).handled(true) - .transform(ack(AckCode.AR, "Problem!", ErrorCode.APPLICATION_INTERNAL_ERROR.getCode())).end() + .transform(ack(AckCode.AR, "Problem!", ErrorCode.APPLICATION_INTERNAL_ERROR)).end() .transform(terser("/.BLORG")); - from("direct:test5").transform(ack(AckCode.AR, "Problem!", ErrorCode.DATA_TYPE_ERROR.getCode())); + from("direct:test5").transform(ack(AckCode.AR, "Problem!", ErrorCode.DATA_TYPE_ERROR)); } }; }