- Nuiton-csv-commits - mailman.cloud.codelutin.com

[nuiton-csv] branch develop updated (0674948 -> 3b9a1c2)
by nuiton.org scm 04 Aug '14

04 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-csv. See http://git.nuiton.org/nuiton-csv.git from 0674948 - remove svn properties from license-header - fix javadoc author annotation new 3b9a1c2 fixes #3412: Migrate to Git The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3b9a1c244c316c0ed8436e963c85dba673424f93 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Aug 4 12:21:26 2014 +0200 fixes #3412: Migrate to Git Summary of changes: .gitignore | 12 +++++++++ pom.xml | 71 ++++++++++++-------------------------------------- src/site/apt/index.apt | 4 +-- src/site/site_fr.xml | 53 +------------------------------------ 4 files changed, 32 insertions(+), 108 deletions(-) create mode 100644 .gitignore -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 1

[nuiton-csv] branch master updated (0674948 -> a27a8d2)
by nuiton.org scm 04 Aug '14

04 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch master in repository nuiton-csv. See http://git.nuiton.org/nuiton-csv.git omits 0674948 - remove svn properties from license-header - fix javadoc author annotation omits 8bab6a8 fixes #3408: Remove deprecated method since 2.4 + fix some variable arity omits b54383c fixes #3409: Add more exportToXXX method omits 4c1fa64 fixes #3407: Export#write(OutputStream) should NOT close stream omits a6b8233 fixes #3398: Updates mavenpom to 5.1 and use new site layout fixes #3399: updates nuiton-utils to 3.0-rc-5 fixes #3400: updates i18n to 3.3 omits b02acc0 [maven-release-plugin] prepare for next development iteration adds a27a8d2 [maven-release-plugin] copy for tag nuiton-csv-3.0-rc-3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0674948) \ N -- N -- N refs/heads/master (a27a8d2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 20 +++--- .../org/nuiton/csv/AbstractImportErrorInfo.java | 4 +- src/main/java/org/nuiton/csv/Column.java | 6 +- src/main/java/org/nuiton/csv/Common.java | 6 +- src/main/java/org/nuiton/csv/CsvModel.java | 2 + src/main/java/org/nuiton/csv/Export.java | 77 +++++++++++----------- src/main/java/org/nuiton/csv/ExportModel.java | 6 +- src/main/java/org/nuiton/csv/ExportableColumn.java | 6 +- src/main/java/org/nuiton/csv/Import.java | 12 ++-- src/main/java/org/nuiton/csv/Import2.java | 8 ++- src/main/java/org/nuiton/csv/ImportConf.java | 4 +- .../java/org/nuiton/csv/ImportExportModel.java | 6 +- src/main/java/org/nuiton/csv/ImportModel.java | 6 +- .../java/org/nuiton/csv/ImportParseErrorInfo.java | 4 +- .../java/org/nuiton/csv/ImportReadErrorInfo.java | 4 +- src/main/java/org/nuiton/csv/ImportRow.java | 4 +- .../org/nuiton/csv/ImportRuntimeException.java | 4 +- .../java/org/nuiton/csv/ImportSetErrorInfo.java | 4 +- src/main/java/org/nuiton/csv/ImportToMap.java | 4 +- src/main/java/org/nuiton/csv/ImportableColumn.java | 6 +- .../org/nuiton/csv/ImportableExportableColumn.java | 2 + src/main/java/org/nuiton/csv/ModelBuilder.java | 6 +- src/main/java/org/nuiton/csv/MyModelBuilder.java | 2 + src/main/java/org/nuiton/csv/ValidationResult.java | 6 +- src/main/java/org/nuiton/csv/ValueFormatter.java | 6 +- src/main/java/org/nuiton/csv/ValueGetter.java | 6 +- .../java/org/nuiton/csv/ValueGetterSetter.java | 6 +- src/main/java/org/nuiton/csv/ValueParser.java | 2 + .../java/org/nuiton/csv/ValueParserFormatter.java | 2 + src/main/java/org/nuiton/csv/ValueSetter.java | 2 + .../org/nuiton/csv/ext/AbstractExportModel.java | 4 +- .../nuiton/csv/ext/AbstractImportExportModel.java | 4 +- .../org/nuiton/csv/ext/AbstractImportModel.java | 4 +- src/main/java/org/nuiton/csv/ext/CsvReaders.java | 4 +- .../java/org/nuiton/csv/ext/RepeatableExport.java | 4 +- src/main/java/org/nuiton/csv/ext/package-info.java | 4 +- src/main/java/org/nuiton/csv/package-info.java | 4 +- src/site/apt/index.apt | 2 + src/site/apt/versions.apt | 10 +-- src/site/site_fr.xml | 10 +-- src/test/java/org/nuiton/csv/ExportTest.java | 55 ++-------------- src/test/java/org/nuiton/csv/Import2Test.java | 4 +- src/test/java/org/nuiton/csv/ImportTest.java | 6 +- .../java/org/nuiton/csv/MyModelBuilderTest.java | 2 + src/test/java/org/nuiton/csv/RowBean.java | 2 + src/test/java/org/nuiton/csv/RowBeanEnum.java | 4 +- .../java/org/nuiton/csv/RowBeanExportModel.java | 2 + src/test/resources/log4j.properties | 2 + 48 files changed, 202 insertions(+), 158 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm(a)nuiton.org>.

