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

r2539 - trunk/nuiton-updater
by maven-release＠users.nuiton.org March 18, 2013

March 18, 2013

Author: maven-release Date: 2013-03-18 16:08:03 +0100 (Mon, 18 Mar 2013) New Revision: 2539 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2539 Log: [maven-release-plugin] prepare release nuiton-utils-2.6.11.1 Modified: trunk/nuiton-updater/pom.xml Modified: trunk/nuiton-updater/pom.xml =================================================================== --- trunk/nuiton-updater/pom.xml 2013-03-18 14:13:28 UTC (rev 2538) +++ trunk/nuiton-updater/pom.xml 2013-03-18 15:08:03 UTC (rev 2539) @@ -35,7 +35,7 @@ </parent> <artifactId>nuiton-updater</artifactId> - <version>2.6.11.1-SNAPSHOT</version> + <version>2.6.11.1</version> <dependencies> @@ -190,4 +190,10 @@ </profiles> + + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.11.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.11.1</developerConnection> + <url>http://nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-utils-2…</url> + </scm> </project>

1 0

r2538 - trunk/nuiton-updater
by tchemit＠users.nuiton.org March 18, 2013

March 18, 2013

Author: tchemit Date: 2013-03-18 15:13:28 +0100 (Mon, 18 Mar 2013) New Revision: 2538 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2538 Log: prepare quick fix release of nuiton-updater Modified: trunk/nuiton-updater/pom.xml Modified: trunk/nuiton-updater/pom.xml =================================================================== --- trunk/nuiton-updater/pom.xml 2013-03-18 14:09:08 UTC (rev 2537) +++ trunk/nuiton-updater/pom.xml 2013-03-18 14:13:28 UTC (rev 2538) @@ -31,23 +31,24 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.12-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-updater</artifactId> + <version>2.6.11.1-SNAPSHOT</version> <dependencies> <dependency> <groupId>${project.groupId}</groupId> <artifactId>nuiton-utils</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>nuiton-config</artifactId> - <version>${project.version}</version> + <version>${project.parent.version}</version> </dependency> <dependency>

1 0

r2537 - trunk/nuiton-updater/src/main/java/org/nuiton/util/updater
by tchemit＠users.nuiton.org March 18, 2013

March 18, 2013

Author: tchemit Date: 2013-03-18 15:09:08 +0100 (Mon, 18 Mar 2013) New Revision: 2537 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2537 Log: fixes Anomalie #2612: Updater does not work under windows os Modified: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java Modified: trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java =================================================================== --- trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java 2013-03-18 06:30:10 UTC (rev 2536) +++ trunk/nuiton-updater/src/main/java/org/nuiton/util/updater/ApplicationUpdater.java 2013-03-18 14:09:08 UTC (rev 2537) @@ -371,6 +371,7 @@ * <p/> * Si l'archive a plus d'un repertoire root, une exception est levee * + * @param vfsConfig configuration of vsf ( * @param info * @param srcPath source path de la forme vfs2 ex:"zip:http://www.nuiton.org/attachments/download/830/nuiton-utils-2.6.5-deps.…" * @throws FileSystemException @@ -378,7 +379,6 @@ protected File downloadUpdate(FileSystemOptions vfsConfig, ApplicationInfo info, String srcPath) throws IOException { - File result = new File(FileUtils.getTempDirectory(), srcPath); FileSystemManager fsManager = VFS.getManager(); FileObject source = fsManager.resolveFile(srcPath, vfsConfig); @@ -386,6 +386,11 @@ if (!source.exists()) { throw new UpdateNotFoundException(info); } + + File result = new File(FileUtils.getTempDirectory(), + source.getName().getBaseName() + + '_' + System.nanoTime()); + FileObject target = fsManager.toFileObject(result); InputStream input = source.getContent().getInputStream(); try {

1 0

r2536 - in trunk: . nuiton-config nuiton-csv nuiton-updater nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org March 18, 2013

March 18, 2013

