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

r2602 - trunk
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 11:52:31 +0100 (Thu, 12 Dec 2013) New Revision: 2602 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2602 Log: [maven-release-plugin] prepare release nuiton-csv-3.0-alpha-2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:50:57 UTC (rev 2601) +++ trunk/pom.xml 2013-12-12 10:52:31 UTC (rev 2602) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-csv</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-2</version> <name>Nuiton CSV</name> <description>Simple CSV API</description> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-csv/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-csv/tags/nuiton-csv-3.0-alpha-2 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-csv/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-csv/tags/nuiton-csv-3.0-alpha-2 </developerConnection> - <url>http://nuiton.org/projects/nuiton-csv/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-csv/repository/show/tags/nuiton-csv-3.0-a…</url> </scm> <distributionManagement> <site>

1 0

r2601 - in trunk: . src/site/apt
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:50:57 +0100 (Thu, 12 Dec 2013) New Revision: 2601 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2601 Log: fixes #2965 Update to Mavenpom 4.4 fixes #2966 Update to Nuiton-utils 3.0-alpha-1 Modified: trunk/pom.xml trunk/src/site/apt/versions.apt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-04 15:55:26 UTC (rev 2600) +++ trunk/pom.xml 2013-12-12 10:50:57 UTC (rev 2601) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.4-SNAPSHOT</version> + <version>4.4</version> </parent> <artifactId>nuiton-csv</artifactId> @@ -65,6 +65,7 @@ <projectId>nuiton-csv</projectId> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -84,7 +85,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.7.1</version> + <version>${nuitonUtilsVersion}</version> </dependency> <dependency> Modified: trunk/src/site/apt/versions.apt =================================================================== --- trunk/src/site/apt/versions.apt 2013-12-04 15:55:26 UTC (rev 2600) +++ trunk/src/site/apt/versions.apt 2013-12-12 10:50:57 UTC (rev 2601) @@ -2,7 +2,7 @@ ~~ #%L ~~ Nuiton Config ~~ $Id$ -~~ $HeadURL: http://svn.nuiton.org/svn/nuiton-config/trunk/src/site/apt/index.apt $ +~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2013 CodeLutin ~~ %% Property changes on: trunk/src/site/apt/versions.apt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r2600 - trunk
by athimel＠users.nuiton.org 04 Dec '13

04 Dec '13

Author: athimel Date: 2013-12-04 16:55:26 +0100 (Wed, 04 Dec 2013) New Revision: 2600 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2600 Log: Use commons-collections 4 declared in mavenpom 4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-04 15:16:56 UTC (rev 2599) +++ trunk/pom.xml 2013-12-04 15:55:26 UTC (rev 2600) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.3</version> + <version>4.4-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> @@ -112,7 +112,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.0</version> </dependency> <dependency>

1 0

r2599 - in trunk: . src/main/java/org/nuiton/csv
by echatellier＠users.nuiton.org 04 Dec '13

04 Dec '13

Author: echatellier Date: 2013-12-04 16:16:56 +0100 (Wed, 04 Dec 2013) New Revision: 2599 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2599 Log: fixes #2954: Update to commons-collections 4.0 Udate libs Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/csv/ImportRow.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-25 09:54:29 UTC (rev 2598) +++ trunk/pom.xml 2013-12-04 15:16:56 UTC (rev 2599) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.3</version> </parent> <artifactId>nuiton-csv</artifactId> @@ -84,7 +84,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.6.12</version> + <version>2.7.1</version> </dependency> <dependency> @@ -110,8 +110,9 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.0</version> </dependency> <dependency> Modified: trunk/src/main/java/org/nuiton/csv/ImportRow.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/ImportRow.java 2013-11-25 09:54:29 UTC (rev 2598) +++ trunk/src/main/java/org/nuiton/csv/ImportRow.java 2013-12-04 15:16:56 UTC (rev 2599) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Sets; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.Set;

1 0

r2598 - trunk/src/main/java/org/nuiton/csv
by kmorin＠users.nuiton.org 25 Nov '13

25 Nov '13