1 0

r2630 - in trunk/src: main/java/org/nuiton/csv main/java/org/nuiton/csv/ext site site/apt test/java/org/nuiton/csv test/resources
by tchemit＠users.nuiton.org 03 Aug '14

03 Aug '14

Author: tchemit Date: 2014-08-03 13:38:15 +0200 (Sun, 03 Aug 2014) New Revision: 2630 Url: http://forge.nuiton.org/projects/nuiton-csv/repository/revisions/2630 Log: - remove svn properties from license-header - fix javadoc author annotation Modified: trunk/src/main/java/org/nuiton/csv/AbstractImportErrorInfo.java trunk/src/main/java/org/nuiton/csv/Column.java trunk/src/main/java/org/nuiton/csv/Common.java trunk/src/main/java/org/nuiton/csv/CsvModel.java trunk/src/main/java/org/nuiton/csv/Export.java trunk/src/main/java/org/nuiton/csv/ExportModel.java trunk/src/main/java/org/nuiton/csv/ExportableColumn.java trunk/src/main/java/org/nuiton/csv/Import.java trunk/src/main/java/org/nuiton/csv/Import2.java trunk/src/main/java/org/nuiton/csv/ImportConf.java trunk/src/main/java/org/nuiton/csv/ImportExportModel.java trunk/src/main/java/org/nuiton/csv/ImportModel.java trunk/src/main/java/org/nuiton/csv/ImportParseErrorInfo.java trunk/src/main/java/org/nuiton/csv/ImportReadErrorInfo.java trunk/src/main/java/org/nuiton/csv/ImportRow.java trunk/src/main/java/org/nuiton/csv/ImportRuntimeException.java trunk/src/main/java/org/nuiton/csv/ImportSetErrorInfo.java trunk/src/main/java/org/nuiton/csv/ImportToMap.java trunk/src/main/java/org/nuiton/csv/ImportableColumn.java trunk/src/main/java/org/nuiton/csv/ImportableExportableColumn.java trunk/src/main/java/org/nuiton/csv/ModelBuilder.java trunk/src/main/java/org/nuiton/csv/MyModelBuilder.java trunk/src/main/java/org/nuiton/csv/ValidationResult.java trunk/src/main/java/org/nuiton/csv/ValueFormatter.java trunk/src/main/java/org/nuiton/csv/ValueGetter.java trunk/src/main/java/org/nuiton/csv/ValueGetterSetter.java trunk/src/main/java/org/nuiton/csv/ValueParser.java trunk/src/main/java/org/nuiton/csv/ValueParserFormatter.java trunk/src/main/java/org/nuiton/csv/ValueSetter.java trunk/src/main/java/org/nuiton/csv/ext/AbstractExportModel.java trunk/src/main/java/org/nuiton/csv/ext/AbstractImportExportModel.java trunk/src/main/java/org/nuiton/csv/ext/AbstractImportModel.java trunk/src/main/java/org/nuiton/csv/ext/CsvReaders.java trunk/src/main/java/org/nuiton/csv/ext/RepeatableExport.java trunk/src/main/java/org/nuiton/csv/ext/package-info.java trunk/src/main/java/org/nuiton/csv/package-info.java trunk/src/site/apt/index.apt trunk/src/site/apt/versions.apt trunk/src/site/site_fr.xml trunk/src/test/java/org/nuiton/csv/ExportTest.java trunk/src/test/java/org/nuiton/csv/Import2Test.java trunk/src/test/java/org/nuiton/csv/ImportTest.java trunk/src/test/java/org/nuiton/csv/MyModelBuilderTest.java trunk/src/test/java/org/nuiton/csv/RowBean.java trunk/src/test/java/org/nuiton/csv/RowBeanEnum.java trunk/src/test/java/org/nuiton/csv/RowBeanExportModel.java trunk/src/test/resources/log4j.properties Modified: trunk/src/main/java/org/nuiton/csv/AbstractImportErrorInfo.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/AbstractImportErrorInfo.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/AbstractImportErrorInfo.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -3,8 +3,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -27,7 +25,7 @@ /** * Abstract import esxception which contains the {@link ImportRow} object. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6.3 */ public abstract class AbstractImportErrorInfo<E> { Modified: trunk/src/main/java/org/nuiton/csv/Column.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Column.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/Column.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -28,8 +26,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public class Column<E, T> implements ImportableExportableColumn<E, T> { Modified: trunk/src/main/java/org/nuiton/csv/Common.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Common.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/Common.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -42,8 +40,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public class Common { Modified: trunk/src/main/java/org/nuiton/csv/CsvModel.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/CsvModel.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/CsvModel.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Modified: trunk/src/main/java/org/nuiton/csv/Export.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Export.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/Export.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -60,8 +58,8 @@ * Export<E> exporter = Export.newExport(model, data); * </pre> * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public class Export<E> { Modified: trunk/src/main/java/org/nuiton/csv/ExportModel.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ExportModel.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ExportModel.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -26,8 +24,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public interface ExportModel<E> { Modified: trunk/src/main/java/org/nuiton/csv/ExportableColumn.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ExportableColumn.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ExportableColumn.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -26,8 +24,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public interface ExportableColumn<E, T> { Modified: trunk/src/main/java/org/nuiton/csv/Import.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Import.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/Import.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -55,9 +53,9 @@ * only once. It mainly obtain header from the csv input, pass it to the model * and then validate the model. * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> - * @author fdesbois <desbois(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com + * @author Florian Desbois * @since 2.4 */ public class Import<E> implements Iterable<E>, Closeable { Modified: trunk/src/main/java/org/nuiton/csv/Import2.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Import2.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/Import2.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -3,8 +3,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -50,7 +48,7 @@ /** * Improve the first {@link Import} class with the notion of {@link ImportRow}. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6.3 */ public class Import2<E> implements Iterable<ImportRow<E>>, Closeable { Modified: trunk/src/main/java/org/nuiton/csv/ImportConf.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportConf.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportConf.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -3,8 +3,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -32,7 +30,7 @@ * If you do not give this object to the {@link Import2}, then it will * instanciate a new one using all default values. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6.3 */ public class ImportConf { Modified: trunk/src/main/java/org/nuiton/csv/ImportExportModel.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportExportModel.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportExportModel.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -26,8 +24,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public interface ImportExportModel<E> extends ImportModel<E>, ExportModel<E> { Modified: trunk/src/main/java/org/nuiton/csv/ImportModel.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportModel.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportModel.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -28,8 +26,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public interface ImportModel<E> { Modified: trunk/src/main/java/org/nuiton/csv/ImportParseErrorInfo.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportParseErrorInfo.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportParseErrorInfo.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -3,8 +3,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -27,7 +25,7 @@ /** * Exception to be thrown when a parse error occurs at import time. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6.3 */ public class ImportParseErrorInfo<E> extends AbstractImportErrorInfo<E> { Modified: trunk/src/main/java/org/nuiton/csv/ImportReadErrorInfo.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportReadErrorInfo.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportReadErrorInfo.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -3,8 +3,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -27,7 +25,7 @@ /** * Exception to be thrown when a read error occurs at import time. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6.3 */ public class ImportReadErrorInfo<E> extends AbstractImportErrorInfo<E> { Modified: trunk/src/main/java/org/nuiton/csv/ImportRow.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportRow.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportRow.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -3,8 +3,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -34,7 +32,7 @@ * <p/> * It contains all the context for the current row to import. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6.3 */ public class ImportRow<E> { Modified: trunk/src/main/java/org/nuiton/csv/ImportRuntimeException.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportRuntimeException.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportRuntimeException.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% @@ -26,7 +24,7 @@ /** * TODO * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public class ImportRuntimeException extends RuntimeException{ Modified: trunk/src/main/java/org/nuiton/csv/ImportSetErrorInfo.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportSetErrorInfo.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportSetErrorInfo.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -3,8 +3,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -27,7 +25,7 @@ /** * Exception to be thrown when a set error occurs at import time. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6.3 */ public class ImportSetErrorInfo<E> extends AbstractImportErrorInfo<E> { Modified: trunk/src/main/java/org/nuiton/csv/ImportToMap.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportToMap.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportToMap.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% @@ -37,7 +35,7 @@ * <strong>Warning:</strong> The map used to push values for a csv line is the * same for all lines, it means you have to copy to your own object. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public class ImportToMap extends Import<Map<String, Object>> { Modified: trunk/src/main/java/org/nuiton/csv/ImportableColumn.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportableColumn.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportableColumn.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -28,8 +26,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public interface ImportableColumn<E, T> { Modified: trunk/src/main/java/org/nuiton/csv/ImportableExportableColumn.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportableExportableColumn.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ImportableExportableColumn.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% Modified: trunk/src/main/java/org/nuiton/csv/ModelBuilder.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ModelBuilder.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ModelBuilder.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -29,8 +27,8 @@ /** * * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public class ModelBuilder<E> { Modified: trunk/src/main/java/org/nuiton/csv/MyModelBuilder.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/MyModelBuilder.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/MyModelBuilder.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Modified: trunk/src/main/java/org/nuiton/csv/ValidationResult.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ValidationResult.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ValidationResult.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -32,8 +30,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public class ValidationResult implements Serializable { Modified: trunk/src/main/java/org/nuiton/csv/ValueFormatter.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ValueFormatter.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ValueFormatter.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -26,8 +24,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public interface ValueFormatter<T> { Modified: trunk/src/main/java/org/nuiton/csv/ValueGetter.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ValueGetter.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ValueGetter.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -26,8 +24,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public interface ValueGetter<E, T> { Modified: trunk/src/main/java/org/nuiton/csv/ValueGetterSetter.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ValueGetterSetter.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ValueGetterSetter.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% @@ -26,8 +24,8 @@ /** * TODO * - * @author bleny <leny(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Brendan Le Ny - leny(a)codelutin.com + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public interface ValueGetterSetter<E, T> extends ValueGetter<E, T>, ValueSetter<E, T> { Modified: trunk/src/main/java/org/nuiton/csv/ValueParser.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ValueParser.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ValueParser.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% Modified: trunk/src/main/java/org/nuiton/csv/ValueParserFormatter.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ValueParserFormatter.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ValueParserFormatter.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% Modified: trunk/src/main/java/org/nuiton/csv/ValueSetter.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ValueSetter.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ValueSetter.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit, Brendan Le Ny * %% Modified: trunk/src/main/java/org/nuiton/csv/ext/AbstractExportModel.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ext/AbstractExportModel.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ext/AbstractExportModel.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -2,8 +2,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -34,7 +32,7 @@ * boilerplate code when creating a new model. * * @param <E> type of object to export - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6 */ public abstract class AbstractExportModel<E> implements ExportModel<E> { Modified: trunk/src/main/java/org/nuiton/csv/ext/AbstractImportExportModel.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ext/AbstractImportExportModel.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ext/AbstractImportExportModel.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -2,8 +2,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -42,7 +40,7 @@ * boilerplate code when creating a new model. * * @param <E> type of object to import/export - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6 */ public abstract class AbstractImportExportModel<E> implements ImportExportModel<E> { Modified: trunk/src/main/java/org/nuiton/csv/ext/AbstractImportModel.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ext/AbstractImportModel.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ext/AbstractImportModel.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -2,8 +2,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -36,7 +34,7 @@ * boilerplate code when creating a new model. * * @param <E> type of object to import - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6 */ public abstract class AbstractImportModel<E> implements ImportModel<E> { Modified: trunk/src/main/java/org/nuiton/csv/ext/CsvReaders.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ext/CsvReaders.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ext/CsvReaders.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -2,8 +2,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -34,7 +32,7 @@ /** * Useful method around csv readers. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6 */ public class CsvReaders { Modified: trunk/src/main/java/org/nuiton/csv/ext/RepeatableExport.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ext/RepeatableExport.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ext/RepeatableExport.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -2,8 +2,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -35,7 +33,7 @@ * Extends the {@link Export} classes to be able to generate only once * the header. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6 */ public class RepeatableExport<E> extends Export<E> { Modified: trunk/src/main/java/org/nuiton/csv/ext/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ext/package-info.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/ext/package-info.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,15 +1,13 @@ /** * Offers some extended api. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6 */ package org.nuiton.csv.ext; /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Modified: trunk/src/main/java/org/nuiton/csv/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/package-info.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/main/java/org/nuiton/csv/package-info.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2004 - 2011 CodeLutin * %% @@ -25,7 +23,7 @@ * This package contains a framework to import and export data from a * csv file using a model which permits us to validate what to do. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ package org.nuiton.csv; Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/site/apt/index.apt 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ ~~~ ~~ #%L ~~ Nuiton CSV -~~ $Id$ -~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2011 CodeLutin ~~ %% Modified: trunk/src/site/apt/versions.apt =================================================================== --- trunk/src/site/apt/versions.apt 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/site/apt/versions.apt 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ ~~~ ~~ #%L -~~ Nuiton Config -~~ $Id$ -~~ $HeadURL$ +~~ Nuiton CSV ~~ %% ~~ Copyright (C) 2013 CodeLutin ~~ %% @@ -10,12 +8,12 @@ ~~ it under the terms of the GNU Lesser General Public License as ~~ published by the Free Software Foundation, either version 3 of the ~~ License, or (at your option) any later version. -~~ +~~ ~~ This program is distributed in the hope that it will be useful, ~~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ~~ GNU General Lesser Public License for more details. -~~ +~~ ~~ You should have received a copy of the GNU General Lesser Public ~~ License along with this program. If not, see ~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. @@ -31,4 +29,4 @@ Utilisation de la version 3.0 * Pour passer sur cette version, il faut changer les packages <org.nuiton.util.csv> - en <org.nuiton.csv>. \ No newline at end of file + en <org.nuiton.csv>. Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/site/site_fr.xml 2014-08-03 11:38:15 UTC (rev 2630) @@ -2,8 +2,6 @@ <!-- #%L Nuiton CSV - $Id$ - $HeadURL$ %% Copyright (C) 2013 CodeLutin %% Modified: trunk/src/test/java/org/nuiton/csv/ExportTest.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/ExportTest.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/test/java/org/nuiton/csv/ExportTest.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Modified: trunk/src/test/java/org/nuiton/csv/Import2Test.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/Import2Test.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/test/java/org/nuiton/csv/Import2Test.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -3,8 +3,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -40,7 +38,7 @@ /** * Tests the {@link Import2}. * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.6.3 */ public class Import2Test { Modified: trunk/src/test/java/org/nuiton/csv/ImportTest.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/ImportTest.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/test/java/org/nuiton/csv/ImportTest.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin * %% @@ -48,8 +46,8 @@ /** * Created on 28/11/11 * - * @author fdesbois <desbois(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> + * @author Florian Desbois + * @author Tony Chemit - chemit(a)codelutin.com * @since 2.4 */ public class ImportTest { Modified: trunk/src/test/java/org/nuiton/csv/MyModelBuilderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/MyModelBuilderTest.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/test/java/org/nuiton/csv/MyModelBuilderTest.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Modified: trunk/src/test/java/org/nuiton/csv/RowBean.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/RowBean.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/test/java/org/nuiton/csv/RowBean.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Modified: trunk/src/test/java/org/nuiton/csv/RowBeanEnum.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/RowBeanEnum.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/test/java/org/nuiton/csv/RowBeanEnum.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -3,8 +3,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% @@ -27,7 +25,7 @@ /** * TODO * - * @author tchemit <chemit(a)codelutin.com> + * @author Tony Chemit - chemit(a)codelutin.com * @since TODO */ public enum RowBeanEnum { Modified: trunk/src/test/java/org/nuiton/csv/RowBeanExportModel.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/RowBeanExportModel.java 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/test/java/org/nuiton/csv/RowBeanExportModel.java 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ /* * #%L * Nuiton CSV - * $Id$ - * $HeadURL$ * %% * Copyright (C) 2011 - 2012 CodeLutin * %% Modified: trunk/src/test/resources/log4j.properties =================================================================== --- trunk/src/test/resources/log4j.properties 2014-08-03 10:52:16 UTC (rev 2629) +++ trunk/src/test/resources/log4j.properties 2014-08-03 11:38:15 UTC (rev 2630) @@ -1,8 +1,6 @@ ### # #%L # Nuiton CSV -# $Id$ -# $HeadURL$ # %% # Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric # %%

