Replace org.apache.commons.csv.Assertions.notNull() with

Objects.requireNonNull().

Author: garydgregory

src/changes/changes.xml

@@ -54,6 +54,7 @@
       <action                 type="update" dev="ggregory" due-to="Chen">Improve CSVRecord and CSVPrinter code coverage #66.</action>
       <action                 type="update" dev="ggregory" due-to="Chen">Improve lexer and token coverage #67.</action>
       <action issue="CSV-211" type="fix" dev="ggregory" due-to="Alpesh Kulkarni, Chen">CSVFormat.format trims last delimiter if the delimiter is a white space #71.</action>
+      <action                 type="update" dev="ggregory" due-to="Gary Gregory">Replace org.apache.commons.csv.Assertions.notNull() with Objects.requireNonNull().</action>
     </release>
     <release version="1.8" date="2020-02-01" description="Feature and bug fix release (Java 8).
 

src/main/java/org/apache/commons/csv/Assertions.java

@@ -39,6 +39,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.TreeMap;
 
 /**
@@ -200,8 +201,8 @@ public void remove() {
      */
     @SuppressWarnings("resource")
     public static CSVParser parse(final File file, final Charset charset, final CSVFormat format) throws IOException {
-        Assertions.notNull(file, "file");
-        Assertions.notNull(format, "format");
+        Objects.requireNonNull(file, "file");
+        Objects.requireNonNull(format, "format");
         return new CSVParser(new InputStreamReader(new FileInputStream(file), charset), format);
     }
 
@@ -229,8 +230,8 @@ public static CSVParser parse(final File file, final Charset charset, final CSVF
     @SuppressWarnings("resource")
     public static CSVParser parse(final InputStream inputStream, final Charset charset, final CSVFormat format)
             throws IOException {
-        Assertions.notNull(inputStream, "inputStream");
-        Assertions.notNull(format, "format");
+        Objects.requireNonNull(inputStream, "inputStream");
+        Objects.requireNonNull(format, "format");
         return parse(new InputStreamReader(inputStream, charset), format);
     }
 
@@ -251,8 +252,8 @@ public static CSVParser parse(final InputStream inputStream, final Charset chars
      * @since 1.5
      */
     public static CSVParser parse(final Path path, final Charset charset, final CSVFormat format) throws IOException {
-        Assertions.notNull(path, "path");
-        Assertions.notNull(format, "format");
+        Objects.requireNonNull(path, "path");
+        Objects.requireNonNull(format, "format");
         return parse(Files.newInputStream(path), charset, format);
     }
 
@@ -293,8 +294,8 @@ public static CSVParser parse(final Reader reader, final CSVFormat format) throw
      *             If an I/O error occurs
      */
     public static CSVParser parse(final String string, final CSVFormat format) throws IOException {
-        Assertions.notNull(string, "string");
-        Assertions.notNull(format, "format");
+        Objects.requireNonNull(string, "string");
+        Objects.requireNonNull(format, "format");
 
         return new CSVParser(new StringReader(string), format);
     }
@@ -322,9 +323,9 @@ public static CSVParser parse(final String string, final CSVFormat format) throw
      *             If an I/O error occurs
      */
     public static CSVParser parse(final URL url, final Charset charset, final CSVFormat format) throws IOException {
-        Assertions.notNull(url, "url");
-        Assertions.notNull(charset, "charset");
-        Assertions.notNull(format, "format");
+        Objects.requireNonNull(url, "url");
+        Objects.requireNonNull(charset, "charset");
+        Objects.requireNonNull(format, "format");
 
         return new CSVParser(new InputStreamReader(url.openStream(), charset), format);
     }
@@ -403,8 +404,8 @@ public CSVParser(final Reader reader, final CSVFormat format) throws IOException
     @SuppressWarnings("resource")
     public CSVParser(final Reader reader, final CSVFormat format, final long characterOffset, final long recordNumber)
         throws IOException {
-        Assertions.notNull(reader, "reader");
-        Assertions.notNull(format, "format");
+        Objects.requireNonNull(reader, "reader");
+        Objects.requireNonNull(format, "format");
 
         this.format = format;
         this.lexer = new Lexer(format, new ExtendedBufferedReader(reader));

src/main/java/org/apache/commons/csv/CSVParser.java

@@ -28,6 +28,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * Prints values in a {@link CSVFormat CSV format}.
@@ -92,8 +93,8 @@ public final class CSVPrinter implements Flushable, Closeable {
      *             thrown if the parameters of the format are inconsistent or if either out or format are null.
      */
     public CSVPrinter(final Appendable out, final CSVFormat format) throws IOException {
-        Assertions.notNull(out, "out");
-        Assertions.notNull(format, "format");
+        Objects.requireNonNull(out, "out");
+        Objects.requireNonNull(format, "format");
 
         this.out = out;
         this.format = format;