Author: maven-release Date: 2013-03-18 07:30:10 +0100 (Mon, 18 Mar 2013) New Revision: 2536 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2536 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-config/pom.xml trunk/nuiton-csv/pom.xml trunk/nuiton-updater/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-config/pom.xml =================================================================== --- trunk/nuiton-config/pom.xml 2013-03-18 06:30:08 UTC (rev 2535) +++ trunk/nuiton-config/pom.xml 2013-03-18 06:30:10 UTC (rev 2536) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <artifactId>nuiton-config</artifactId> Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2013-03-18 06:30:08 UTC (rev 2535) +++ trunk/nuiton-csv/pom.xml 2013-03-18 06:30:10 UTC (rev 2536) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-updater/pom.xml =================================================================== --- trunk/nuiton-updater/pom.xml 2013-03-18 06:30:08 UTC (rev 2535) +++ trunk/nuiton-updater/pom.xml 2013-03-18 06:30:10 UTC (rev 2536) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <artifactId>nuiton-updater</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-03-18 06:30:08 UTC (rev 2535) +++ trunk/nuiton-utils/pom.xml 2013-03-18 06:30:10 UTC (rev 2536) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-03-18 06:30:08 UTC (rev 2535) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-03-18 06:30:10 UTC (rev 2536) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2013-03-18 06:30:08 UTC (rev 2535) +++ trunk/nuiton-validator/pom.xml 2013-03-18 06:30:10 UTC (rev 2536) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 06:30:08 UTC (rev 2535) +++ trunk/pom.xml 2013-03-18 06:30:10 UTC (rev 2536) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11</version> + <version>2.6.12-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -333,12 +333,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.11 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.11 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-utils-2…</url> + <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2535 - in tags: . nuiton-utils-2.6.11
by maven-release＠users.nuiton.org March 18, 2013

March 18, 2013

Author: maven-release Date: 2013-03-18 07:30:08 +0100 (Mon, 18 Mar 2013) New Revision: 2535 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2535 Log: [maven-release-plugin] copy for tag nuiton-utils-2.6.11 Added: tags/nuiton-utils-2.6.11/ Property changes on: tags/nuiton-utils-2.6.11 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir .idea Added: svn:mergeinfo +

1 0

r2534 - in trunk: . nuiton-config nuiton-csv nuiton-updater nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org March 18, 2013

March 18, 2013

Author: maven-release Date: 2013-03-18 07:30:06 +0100 (Mon, 18 Mar 2013) New Revision: 2534 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2534 Log: [maven-release-plugin] prepare release nuiton-utils-2.6.11 Modified: trunk/nuiton-config/pom.xml trunk/nuiton-csv/pom.xml trunk/nuiton-updater/pom.xml trunk/nuiton-utils-maven-report-plugin/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-config/pom.xml =================================================================== --- trunk/nuiton-config/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-config/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-config</artifactId> Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-csv/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-updater/pom.xml =================================================================== --- trunk/nuiton-updater/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-updater/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-updater</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-utils/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/nuiton-validator/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-15 13:43:12 UTC (rev 2533) +++ trunk/pom.xml 2013-03-18 06:30:06 UTC (rev 2534) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6.11-SNAPSHOT</version> + <version>2.6.11</version> <modules> <module>nuiton-utils</module> @@ -333,12 +333,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.11 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.6.11 </developerConnection> - <url>http://nuiton.org/projects/nuiton-utils/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-utils/repository/show/tags/nuiton-utils-2…</url> </scm> <distributionManagement>

1 0

r2533 - in trunk/nuiton-csv/src: main/java/org/nuiton/util/csv main/java/org/nuiton/util/csv/ext test/java/org/nuiton/util/csv
by kmorin＠users.nuiton.org March 15, 2013

March 15, 2013