1 0

r2629 - trunk/src/main/java/org/nuiton/csv
by tchemit＠users.nuiton.org 03 Aug '14

03 Aug '14

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);

1 0

r2628 - in trunk/src: main/java/org/nuiton/csv test/java/org/nuiton/csv
by tchemit＠users.nuiton.org 03 Aug '14

03 Aug '14

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();

1 0

r2627 - in trunk/src: main/java/org/nuiton/csv test/java/org/nuiton/csv
by tchemit＠users.nuiton.org 03 Aug '14

03 Aug '14

Author: tchemit Date: 2014-08-03 12:43:58 +0200 (Sun, 03 Aug 2014) New Revision: 2627 Url: http://forge.nuiton.org/projects/nuiton-csv/repository/revisions/2627 Log: fixes #3407: Export#write(OutputStream) should NOT close stream 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 09:04:40 UTC (rev 2626) +++ trunk/src/main/java/org/nuiton/csv/Export.java 2014-08-03 10:43:58 UTC (rev 2627) @@ -221,11 +221,8 @@ public void write(OutputStream outputStream, Charset charset, boolean writeHeader) throws Exception { Writer writer = new OutputStreamWriter(outputStream, charset); - try { - write(writer, writeHeader); - } finally { - writer.close(); - } + write(writer, writeHeader); + writer.flush(); } public void write(OutputStream outputStream) throws Exception { Modified: trunk/src/test/java/org/nuiton/csv/ExportTest.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/ExportTest.java 2014-08-03 09:04:40 UTC (rev 2626) +++ trunk/src/test/java/org/nuiton/csv/ExportTest.java 2014-08-03 10:43:58 UTC (rev 2627) @@ -23,6 +23,8 @@ */ package org.nuiton.csv; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -30,16 +32,23 @@ import org.junit.Test; import org.nuiton.util.DateUtil; +import java.io.File; +import java.io.FileOutputStream; import java.nio.charset.Charset; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipOutputStream; public class ExportTest { private static final Log log = LogFactory.getLog(ExportTest.class); + public static final Charset CHARSET = Charset.forName("UTF-8"); + protected Set<RowBean> oneSizedSet = new HashSet<RowBean>(); protected Set<RowBean> twoSizedSet = new HashSet<RowBean>(); @@ -51,7 +60,7 @@ protected ExportModel<RowBean> model = new RowBeanExportModel(); @Before - public void setUp() { + public void setUp() { oneSizedSet.add(new RowBean(DateUtil.createDate(1, 12, 2011), "Batman", 1, RowBeanEnum.ONE)); @@ -71,7 +80,7 @@ for (Set<RowBean> set : sets) { - String csv = Export.exportToString(model, set, Charset.forName("UTF-8")); + String csv = Export.exportToString(model, set, CHARSET); if (log.isDebugEnabled()) { log.debug("exported csv:\n" + csv); @@ -87,4 +96,44 @@ } + /** + * See https://forge.nuiton.org/issues/3407 + */ + @Test + public void testExportToOuputStream() throws Exception { + + File f = new File(FileUtils.getTempDirectory(), getClass().getName() + "-exportcsvtest.zip"); + + FileUtils.forceMkdir(f.getParentFile()); + + ZipOutputStream outputStream = new ZipOutputStream(new FileOutputStream(f)); + + for (Set<RowBean> set : sets) { + + outputStream.putNextEntry(new ZipEntry("/export" + (set.size()) + ".csv")); + Export.newExport(model, set).write(outputStream, CHARSET); + } + + outputStream.close(); + + ZipFile zipFile = new ZipFile(f); + + for (Set<RowBean> set : sets) { + + String csv = IOUtils.toString(zipFile.getInputStream(new ZipEntry("/export" + (set.size()) + ".csv"))); + + if (log.isDebugEnabled()) { + log.debug("exported csv:\n" + csv); + } + + // 1 header line + one line per RowBean instance + int expectedLineCount = 1 + set.size(); + // number of '\n' in csv + int actualLineCount = csv.split("\n").length; + Assert.assertEquals("exported CSV must have all lines", + expectedLineCount, actualLineCount); + } + + } + }