Author: kmorin Date: 2013-11-25 10:54:29 +0100 (Mon, 25 Nov 2013) New Revision: 2598 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2598 Log: fixes #2932 There is a semicolon in the end of each row in the exported files (not in the header) Modified: trunk/src/main/java/org/nuiton/csv/Export.java Modified: trunk/src/main/java/org/nuiton/csv/Export.java =================================================================== --- trunk/src/main/java/org/nuiton/csv/Export.java 2013-10-10 20:12:34 UTC (rev 2597) +++ trunk/src/main/java/org/nuiton/csv/Export.java 2013-11-25 09:54:29 UTC (rev 2598) @@ -197,6 +197,8 @@ protected void writeRow(Writer writer, Iterable<ExportableColumn<E, Object>> columns, E row) throws Exception { + + List<String> formattedCells = new LinkedList<String>(); for (ExportableColumn<E, Object> column : columns) { Object cell = column.getValue(row); String formattedCell = column.formatValue(cell); @@ -206,9 +208,10 @@ " returned a null value." + column.toString()); } formattedCell = StringUtil.escapeCsvValue(formattedCell, separator); - writer.write(formattedCell); - writer.write(separator); + formattedCells.add(formattedCell); } + String formattedRow = StringUtil.join(formattedCells, separator, true); + writer.write(formattedRow); writer.write('\n'); }

1 0

r2597 - trunk/src/test/java/org/nuiton/csv
by echatellier＠users.nuiton.org 10 Oct '13

10 Oct '13

Author: echatellier Date: 2013-10-10 22:12:34 +0200 (Thu, 10 Oct 2013) New Revision: 2597 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2597 Log: refs #2872: Add unit test Modified: trunk/src/test/java/org/nuiton/csv/ImportTest.java Modified: trunk/src/test/java/org/nuiton/csv/ImportTest.java =================================================================== --- trunk/src/test/java/org/nuiton/csv/ImportTest.java 2013-08-09 09:04:41 UTC (rev 2596) +++ trunk/src/test/java/org/nuiton/csv/ImportTest.java 2013-10-10 20:12:34 UTC (rev 2597) @@ -23,23 +23,28 @@ */ package org.nuiton.csv; -import org.apache.commons.lang3.time.DateUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Assert; -import org.junit.Test; -import org.nuiton.util.DateUtil; -import org.nuiton.csv.Common.BeanProperty; - import java.io.IOException; import java.io.Reader; import java.io.StringReader; +import java.nio.charset.Charset; import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; +import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; +import org.nuiton.csv.Common.BeanProperty; +import org.nuiton.csv.ext.AbstractImportModel; +import org.nuiton.util.DateUtil; + +import com.google.common.collect.Lists; + /** * Created on 28/11/11 * @@ -49,7 +54,53 @@ */ public class ImportTest { + @Test + @Ignore + public void testSimpleExportReImportWithSpecialChars() throws Exception { + // create test data + List<RowBean> rows = Lists.newArrayList(); + rows.add(new RowBean(new Date(), "Un singe en été", 24, RowBeanEnum.TWO)); + rows.add(new RowBean(new Date(), "\"Amazing\" spiderman", 42, RowBeanEnum.ZERO)); + + // export as string + String csv = Export.exportToString(new ExportModel<RowBean>() { + @Override + public char getSeparator() { + return ';'; + } + @Override + public Iterable<ExportableColumn<RowBean, Object>> getColumnsForExport() { + ModelBuilder<RowBean> modelBuilder = new ModelBuilder<RowBean>(); + modelBuilder.newColumnForExport("DATE", "date", Common.DAY); + modelBuilder.newColumnForExport("TITLE", "title"); + modelBuilder.newColumnForExport("NUMBER", "number", Common.INTEGER); + modelBuilder.newColumnForExport("ROWBEANENUM", "rowBeanEnum", Common.newEnumByNameParserFormatter(RowBeanEnum.class)); + return (Iterable) modelBuilder.getColumnsForExport(); + } + }, rows, Charset.forName("UTF-8")); + System.out.println(csv); + + // import as string + rows = importContent(new AbstractImportModel<RowBean>(';') { + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + super.pushCsvHeaderNames(headerNames); + newMandatoryColumn("DATE", "date", Common.DAY); + newMandatoryColumn("TITLE", "title"); + newMandatoryColumn("NUMBER", "number", Common.INTEGER); + newMandatoryColumn("ROWBEANENUM", "rowBeanEnum", Common.newEnumByNameParserFormatter(RowBeanEnum.class)); + } + @Override + public RowBean newEmptyInstance() { + return new RowBean(); + } + }, csv); + Assert.assertEquals(2, rows.size()); + Assert.assertEquals("Un singe en été", rows.get(0).getTitle()); + Assert.assertEquals("\"Amazing\" spiderman", rows.get(1).getTitle()); + } + @Test public void testSimpleImportWithNoData() throws Exception { String content = "DATE;NUMBER;TITLE;ROWBEANENUM";