Author: kmorin Date: 2013-03-15 14:43:12 +0100 (Fri, 15 Mar 2013) New Revision: 2533 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2533 Log: fixes #2601 add a method to create a new optional column Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Column.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Column.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Column.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Column.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -44,20 +44,23 @@ valueFormatter, null, null, - ignored + ignored, + !ignored ); } public static <E, T> Column<E, T> newImportableColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> valueSetter, - boolean ignored) { + boolean ignored, + boolean mandatory) { return new Column<E, T>(headerName, null, null, valueParser, valueSetter, - ignored + ignored, + mandatory ); } @@ -72,7 +75,8 @@ valueFormatter, valueParser, valueSetter, - ignored + ignored, + !ignored ); } @@ -108,14 +112,15 @@ ValueFormatter<T> valueFormatter, ValueParser<T> valueParser, ValueSetter<E, T> valueSetter, - boolean ignored) { + boolean ignored, + boolean mandatory) { this.headerName = headerName; this.valueGetter = valueGetter; this.valueFormatter = valueFormatter; this.valueSetter = valueSetter; this.valueParser = valueParser; this.ignored = ignored; - mandatory = !ignored; + this.mandatory = mandatory; } @Override Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -43,7 +43,7 @@ new LinkedList<ExportableColumn<E, ?>>(); public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { - Column<E, T> newColumn = Column.newImportableColumn(headerName, null, null, true); + Column<E, T> newColumn = Column.newImportableColumn(headerName, null, null, true, false); columnsForImport.add(newColumn); return newColumn; } @@ -61,11 +61,29 @@ } public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> valueSetter) { - Column<E, T> newColumn = Column.newImportableColumn(headerName, valueParser, valueSetter, false); + Column<E, T> newColumn = Column.newImportableColumn(headerName, valueParser, valueSetter, false, true); columnsForImport.add(newColumn); return newColumn; } + public ImportableColumn<E, String> newOptionalColumn(String headerName, String propertyName) { + return newOptionalColumn(headerName, propertyName, Common.STRING); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, String propertyName, ValueParser<T> valueParser) { + return newOptionalColumn(headerName, valueParser, new Common.BeanProperty<E, T>(propertyName)); + } + + public ImportableColumn<E, String> newOptionalColumn(String headerName, ValueSetter<E, String> valueSetter) { + return newOptionalColumn(headerName, Common.STRING, valueSetter); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> valueSetter) { + Column<E, T> newColumn = Column.newImportableColumn(headerName, valueParser, valueSetter, false, false); + columnsForImport.add(newColumn); + return newColumn; + } + public ExportableColumn<E, String> newColumnForExport(String headerName, String propertyName) { return newColumnForExport(headerName, propertyName, Common.STRING); } Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/MyModelBuilder.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -64,7 +64,7 @@ } public ChooseExportStrategyForColumnStep<E> ignoreAtImport() { - Column<E, Object> importableColumn = Column.newImportableColumn(columnName, null, null, true); + Column<E, Object> importableColumn = Column.newImportableColumn(columnName, null, null, true, false); return new ChooseExportStrategyForColumnStep(columnName, importableColumn); } @@ -81,7 +81,7 @@ } public <T> ChooseExportStrategyForColumnStep<E> mandatoryAtImport(ValueParser<T> valueParser, ValueSetter<E, T> valueSetter) { - Column<E, T> importableColumn = Column.newImportableColumn(columnName, valueParser, valueSetter, false); + Column<E, T> importableColumn = Column.newImportableColumn(columnName, valueParser, valueSetter, false, true); return new ChooseExportStrategyForColumnStep(columnName, importableColumn); } @@ -98,8 +98,7 @@ } public <T> ChooseExportStrategyForColumnStep<E> optionalAtImport(ValueParser<T> valueParser, ValueSetter<E, T> valueSetter) { - // FIXME 20111225 ici comme la colonne est optionnel elle est simplement ignorée, lacune - Column<E, T> importableColumn = Column.newImportableColumn(columnName, valueParser, valueSetter, false); + Column<E, T> importableColumn = Column.newImportableColumn(columnName, valueParser, valueSetter, false, true); return new ChooseExportStrategyForColumnStep(columnName, importableColumn); } Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -103,6 +103,30 @@ return modelBuilder.newMandatoryColumn(headerName, valueParser, etValueSetter); } + public ImportableColumn<E, String> newOptionalColumn(String headerName) { + return modelBuilder.newOptionalColumn(headerName, headerName); + } + + public ImportableColumn<E, String> newOptionalColumn(String headerName, String propertyName) { + return modelBuilder.newOptionalColumn(headerName, propertyName); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, ValueParser<T> valueParser) { + return modelBuilder.newOptionalColumn(headerName, headerName, valueParser); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, String propertyName, ValueParser<T> valueParser) { + return modelBuilder.newOptionalColumn(headerName, propertyName, valueParser); + } + + public ImportableColumn<E, String> newOptionalColumn(String headerName, ValueSetter<E, String> eStringValueSetter) { + return modelBuilder.newOptionalColumn(headerName, eStringValueSetter); + } + + public <T> ImportableColumn<E, T> newOptionalColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> etValueSetter) { + return modelBuilder.newOptionalColumn(headerName, valueParser, etValueSetter); + } + public ExportableColumn<E, String> newColumnForExport(String headerName) { return modelBuilder.newColumnForExport(headerName, headerName); } Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java 2013-03-15 12:43:07 UTC (rev 2532) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java 2013-03-15 13:43:12 UTC (rev 2533) @@ -166,7 +166,8 @@ "TITLE", Common.STRING, withBeanSetter("title", String.class), - false + false, + true ); } @@ -175,7 +176,8 @@ "DATE", withDateParser(), withBeanSetter("date", Date.class), - false + false, + true ); } @@ -184,7 +186,8 @@ "NUMBER", Common.INTEGER, withBeanSetter("number", Integer.class), - false + false, + true ); } @@ -193,7 +196,8 @@ "ROWBEANENUM", Common.newEnumByOrdinalParserFormatter(RowBeanEnum.class), withBeanSetter("rowBeanEnum", RowBeanEnum.class), - false + false, + true ); } @SuppressWarnings({"UnusedParameters"})

1 0

r2532 - trunk/nuiton-config/src/main/java/org/nuiton/util/config
by tchemit＠users.nuiton.org March 15, 2013

March 15, 2013

