CSVParser.parse(File, Charset, CSVFormat) with a null CSVFormat maps to

CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat))

CSVParser.parse(Path, Charset, CSVFormat) with a null CSVFormat maps to
CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat))

Author: garydgregory

src/changes/changes.xml

@@ -46,6 +46,8 @@
       <action type="fix" dev="ggregory" due-to="Gary Gregory">Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80).</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">CSVParser.parse(URL, Charset, CSVFormat) with a null CSVFormat maps to CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat)).</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory">CSVParser.parse(String, CSVFormat) with a null CSVFormat maps to CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat)).</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">CSVParser.parse(File, Charset, CSVFormat) with a null CSVFormat maps to CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat)).</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory">CSVParser.parse(Path, Charset, CSVFormat) with a null CSVFormat maps to CSVFormat.DEFAULT (like CSVParser.parse(Reader, CSVFormat)).</action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Gary Gregory">Define and use Maven property commons.jmh.version.</action> 
       <action type="add" dev="ggregory" due-to="Gary Gregory">Add CSVFormat.Builder.setMaxRows(long).</action> 

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

@@ -307,7 +307,7 @@ public static Builder builder() {
      * @param charset
      *            The Charset to decode the given file.
      * @param format
-     *            the CSVFormat used for CSV parsing. Must not be null.
+     *            the CSVFormat used for CSV parsing, {@code null} maps to {@link CSVFormat#DEFAULT}.
      * @return a new parser
      * @throws IllegalArgumentException
      *             If the parameters of the format are inconsistent or if either file or format are null.
@@ -357,7 +357,7 @@ public static CSVParser parse(final InputStream inputStream, final Charset chars
      * @param charset
      *            The Charset to decode the given file.
      * @param format
-     *            the CSVFormat used for CSV parsing. Must not be null.
+     *            the CSVFormat used for CSV parsing, {@code null} maps to {@link CSVFormat#DEFAULT}.
      * @return a new parser
      * @throws IllegalArgumentException
      *             If the parameters of the format are inconsistent or if either file or format are null.
@@ -369,7 +369,6 @@ public static CSVParser parse(final InputStream inputStream, final Charset chars
     @SuppressWarnings("resource")
     public static CSVParser parse(final Path path, final Charset charset, final CSVFormat format) throws IOException {
         Objects.requireNonNull(path, "path");
-        Objects.requireNonNull(format, "format");
         return parse(Files.newInputStream(path), charset, format);
     }
 

src/test/java/org/apache/commons/csv/CSVParserTest.java

@@ -1424,8 +1424,12 @@ public void testParse() throws Exception {
     }
 
     @Test
-    public void testParseFileNullFormat() {
-        assertThrows(NullPointerException.class, () -> CSVParser.parse(new File("CSVFileParser/test.csv"), Charset.defaultCharset(), null));
+    public void testParseFileCharsetNullFormat() throws IOException {
+        final File file = new File("src/test/resources/org/apache/commons/csv/CSVFileParser/test.csv");
+        try (CSVParser parser = CSVParser.parse(file, Charset.defaultCharset(), null)) {
+            // null maps to DEFAULT.
+            parseFully(parser);
+        }
     }
 
     @Test
@@ -1448,6 +1452,15 @@ public void testParseNullUrlCharsetFormat() {
         assertThrows(NullPointerException.class, () -> CSVParser.parse((URL) null, Charset.defaultCharset(), CSVFormat.DEFAULT));
     }
 
+    @Test
+    public void testParsePathCharsetNullFormat() throws IOException {
+        final Path path = Paths.get("src/test/resources/org/apache/commons/csv/CSVFileParser/test.csv");
+        try (CSVParser parser = CSVParser.parse(path, Charset.defaultCharset(), null)) {
+            // null maps to DEFAULT.
+            parseFully(parser);
+        }
+    }
+
     @Test
     public void testParserUrlNullCharsetFormat() {
         assertThrows(NullPointerException.class, () -> CSVParser.parse(new URL("https://commons.apache.org"), null, CSVFormat.DEFAULT));
@@ -1473,6 +1486,7 @@ public void testParseUrlCharsetNullFormat() throws IOException {
         final URL url = loader.getResource("org/apache/commons/csv/CSVFileParser/test.csv");
         try (CSVParser parser = CSVParser.parse(url, Charset.defaultCharset(), null)) {
             // null maps to DEFAULT.
+            parseFully(parser);
         }
     }
 
@@ -1567,10 +1581,8 @@ public void testParsingPrintedEmptyFirstColumn(final CSVFormat.Predefined format
     @Test
     public void testProvidedHeader() throws Exception {
         final Reader in = new StringReader("a,b,c\n1,2,3\nx,y,z");
-
         try (CSVParser parser = CSVFormat.DEFAULT.withHeader("A", "B", "C").parse(in)) {
             final Iterator<CSVRecord> records = parser.iterator();
-
             for (int i = 0; i < 3; i++) {
                 assertTrue(records.hasNext());
                 final CSVRecord record = records.next();
@@ -1582,18 +1594,15 @@ public void testProvidedHeader() throws Exception {
                 assertEquals(record.get(1), record.get("B"));
                 assertEquals(record.get(2), record.get("C"));
             }
-
             assertFalse(records.hasNext());
         }
     }
 
     @Test
     public void testProvidedHeaderAuto() throws Exception {
         final Reader in = new StringReader("a,b,c\n1,2,3\nx,y,z");
-
         try (CSVParser parser = CSVFormat.DEFAULT.withHeader().parse(in)) {
             final Iterator<CSVRecord> records = parser.iterator();
-
             for (int i = 0; i < 2; i++) {
                 assertTrue(records.hasNext());
                 final CSVRecord record = records.next();
@@ -1605,7 +1614,6 @@ public void testProvidedHeaderAuto() throws Exception {
                 assertEquals(record.get(1), record.get("b"));
                 assertEquals(record.get(2), record.get("c"));
             }
-
             assertFalse(records.hasNext());
         }
     }