1 0

r2596 - trunk
by tchemit＠users.nuiton.org 09 Aug '13

09 Aug '13

Author: tchemit Date: 2013-08-09 11:04:41 +0200 (Fri, 09 Aug 2013) New Revision: 2596 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2596 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:45:01 UTC (rev 2595) +++ trunk/pom.xml 2013-08-09 09:04:41 UTC (rev 2596) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.13</version> + <version>4.0</version> </parent> <artifactId>nuiton-csv</artifactId> @@ -75,6 +75,8 @@  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> +  + <skipPostRelease>false</skipPostRelease> </properties> <dependencies>

1 0

r2595 - trunk
by maven-release＠users.nuiton.org 23 Jul '13

23 Jul '13

Author: maven-release Date: 2013-07-23 17:45:01 +0200 (Tue, 23 Jul 2013) New Revision: 2595 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2595 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:44:58 UTC (rev 2594) +++ trunk/pom.xml 2013-07-23 15:45:01 UTC (rev 2595) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-csv</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-SNAPSHOT</version> <name>Nuiton CSV</name> <description>Simple CSV API</description> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-csv/tags/nuiton-csv-3.0-alpha-1 + scm:svn:http://svn.nuiton.org/svn/nuiton-csv/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-csv/tags/nuiton-csv-3.0-alpha-1 + scm:svn:http://svn.nuiton.org/svn/nuiton-csv/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-csv/repository/show/tags/nuiton-csv-3.0-a…</url> + <url>http://nuiton.org/projects/nuiton-csv/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r2594 - in tags: . nuiton-csv-3.0-alpha-1
by maven-release＠users.nuiton.org 23 Jul '13

23 Jul '13

Author: maven-release Date: 2013-07-23 17:44:58 +0200 (Tue, 23 Jul 2013) New Revision: 2594 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2594 Log: [maven-release-plugin] copy for tag nuiton-csv-3.0-alpha-1 Added: tags/nuiton-csv-3.0-alpha-1/ Property changes on: tags/nuiton-csv-3.0-alpha-1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir .idea Added: svn:mergeinfo +

1 0

r2593 - trunk
by maven-release＠users.nuiton.org 23 Jul '13

23 Jul '13

Author: maven-release Date: 2013-07-23 17:44:54 +0200 (Tue, 23 Jul 2013) New Revision: 2593 Url: http://nuiton.org/projects/nuiton-csv/repository/revisions/2593 Log: [maven-release-plugin] prepare release nuiton-csv-3.0-alpha-1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:41:38 UTC (rev 2592) +++ trunk/pom.xml 2013-07-23 15:44:54 UTC (rev 2593) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-csv</artifactId> - <version>3.0-alpha-1-SNAPSHOT</version> + <version>3.0-alpha-1</version> <name>Nuiton CSV</name> <description>Simple CSV API</description> @@ -46,12 +46,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-csv/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-csv/tags/nuiton-csv-3.0-alpha-1 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-csv/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-csv/tags/nuiton-csv-3.0-alpha-1 </developerConnection> - <url>http://nuiton.org/projects/nuiton-csv/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-csv/repository/show/tags/nuiton-csv-3.0-a…</url> </scm> <distributionManagement> <site>

1 0