Repository: camel Updated Branches: refs/heads/master 81325f032 -> 29483ca85
CAMEL-8108 Type converters should not check for null values Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1cf8f306 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1cf8f306 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1cf8f306 Branch: refs/heads/master Commit: 1cf8f30619f378226f2cf10f287af94a9fe1b5f9 Parents: 81325f0 Author: Artur Chyży <[email protected]> Authored: Thu Jan 22 09:24:58 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Jan 22 11:33:12 2015 +0100 ---------------------------------------------------------------------- .../converter/AsyncProcessorTypeConverter.java | 10 ++--- .../camel/impl/converter/EnumTypeConverter.java | 2 +- .../impl/converter/ToStringTypeConverter.java | 40 +++++++++----------- 3 files changed, 23 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1cf8f306/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java index 48eb3f5..0a08a33 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java +++ b/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java @@ -27,17 +27,15 @@ import org.apache.camel.util.AsyncProcessorConverterHelper; * Processing will still occur synchronously but it will provide the required * notifications that the caller expects. * - * @version + * @version */ public class AsyncProcessorTypeConverter extends TypeConverterSupport { @Override public <T> T convertTo(Class<T> type, Exchange exchange, Object value) { - if (value != null) { - if (type.equals(AsyncProcessor.class)) { - if (value instanceof Processor) { - return type.cast(AsyncProcessorConverterHelper.convert((Processor)value)); - } + if (type.equals(AsyncProcessor.class)) { + if (value instanceof Processor) { + return type.cast(AsyncProcessorConverterHelper.convert((Processor) value)); } } return null; http://git-wip-us.apache.org/repos/asf/camel/blob/1cf8f306/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java index a595d23..48ac8e1 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java +++ b/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java @@ -30,7 +30,7 @@ public class EnumTypeConverter extends TypeConverterSupport { @SuppressWarnings("unchecked") public <T> T convertTo(Class<T> type, Exchange exchange, Object value) { - if (type.isEnum() && value != null) { + if (type.isEnum()) { String text = value.toString(); Class<Enum> enumClass = (Class<Enum>) type; http://git-wip-us.apache.org/repos/asf/camel/blob/1cf8f306/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java b/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java index 28c11ef..2fa600d 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java +++ b/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java @@ -27,39 +27,35 @@ import org.apache.camel.support.TypeConverterSupport; /** * A simple converter that can convert any object to a String type by using the * toString() method of the object. - * - * @version */ public class ToStringTypeConverter extends TypeConverterSupport { @SuppressWarnings("unchecked") @Override public <T> T convertTo(Class<T> toType, Exchange exchange, Object value) { - if (value != null) { - // should not try to convert Message - if (Message.class.isAssignableFrom(value.getClass())) { - return (T) Void.TYPE; - } + // should not try to convert Message + if (Message.class.isAssignableFrom(value.getClass())) { + return (T) Void.TYPE; + } - // should not try to convert future - if (Future.class.isAssignableFrom(value.getClass())) { - return (T) Void.TYPE; - } + // should not try to convert future + if (Future.class.isAssignableFrom(value.getClass())) { + return (T) Void.TYPE; + } - // should not try to convert bean invocations - if (BeanInvocation.class.isAssignableFrom(value.getClass())) { - return (T) Void.TYPE; - } + // should not try to convert bean invocations + if (BeanInvocation.class.isAssignableFrom(value.getClass())) { + return (T) Void.TYPE; + } - // should not try to convert files - if (WrappedFile.class.isAssignableFrom(value.getClass())) { - return (T) Void.TYPE; - } + // should not try to convert files + if (WrappedFile.class.isAssignableFrom(value.getClass())) { + return (T) Void.TYPE; + } - if (toType.equals(String.class)) { - return (T)value.toString(); - } + if (toType.equals(String.class)) { + return (T) value.toString(); } return null; }