1 0

r2626 - in trunk: . src/site
by tchemit＠users.nuiton.org 03 Aug '14

03 Aug '14

Author: tchemit Date: 2014-08-03 11:04:40 +0200 (Sun, 03 Aug 2014) New Revision: 2626 Url: http://forge.nuiton.org/projects/nuiton-csv/repository/revisions/2626 Log: fixes #3398: Updates mavenpom to 5.1 and use new site layout fixes #3399: updates nuiton-utils to 3.0-rc-5 fixes #3400: updates i18n to 3.3 Modified: trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-01 08:41:18 UTC (rev 2625) +++ trunk/pom.xml 2014-08-03 09:04:40 UTC (rev 2626) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.4</version> + <version>5.1</version> </parent> <artifactId>nuiton-csv</artifactId> @@ -33,7 +33,7 @@ <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit at codelutin dot com</email> + <email>chemit(a)codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -55,8 +55,8 @@ </scm> <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${siteDeployId}</id> + <url>${siteDeployUrl}</url> </site> </distributionManagement> @@ -64,8 +64,8 @@ <projectId>nuiton-csv</projectId> - <nuitonI18nVersion>3.0</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-5</nuitonUtilsVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-08-01 08:41:18 UTC (rev 2625) +++ trunk/src/site/site_fr.xml 2014-08-03 09:04:40 UTC (rev 2626) @@ -58,7 +58,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> + img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> </poweredBy> @@ -66,11 +66,11 @@ <head> <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> </head> <links> @@ -82,6 +82,8 @@ <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" + href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur">

