[camel] 02/04: [CAMEL-13026] Using 'ObjectHelper.notNull' as suggested

[dm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit f0a0d1b79524c998818cde9179b4caa506d2bf77
Author: Christian Ribeaud <ch...@novartis.com>
AuthorDate: Thu Jan 10 10:17:56 2019 +0100

    [CAMEL-13026] Using 'ObjectHelper.notNull' as suggested
---
 .../src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java  | 4 ++++
 .../java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
index 648cb4a..d2fee61 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
@@ -51,6 +51,8 @@ public abstract class CsvMarshaller {
      * @return New instance
      */
     public static CsvMarshaller create(CSVFormat format, CsvDataFormat dataFormat) {
+        org.apache.camel.util.ObjectHelper.notNull(format, "CSV format");
+        org.apache.camel.util.ObjectHelper.notNull(dataFormat, "CSV data format");
         // If we don't want the header record, clear it
         if (format.getSkipHeaderRecord()) {
             format = format.withHeader((String[]) null);
@@ -93,6 +95,8 @@ public abstract class CsvMarshaller {
      * @return a new {@link CSVPrinter}. Never <code>null</code>.
      */
     protected CSVPrinter createPrinter(Exchange exchange, OutputStream outputStream) throws IOException {
+        org.apache.camel.util.ObjectHelper.notNull(exchange, "Exchange");
+        org.apache.camel.util.ObjectHelper.notNull(outputStream, "Output stream");
         return new CSVPrinter(new OutputStreamWriter(outputStream, ExchangeHelper.getCharsetName(exchange)), format);
     }
 
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java
index e88db04..c206164 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshallerFactory.java
@@ -35,7 +35,7 @@ public interface CsvMarshallerFactory {
      *
      * @param format     the <b>CSV</b> format. Can NOT be <code>null</code>.
      * @param dataFormat the <b>CSV</b> data format. Can NOT be <code>null</code>.
-     * @return a new {@link CsvMarshaller}.
+     * @return a new {@link CsvMarshaller}. Never <code>null</code>.
      */
     CsvMarshaller create(CSVFormat format, CsvDataFormat dataFormat);
 }