Author: tchemit Date: 2014-08-03 12:48:07 +0200 (Sun, 03 Aug 2014) New Revision: 2628 Url: http://forge.nuiton.org/projects/nuiton-csv/repository/revisions/2628 Log: fixes #3409: Add more exportToXXX method Modified: trunk/src/main/java/org/nuiton/csv/Export.java trunk/src/test/java/org/nuiton/csv/ExportTest.java Modified: trunk/src/main/java/org/nuiton/csv/Export.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Export.java 2014-08-03 10:43:58 UTC (rev 2627) +++ trunk/src/main/java/org/nuiton/csv/Export.java 2014-08-03 10:48:07 UTC (rev 2628) @@ -89,6 +89,38 @@ return new Export<E>(model, data); } + public static <E> void exportToOutputStream(ExportModel<E> model, + Iterable<E> data, + OutputStream outputStream) throws Exception { + Export<E> exporter = newExport(model, data); + exporter.write(outputStream, Charset.defaultCharset()); + } + + public static <E> void exportToOutputStream(ExportModel<E> model, + Iterable<E> data, + OutputStream outputStream, + boolean writeHeader) throws Exception { + Export<E> exporter = newExport(model, data); + exporter.write(outputStream, Charset.defaultCharset(), writeHeader); + } + + public static <E> void exportToOutputStream(ExportModel<E> model, + Iterable<E> data, + OutputStream outputStream, + Charset charset) throws Exception { + Export<E> exporter = newExport(model, data); + exporter.write(outputStream, charset); + } + + public static <E> void exportToOutputStream(ExportModel<E> model, + Iterable<E> data, + OutputStream outputStream, + boolean writeHeader, + Charset charset) throws Exception { + Export<E> exporter = newExport(model, data); + exporter.write(outputStream, charset, writeHeader); + } + public static <E> void exportToWriter(ExportModel<E> model, Iterable<E> data, Writer writer) throws Exception { @@ -249,7 +281,7 @@ public void write(File file) throws Exception { write(file, true); } - + public void write(File file, boolean writeHeader) throws Exception { write(file, Charset.defaultCharset(), writeHeader); } @@ -286,8 +318,8 @@ /** * @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)} + * you can use {@link #toString(java.nio.charset.Charset)} and + * {@link org.apache.commons.io.IOUtils#toInputStream(String)} */ @Deprecated public InputStream startExport() throws Exception { Modified: trunk/src/test/java/org/nuiton/csv/ExportTest.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/ExportTest.java 2014-08-03 10:43:58 UTC (rev 2627) +++ trunk/src/test/java/org/nuiton/csv/ExportTest.java 2014-08-03 10:48:07 UTC (rev 2628) @@ -111,7 +111,7 @@ for (Set<RowBean> set : sets) { outputStream.putNextEntry(new ZipEntry("/export" + (set.size()) + ".csv")); - Export.newExport(model, set).write(outputStream, CHARSET); + Export.exportToOutputStream(model, set, outputStream, CHARSET); } outputStream.close();