20

Author: kaiyaok2

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

@@ -40,10 +40,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.apache.commons.codec.binary.Base64OutputStream;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.function.Uncheck;
-import org.apache.commons.io.output.AppendableOutputStream;
 
 /**
  * Specifies the format of a CSV file for parsing and writing.
@@ -1642,19 +1638,7 @@ private void escape(final char c, final Appendable appendable) throws IOExceptio
      * @param values the values to format
      * @return the formatted values
      */
-    public String format(final Object... values) {
-        return Uncheck.get(() -> format_(values));
-    }
 
-    private String format_(final Object... values) throws IOException {
-        final StringWriter out = new StringWriter();
-        try (CSVPrinter csvPrinter = new CSVPrinter(out, this)) {
-            csvPrinter.printRecord(values);
-            final String res = out.toString();
-            final int len = recordSeparator != null ? res.length() - recordSeparator.length() : res.length();
-            return res.substring(0, len);
-        }
-    }
 
     /**
      * Gets whether duplicate names are allowed in the headers.
@@ -2050,9 +2034,6 @@ public CSVParser parse(final Reader reader) throws IOException {
      * @return a printer to an output.
      * @throws IOException thrown if the optional header cannot be printed.
      */
-    public CSVPrinter print(final Appendable out) throws IOException {
-        return new CSVPrinter(out, this);
-    }
 
     /**
      * Prints to the specified {@code File} with given {@code Charset}.
@@ -2067,31 +2048,7 @@ public CSVPrinter print(final Appendable out) throws IOException {
      * @throws IOException thrown if the optional header cannot be printed.
      * @since 1.5
      */
-    @SuppressWarnings("resource")
-    public CSVPrinter print(final File out, final Charset charset) throws IOException {
-        // The writer will be closed when close() is called.
-        return new CSVPrinter(new OutputStreamWriter(new FileOutputStream(out), charset), this);
-    }
 
-    private void print(final InputStream inputStream, final Appendable out, final boolean newRecord) throws IOException {
-        // InputStream is never null here
-        // There is nothing to escape when quoting is used which is the default.
-        if (!newRecord) {
-            append(getDelimiterString(), out);
-        }
-        final boolean quoteCharacterSet = isQuoteCharacterSet();
-        if (quoteCharacterSet) {
-            append(getQuoteCharacter().charValue(), out);
-        }
-        // Stream the input to the output without reading or holding the whole value in memory.
-        // AppendableOutputStream cannot "close" an Appendable.
-        try (OutputStream outputStream = new Base64OutputStream(new AppendableOutputStream<>(out))) {
-            IOUtils.copy(inputStream, outputStream);
-        }
-        if (quoteCharacterSet) {
-            append(getQuoteCharacter().charValue(), out);
-        }
-    }
 
     /**
      * Prints the {@code value} as the next value on the line to {@code out}. The value will be escaped or encapsulated as needed. Useful when one wants to
@@ -2103,51 +2060,7 @@ private void print(final InputStream inputStream, final Appendable out, final bo
      * @throws IOException If an I/O error occurs.
      * @since 1.4
      */
-    public synchronized void print(final Object value, final Appendable out, final boolean newRecord) throws IOException {
-        // null values are considered empty
-        // Only call CharSequence.toString() if you have to, helps GC-free use cases.
-        CharSequence charSequence;
-        if (value == null) {
-            // https://issues.apache.org/jira/browse/CSV-203
-            if (null == nullString) {
-                charSequence = Constants.EMPTY;
-            } else if (QuoteMode.ALL == quoteMode) {
-                charSequence = quotedNullString;
-            } else {
-                charSequence = nullString;
-            }
-        } else if (value instanceof CharSequence) {
-            charSequence = (CharSequence) value;
-        } else if (value instanceof Reader) {
-            print((Reader) value, out, newRecord);
-            return;
-        } else if (value instanceof InputStream) {
-            print((InputStream) value, out, newRecord);
-            return;
-        } else {
-            charSequence = value.toString();
-        }
-        charSequence = getTrim() ? trim(charSequence) : charSequence;
-        print(value, charSequence, out, newRecord);
-    }
 
-    private synchronized void print(final Object object, final CharSequence value, final Appendable out, final boolean newRecord) throws IOException {
-        final int offset = 0;
-        final int len = value.length();
-        if (!newRecord) {
-            out.append(getDelimiterString());
-        }
-        if (object == null) {
-            out.append(value);
-        } else if (isQuoteCharacterSet()) {
-            // The original object is needed so can check for Number
-            printWithQuotes(object, value, out, newRecord);
-        } else if (isEscapeCharacterSet()) {
-            printWithEscapes(value, out);
-        } else {
-            out.append(value, offset, len);
-        }
-    }
 
     /**
      * Prints to the specified {@code Path} with given {@code Charset},
@@ -2163,26 +2076,7 @@ private synchronized void print(final Object object, final CharSequence value, f
      * @throws IOException thrown if the optional header cannot be printed.
      * @since 1.5
      */
-    @SuppressWarnings("resource")
-    public CSVPrinter print(final Path out, final Charset charset) throws IOException {
-        return print(Files.newBufferedWriter(out, charset));
-    }
 
-    private void print(final Reader reader, final Appendable out, final boolean newRecord) throws IOException {
-        // Reader is never null here
-        if (!newRecord) {
-            append(getDelimiterString(), out);
-        }
-        if (isQuoteCharacterSet()) {
-            printWithQuotes(reader, out);
-        } else if (isEscapeCharacterSet()) {
-            printWithEscapes(reader, out);
-        } else if (out instanceof Writer) {
-            IOUtils.copyLarge(reader, (Writer) out);
-        } else {
-            IOUtils.copy(reader, out);
-        }
-    }
 
     /**
      * Prints to the {@link System#out}.
@@ -2195,9 +2089,6 @@ private void print(final Reader reader, final Appendable out, final boolean newR
      * @throws IOException thrown if the optional header cannot be printed.
      * @since 1.5
      */
-    public CSVPrinter printer() throws IOException {
-        return new CSVPrinter(System.out, this);
-    }
 
     /**
      * Outputs the trailing delimiter (if set) followed by the record separator (if set).
@@ -2228,12 +2119,6 @@ public synchronized void println(final Appendable appendable) throws IOException
      * @throws IOException If an I/O error occurs.
      * @since 1.4
      */
-    public synchronized void printRecord(final Appendable appendable, final Object... values) throws IOException {
-        for (int i = 0; i < values.length; i++) {
-            print(values[i], appendable, i == 0);
-        }
-        println(appendable);
-    }
 
     /*
      * Note: Must only be called if escaping is enabled, otherwise can throw exceptions.

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

@@ -47,7 +47,6 @@
 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.