Reuse Commons IO

Author: garydgregory

pom.xml

@@ -51,7 +51,6 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>2.14.0</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

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

@@ -48,6 +48,8 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.apache.commons.io.IOUtils;
+
 /**
  * Specifies the format of a CSV file for parsing and writing.
  *

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

@@ -47,6 +47,8 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import org.apache.commons.io.function.Uncheck;
+
 /**
  * Parses CSV files according to the specified format.
  *
@@ -144,11 +146,7 @@ class CSVRecordIterator implements Iterator<CSVRecord> {
         private CSVRecord current;
 
         private CSVRecord getNextRecord() {
-            try {
-                return CSVParser.this.nextRecord();
-            } catch (final IOException e) {
-                throw new UncheckedIOException("Exception reading next record: " + e.toString(), e);
-            }
+            return Uncheck.get(CSVParser.this::nextRecord);
         }
 
         @Override

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

@@ -70,6 +70,19 @@
  */
 public final class CSVPrinter implements Flushable, Closeable {
 
+    /**
+     * Throws the given throwable.
+     *
+     * @param <T> The throwable cast type.
+     * @param throwable The throwable to rethrow.
+     * @return nothing because we throw.
+     * @throws T Always thrown.
+     */
+    @SuppressWarnings("unchecked")
+    private static <T extends Throwable> RuntimeException rethrow(final Throwable throwable) throws T {
+        throw (T) throwable;
+    }
+
     /** The place that the values get written. */
     private final Appendable appendable;
 
@@ -300,7 +313,7 @@ public synchronized void printRecord(final Stream<?> values) throws IOException
             try {
                 print(t);
             } catch (final IOException e) {
-                throw IOUtils.rethrow(e);
+                throw rethrow(e);
             }
         });
         println();
@@ -489,7 +502,7 @@ public void printRecords(final Stream<?> values) throws IOException {
             try {
                 printRecordObject(t);
             } catch (final IOException e) {
-                throw IOUtils.rethrow(e);
+                throw rethrow(e);
             }
         });
     }

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

@@ -61,6 +61,7 @@
 import java.util.stream.Stream;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.NullOutputStream;
 import org.apache.commons.lang3.StringUtils;
 import org.h2.tools.SimpleResultSet;