1 0

[ANN] - Nuiton CSV 3.0-rc-3 released
by nuiton.org Release Notification 01 Aug '14

01 Aug '14

The Nuiton CSV team is pleased to announce the nuiton-csv-3.0-rc-3 release! Simple CSV API Documentation of the project can be found here: https://doc.nuiton.org/nuiton-csv Changes ------- Changes in this version include: Fixed Bugs: o Erreur à l'import d'un csv en UTF-8 with BOM Issue: 3372. Thanks to Brendan Le Ny. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: https://forge.nuiton.org/projects/nuiton-csv/files * nuiton-csv-3.0-rc-3-deps.zip - https://forge.nuiton.org/attachments/download/1084 * nuiton-csv-3.0-rc-3-full.zip - https://forge.nuiton.org/attachments/download/1085 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton|nuiton-csv|3.0-rc-3|jar Have fun! -Nuiton CSV team

1 0

r2625 - trunk
by maven-release＠users.nuiton.org 01 Aug '14

01 Aug '14

Author: maven-release Date: 2014-08-01 10:41:18 +0200 (Fri, 01 Aug 2014) New Revision: 2625 Url: http://forge.nuiton.org/projects/nuiton-csv/repository/revisions/2625 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-01 08:41:14 UTC (rev 2624) +++ trunk/pom.xml 2014-08-01 08:41:18 UTC (rev 2625) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-csv</artifactId> - <version>3.0-rc-3</version> + <version>3.0-SNAPSHOT</version> <name>Nuiton CSV</name> <description>Simple CSV API</description> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:https://svn.nuiton.org/nuiton-csv/tags/nuiton-csv-3.0-rc-3 + scm:svn:https://svn.nuiton.org/nuiton-csv/trunk </connection> <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-csv/tags/nuiton-csv-3.0-rc-3 + scm:svn:https://svn.nuiton.org/nuiton-csv/trunk </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-csv/repository/show/tags/nuiton-cs…</url> + <url>https://forge.nuiton.org/projects/nuiton-csv/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r2624 - in tags: . nuiton-csv-3.0-rc-3
by maven-release＠users.nuiton.org 01 Aug '14

01 Aug '14

Author: maven-release Date: 2014-08-01 10:41:14 +0200 (Fri, 01 Aug 2014) New Revision: 2624 Url: http://forge.nuiton.org/projects/nuiton-csv/repository/revisions/2624 Log: [maven-release-plugin] copy for tag nuiton-csv-3.0-rc-3 Added: tags/nuiton-csv-3.0-rc-3/ Property changes on: tags/nuiton-csv-3.0-rc-3 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir .idea Added: svn:mergeinfo +

1 0