Author: tchemit Date: 2013-03-15 13:43:07 +0100 (Fri, 15 Mar 2013) New Revision: 2532 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2532 Log: fixes #2600: [ApplicationConfig] Add more methods on ApplicationConfigHelper Modified: trunk/nuiton-config/src/main/java/org/nuiton/util/config/ApplicationConfigHelper.java Modified: trunk/nuiton-config/src/main/java/org/nuiton/util/config/ApplicationConfigHelper.java =================================================================== --- trunk/nuiton-config/src/main/java/org/nuiton/util/config/ApplicationConfigHelper.java 2013-03-13 13:48:55 UTC (rev 2531) +++ trunk/nuiton-config/src/main/java/org/nuiton/util/config/ApplicationConfigHelper.java 2013-03-15 12:43:07 UTC (rev 2532) @@ -191,16 +191,53 @@ * @return the set of options key not to store in the config file * @see ConfigOptionDef#isFinal() * @see ConfigOptionDef#isTransient() - * @since 2.6.7 + * @since 2.6.11 */ public static Set<String> getTransientOrFinalOptionKey(Set<ApplicationConfigProvider> providers) { Set<String> result = new HashSet<String>(); - for (ConfigOptionDef def : getTransientOptions(providers)) { - result.add(def.getKey()); + result.addAll(getTransientOptionKeys(providers)); + result.addAll(getFinalOptionKeys(providers)); + return result; + } + + /** + * Gets all transient options keys from the given providers. + * + * @param providers providers to inspect + * @return the set of all options key that are transient + * @see ConfigOptionDef#isTransient() + * @since 2.6.11 + */ + public static Set<String> getTransientOptionKeys(Set<ApplicationConfigProvider> providers) { + Set<String> result = new HashSet<String>(); + for (ApplicationConfigProvider provider : providers) { + for (ConfigOptionDef def : provider.getOptions()) { + if (def.isTransient()) { + result.add(def.getKey()); + } + } } - for (ConfigOptionDef def : getFinalOptions(providers)) { - result.add(def.getKey()); + return result; + } + + /** + * Gets all final options keys from the given providers. + * + * @param providers providers to inspect + * @return the set of all options keys that are final + * @see ConfigOptionDef#isTransient() + * @since 2.6.7 + */ + public static Set<String> getFinalOptionKeys(Set<ApplicationConfigProvider> providers) { + Set<String> result = new HashSet<String>(); + for (ApplicationConfigProvider provider : providers) { + for (ConfigOptionDef def : provider.getOptions()) { + if (def.isFinal()) { + result.add(def.getKey()); + } + } } return result; } + }

1 0

r2531 - trunk/nuiton-utils/src/test/java/org/nuiton/util/beans
by bleny＠users.nuiton.org March 13, 2013

March 13, 2013

Author: bleny Date: 2013-03-13 14:48:55 +0100 (Wed, 13 Mar 2013) New Revision: 2531 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2531 Log: refs #2587 fix implementation of IS_WRITE_DESCRIPTOR predicate in BeanUtil and fix tests Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java 2013-03-13 13:40:33 UTC (rev 2530) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanUtilTest.java 2013-03-13 13:48:55 UTC (rev 2531) @@ -123,6 +123,7 @@ assertFoundDescriptors(BeanA.class, BeanUtil.IS_WRITE_DESCRIPTOR, + BeanA.PROPERTY_AA, BeanA.PROPERTY_A, BeanA.PROPERTY_B, BeanA.PROPERTY_C, @@ -132,13 +133,13 @@ assertFoundDescriptors(BeanB.class, BeanUtil.IS_WRITE_DESCRIPTOR, + BeanA.PROPERTY_AA, BeanA.PROPERTY_A, BeanA.PROPERTY_B, BeanA.PROPERTY_C, BeanA.PROPERTY_D, BeanA.PROPERTY_E, BeanA.PROPERTY_F, - BeanB.PROPERTY_BB, BeanB.PROPERTY_A2, BeanB.PROPERTY_B2, BeanB.PROPERTY_C2,

1 0

r2530 - trunk/nuiton-utils/src/main/java/org/nuiton/util/beans
by bleny＠users.nuiton.org March 13, 2013

March 13, 2013

Author: bleny Date: 2013-03-13 14:40:33 +0100 (Wed, 13 Mar 2013) New Revision: 2530 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2530 Log: refs #2587 fix implementation of IS_WRITE_DESCRIPTOR predicate in BeanUtil Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java 2013-03-13 13:39:11 UTC (rev 2529) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanUtil.java 2013-03-13 13:40:33 UTC (rev 2530) @@ -76,7 +76,7 @@ public static final Predicate<PropertyDescriptor> IS_WRITE_DESCRIPTOR = new Predicate<PropertyDescriptor>() { @Override public boolean apply(PropertyDescriptor input) { - return input.getReadMethod() != null; + return input.getWriteMethod() != null; } };

1 0