Repository: camel Updated Branches: refs/heads/master c38f9f331 -> 78ac444b6
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/78ac444b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/78ac444b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/78ac444b Branch: refs/heads/master Commit: 78ac444b6fc02d597145e4b1860a578bf6b67ef2 Parents: c38f9f3 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Feb 11 19:51:45 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Feb 11 19:51:45 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/converter/CamelConverter.java | 4 +-- .../camel/converter/CollectionConverter.java | 3 --- .../camel/converter/DateTimeConverter.java | 4 +-- .../org/apache/camel/converter/IOConverter.java | 7 ++--- .../apache/camel/converter/NIOConverter.java | 1 + .../apache/camel/converter/ObjectConverter.java | 2 +- .../camel/converter/TimePatternConverter.java | 10 ++++---- .../camel/converter/jaxp/XmlConverter.java | 27 ++++++++------------ .../converter/CollectionConverterTest.java | 1 - .../apache/camel/converter/IOConverterTest.java | 8 ------ 10 files changed, 23 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java b/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java index 53a3cee..497af14 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java @@ -52,10 +52,10 @@ public final class CamelConverter { } @Converter - public static Processor toProcessor(final Expression expresion) { + public static Processor toProcessor(final Expression expression) { return new Processor() { public void process(Exchange exchange) throws Exception { - Object answer = expresion.evaluate(exchange, Object.class); + Object answer = expression.evaluate(exchange, Object.class); Message out = exchange.getOut(); out.copyFrom(exchange.getIn()); out.setBody(answer); http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java b/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java index 59e14d4..cd296fa 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/CollectionConverter.java @@ -51,9 +51,6 @@ public final class CollectionConverter { */ @Converter public static Object[] toArray(Collection<?> value) { - if (value == null) { - return null; - } return value.toArray(); } http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java b/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java index 9153318..7123cf4 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/DateTimeConverter.java @@ -40,11 +40,11 @@ public final class DateTimeConverter { @Converter public static Date toDate(Long l) { - return l != null ? new Date(l) : null; + return new Date(l); } @Converter public static Long toLong(Date date) { - return date != null ? date.getTime() : null; + return date.getTime(); } } http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java b/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java index 293db73..05c49b4 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java @@ -56,6 +56,7 @@ import org.slf4j.LoggerFactory; */ @Converter public final class IOConverter { + private static final Logger LOG = LoggerFactory.getLogger(IOConverter.class); /** @@ -292,10 +293,6 @@ public final class IOConverter { @Converter public static String toString(BufferedReader reader) throws IOException { - if (reader == null) { - return null; - } - StringBuilder sb = new StringBuilder(1024); char[] buf = new char[1024]; try { @@ -335,7 +332,7 @@ public final class IOConverter { @Converter public static byte[] toByteArray(String value, Exchange exchange) throws IOException { - return value != null ? value.getBytes(IOHelper.getCharsetName(exchange)) : null; + return value.getBytes(IOHelper.getCharsetName(exchange)); } /** http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java index e1cf6d6..fbb573f 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/NIOConverter.java @@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory; */ @Converter public final class NIOConverter { + private static final Logger LOG = LoggerFactory.getLogger(NIOConverter.class); /** http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java b/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java index 4d375c5..a8e445d 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java @@ -109,7 +109,7 @@ public final class ObjectConverter { @Converter public static char toChar(String value) { // must be string with the length of 1 - if (value == null || value.length() != 1) { + if (value.length() != 1) { throw new IllegalArgumentException("String must have exactly a length of 1: " + value); } return value.charAt(0); http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java b/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java index 82bc4bd..b94f194 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/TimePatternConverter.java @@ -51,7 +51,7 @@ public final class TimePatternConverter { if (matcher.find()) { // Note: This will also be used for regular numeric strings. // This String -> long converter will be used for all strings. - milliseconds = Long.valueOf(source).longValue(); + milliseconds = Long.valueOf(source); } else { matcher = createMatcher(REPLACEMENT_PATTERN, source); String replacedSource = matcher.replaceAll(""); @@ -60,13 +60,13 @@ public final class TimePatternConverter { matcher = createMatcher(HOUR_REGEX_PATTERN, replacedSource); if (matcher.find()) { - milliseconds = milliseconds + (3600000 * Long.valueOf(matcher.group(1)).longValue()); + milliseconds = milliseconds + (3600000 * Long.valueOf(matcher.group(1))); foundFlag = true; } matcher = createMatcher(MINUTES_REGEX_PATTERN, replacedSource); if (matcher.find()) { - long minutes = Long.valueOf(matcher.group(1)).longValue(); + long minutes = Long.valueOf(matcher.group(1)); if ((minutes > 59) && foundFlag) { throw new IllegalArgumentException("Minutes should contain a valid value between 0 and 59: " + source); } @@ -76,7 +76,7 @@ public final class TimePatternConverter { matcher = createMatcher(SECONDS_REGEX_PATTERN, replacedSource); if (matcher.find()) { - long seconds = Long.valueOf(matcher.group(1)).longValue(); + long seconds = Long.valueOf(matcher.group(1)); if ((seconds > 59) && foundFlag) { throw new IllegalArgumentException("Seconds should contain a valid value between 0 and 59: " + source); } @@ -87,7 +87,7 @@ public final class TimePatternConverter { // No pattern matched... initiating fallback check and conversion (if required). // The source at this point may contain illegal values or special characters if (!foundFlag) { - milliseconds = Long.valueOf(source).longValue(); + milliseconds = Long.valueOf(source); } } http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java index 7a6d61d..bad0e86 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java @@ -245,9 +245,7 @@ public class XmlConverter { */ @Converter public byte[] toByteArray(Source source, Exchange exchange) throws TransformerException { - if (source == null) { - return null; - } else if (source instanceof BytesSource) { + if (source instanceof BytesSource) { return ((BytesSource)source).getData(); } else { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); @@ -320,11 +318,7 @@ public class XmlConverter { @Converter public DOMSource toDOMSource(String text) throws ParserConfigurationException, IOException, SAXException, TransformerException { Source source = toSource(text); - if (source != null) { - return toDOMSourceFromStream((StreamSource) source); - } else { - return null; - } + return toDOMSourceFromStream((StreamSource) source); } /** @@ -574,7 +568,7 @@ public class XmlConverter { */ @Deprecated public SAXSource toSAXSourceFromStream(StreamSource source) throws SAXException { - return toSAXSourceFromStream(source, (Exchange) null); + return toSAXSourceFromStream(source, null); } @Converter @@ -635,7 +629,7 @@ public class XmlConverter { */ @Deprecated public DOMSource toDOMSource(InputStream is) throws ParserConfigurationException, IOException, SAXException { - return toDOMSource(is, (Exchange)null); + return toDOMSource(is, null); } @Converter @@ -652,7 +646,7 @@ public class XmlConverter { */ @Deprecated public DOMSource toDOMSource(File file) throws ParserConfigurationException, IOException, SAXException { - return toDOMSource(file, (Exchange)null); + return toDOMSource(file, null); } @Converter @@ -661,13 +655,12 @@ public class XmlConverter { return toDOMSource(is, exchange); } - /** * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters. */ @Deprecated public DOMSource toDOMSourceFromStream(StreamSource source) throws ParserConfigurationException, IOException, SAXException { - return toDOMSourceFromStream(source, (Exchange)null); + return toDOMSourceFromStream(source, null); } @Converter @@ -813,7 +806,7 @@ public class XmlConverter { */ @Deprecated public Document toDOMDocument(byte[] data) throws IOException, SAXException, ParserConfigurationException { - return toDOMDocument(data, (Exchange)null); + return toDOMDocument(data, null); } /** @@ -838,7 +831,7 @@ public class XmlConverter { */ @Deprecated public Document toDOMDocument(InputStream in) throws IOException, SAXException, ParserConfigurationException { - return toDOMDocument(in, (Exchange)null); + return toDOMDocument(in, null); } /** @@ -936,7 +929,7 @@ public class XmlConverter { */ @Deprecated public Document toDOMDocument(File file) throws IOException, SAXException, ParserConfigurationException { - return toDOMDocument(file, (Exchange)null); + return toDOMDocument(file, null); } /** @@ -1078,7 +1071,7 @@ public class XmlConverter { } } if (features.size() > 0) { - StringBuffer featureString = new StringBuffer(); + StringBuilder featureString = new StringBuilder(); // just log the configured feature for (String feature : features) { if (featureString.length() != 0) { http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/test/java/org/apache/camel/converter/CollectionConverterTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/converter/CollectionConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/CollectionConverterTest.java index 3c3148c..43fbb7d 100644 --- a/camel-core/src/test/java/org/apache/camel/converter/CollectionConverterTest.java +++ b/camel-core/src/test/java/org/apache/camel/converter/CollectionConverterTest.java @@ -58,7 +58,6 @@ public class CollectionConverterTest extends TestCase { } public void testToArray() { - assertEquals(null, CollectionConverter.toArray(null)); Object[] data = CollectionConverter.toArray(SMURFS); assertEquals(4, data.length); } http://git-wip-us.apache.org/repos/asf/camel/blob/78ac444b/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java index 383a0f4..b5dcbd7 100644 --- a/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java +++ b/camel-core/src/test/java/org/apache/camel/converter/IOConverterTest.java @@ -56,11 +56,6 @@ public class IOConverterTest extends ContextTestSupport { assertTrue("Should contain Hello World!", s.contains("Hello World")); } - public void testToByteArray() throws Exception { - String val = null; - assertNull(IOConverter.toByteArray(val, null)); - } - public void testCopy() throws Exception { ByteArrayInputStream bis = new ByteArrayInputStream(TESTDATA); ByteArrayOutputStream bos = new ByteArrayOutputStream(); @@ -200,9 +195,6 @@ public class IOConverterTest extends ContextTestSupport { } public void testStringByBufferedReader() throws Exception { - BufferedReader reader = null; - assertNull(IOConverter.toString(reader)); - BufferedReader br = IOHelper.buffered(new StringReader("Hello World")); assertEquals("Hello World", IOConverter.toString(br)); }
