Author: tchemit Date: 2014-08-03 12:52:16 +0200 (Sun, 03 Aug 2014) New Revision: 2629 Url: http://forge.nuiton.org/projects/nuiton-csv/repository/revisions/2629 Log: fixes #3408: Remove deprecated method since 2.4 + fix some variable arity Modified: trunk/src/main/java/org/nuiton/csv/Export.java trunk/src/main/java/org/nuiton/csv/Import.java trunk/src/main/java/org/nuiton/csv/Import2.java Modified: trunk/src/main/java/org/nuiton/csv/Export.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Export.java 2014-08-03 10:48:07 UTC (rev 2628) +++ trunk/src/main/java/org/nuiton/csv/Export.java 2014-08-03 10:52:16 UTC (rev 2629) @@ -23,7 +23,6 @@ */ package org.nuiton.csv; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; @@ -32,7 +31,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; @@ -298,32 +296,4 @@ return result; } - /** @deprecated since 2.4.3, use {@link #write(java.io.File)} instead. */ - @Deprecated - public void exportToFile(File file) throws Exception { - write(file); - } - - /** @deprecated since 2.4.3, use {@link #write(java.io.Writer)} instead. */ - @Deprecated - public void startExport(Writer writer) throws Exception { - write(writer); - } - - /** @deprecated since 2.4.3, use {@link #toString(java.nio.charset.Charset)} instead. */ - @Deprecated - public String startExportAsString() throws Exception { - return toString(Charset.defaultCharset()); - } - - /** - * @deprecated since 2.4.3. It's not the role of the API to give an InputStream - * you can use {@link #toString(java.nio.charset.Charset)} and - * {@link org.apache.commons.io.IOUtils#toInputStream(String)} - */ - @Deprecated - public InputStream startExport() throws Exception { - String content = toString(Charset.defaultCharset()); - return IOUtils.toInputStream(content); - } } Modified: trunk/src/main/java/org/nuiton/csv/Import.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Import.java 2014-08-03 10:48:07 UTC (rev 2628) +++ trunk/src/main/java/org/nuiton/csv/Import.java 2014-08-03 10:52:16 UTC (rev 2629) @@ -258,7 +258,7 @@ } } - protected void checkHeaderNamesAreAllKnown(String[] headers) { + protected void checkHeaderNamesAreAllKnown(String... headers) { List<String> csvHeaders = new ArrayList<String>(); Collections.addAll(csvHeaders, headers); @@ -299,7 +299,7 @@ } } - protected void checkAllMandatoryHeadersArePresent(String[] headers) { + protected void checkAllMandatoryHeadersArePresent(String... headers) { List<String> csvHeaders = new ArrayList<String>(); Collections.addAll(csvHeaders, headers); Modified: trunk/src/main/java/org/nuiton/csv/Import2.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Import2.java 2014-08-03 10:48:07 UTC (rev 2628) +++ trunk/src/main/java/org/nuiton/csv/Import2.java 2014-08-03 10:52:16 UTC (rev 2629) @@ -200,7 +200,7 @@ } } - protected void checkHeaderNamesAreAllKnown(String[] headers) { + protected void checkHeaderNamesAreAllKnown(String... headers) { List<String> csvHeaders = new ArrayList<String>(); Collections.addAll(csvHeaders, headers); @@ -241,7 +241,7 @@ } } - protected void checkAllMandatoryHeadersArePresent(String[] headers) { + protected void checkAllMandatoryHeadersArePresent(String... headers) { List<String> csvHeaders = new ArrayList<String>(); Collections.addAll(csvHeaders, headers);