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

r2405 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-utils-maven-report-plugin nuiton-validator
by maven-release＠users.nuiton.org 23 Aug '12

23 Aug '12

Author: maven-release Date: 2012-08-23 09:11:21 +0200 (Thu, 23 Aug 2012) New Revision: 2405 Url: http://nuiton.org/repositories/revision/nuiton-utils/2405 Log: [maven-release-plugin] prepare release nuiton-utils-2.6 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/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-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-08-23 06:58:21 UTC (rev 2404) +++ trunk/nuiton-csv/pom.xml 2012-08-23 07:11:21 UTC (rev 2405) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-08-23 06:58:21 UTC (rev 2404) +++ trunk/nuiton-profiling/pom.xml 2012-08-23 07:11:21 UTC (rev 2405) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-08-23 06:58:21 UTC (rev 2404) +++ trunk/nuiton-utils/pom.xml 2012-08-23 07:11:21 UTC (rev 2405) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-utils-maven-report-plugin/pom.xml =================================================================== --- trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-08-23 06:58:21 UTC (rev 2404) +++ trunk/nuiton-utils-maven-report-plugin/pom.xml 2012-08-23 07:11:21 UTC (rev 2405) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <artifactId>nuiton-utils-maven-report-plugin</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-08-23 06:58:21 UTC (rev 2404) +++ trunk/nuiton-validator/pom.xml 2012-08-23 07:11:21 UTC (rev 2405) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-23 06:58:21 UTC (rev 2404) +++ trunk/pom.xml 2012-08-23 07:11:21 UTC (rev 2405) @@ -31,7 +31,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.6</version> <modules> <module>nuiton-utils</module> @@ -317,12 +317,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 </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 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.6</url> </scm> <distributionManagement>

1 0

r2404 - trunk/nuiton-csv/src/test/java/org/nuiton/util/csv
by tchemit＠users.nuiton.org 23 Aug '12

23 Aug '12

Author: tchemit Date: 2012-08-23 08:58:21 +0200 (Thu, 23 Aug 2012) New Revision: 2404 Url: http://nuiton.org/repositories/revision/nuiton-utils/2404 Log: add missing svn proeprties and license header Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java 2012-08-20 10:44:03 UTC (rev 2403) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java 2012-08-23 06:58:21 UTC (rev 2404) @@ -1,5 +1,29 @@ package org.nuiton.util.csv; +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ + /** * TODO * Property changes on: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r2403 - trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator
by tchemit＠users.nuiton.org 20 Aug '12

20 Aug '12

Author: tchemit Date: 2012-08-20 12:44:03 +0200 (Mon, 20 Aug 2012) New Revision: 2403 Url: http://nuiton.org/repositories/revision/nuiton-utils/2403 Log: fixes #2277: Improve decorator api (make public registerXXX methods) Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorMulti18nProvider.java trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorProvider.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorMulti18nProvider.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorMulti18nProvider.java 2012-08-19 11:07:20 UTC (rev 2402) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorMulti18nProvider.java 2012-08-20 10:44:03 UTC (rev 2403) @@ -129,115 +129,58 @@ return d == null ? null : d.getDecorator(); } - public void clear() { - if (decoratorContexts != null) { - decoratorContexts.clear(); - } - } - - protected Map<Locale, Collection<DecoratorContext<?>>> getDecoratorContexts() { - if (decoratorContexts == null) { - decoratorContexts = new HashMap<Locale, Collection<DecoratorContext<?>>>(); - } - return decoratorContexts; - } - - protected Collection<DecoratorContext<?>> getDecoratorContexts(Locale locale, - boolean doLoad) { - - Collection<DecoratorContext<?>> decoratorContexts = - getDecoratorContexts().get(locale); - - if (decoratorContexts == null) { - decoratorContexts = new ArrayList<DecoratorContext<?>>(); - getDecoratorContexts().put(locale, decoratorContexts); - if (doLoad) { - loadDecorators(locale); - } - } - return decoratorContexts; - } - - @SuppressWarnings({"unchecked"}) - protected <T> DecoratorContext<T> getDecoratorContext(Locale locale, - Class<T> type, - String context, - boolean doLoad) { - DecoratorContext<T> result = null; - - Collection<DecoratorContext<?>> decoratorContexts = - getDecoratorContexts(locale, doLoad); - - if (decoratorContexts != null) { - for (DecoratorContext<?> d : decoratorContexts) { - if (type == null) { - if (d.accept(context)) { - result = (DecoratorContext<T>) d; - break; - } - continue; - } - if (d.accept(type, context)) { - result = (DecoratorContext<T>) d; - break; - } - } - } - return result; - } - - protected void registerPropertyDecorator(Locale locale, - Class<?> klass, - String expression) { + public void registerPropertyDecorator(Locale locale, + Class<?> klass, + String expression) { registerPropertyDecorator(locale, klass, null, expression); } - protected void registerJXPathDecorator(Locale locale, - Class<?> klass, String expression) { + public void registerJXPathDecorator(Locale locale, + Class<?> klass, String expression) { registerJXPathDecorator(locale, klass, null, expression); } - protected void registerMultiJXPathDecorator(Locale locale, - Class<?> klass, - String expression, - String separator, - String separatorReplacement) { + public void registerMultiJXPathDecorator(Locale locale, + Class<?> klass, + String expression, + String separator, + String separatorReplacement) { registerMultiJXPathDecorator(locale, klass, null, expression, separator, separatorReplacement); } - protected void registerPropertyDecorator(Locale locale, - Class<?> klass, - String name, - String expression) { + public void registerPropertyDecorator(Locale locale, + Class<?> klass, + String name, + String expression) { Decorator<?> decorator = DecoratorUtil.newPropertyDecorator(klass, expression); registerDecorator(locale, name, decorator); } - protected void registerJXPathDecorator(Locale locale, - Class<?> klass, - String name, - String expression) { + public void registerJXPathDecorator(Locale locale, + Class<?> klass, + String name, + String expression) { Decorator<?> decorator = DecoratorUtil.newJXPathDecorator(klass, expression); registerDecorator(locale, name, decorator); } - protected void registerMultiJXPathDecorator(Locale locale, - Class<?> klass, - String name, - String expression, - String separator, - String separatorReplacement) { + public void registerMultiJXPathDecorator(Locale locale, + Class<?> klass, + String name, + String expression, + String separator, + String separatorReplacement) { Decorator<?> decorator = DecoratorUtil.newMultiJXPathDecorator( klass, expression, separator, separatorReplacement ); registerDecorator(locale, name, decorator); } - protected void registerDecorator(Locale locale, - Decorator<?> decorator) { + public void registerDecorator(Locale locale, + Decorator<?> decorator) { registerDecorator(locale, null, decorator); } @@ -249,9 +192,9 @@ * @param context the name decorator * @param decorator the decorator to register */ - protected <T> void registerDecorator(Locale locale, - String context, - Decorator<T> decorator) { + public <T> void registerDecorator(Locale locale, + String context, + Decorator<T> decorator) { // obtain the decorator context DecoratorContext<?> result = @@ -275,6 +218,63 @@ getDecoratorContexts(locale, false).add(decoratorContext); } + public void clear() { + if (decoratorContexts != null) { + decoratorContexts.clear(); + } + } + + protected Map<Locale, Collection<DecoratorContext<?>>> getDecoratorContexts() { + if (decoratorContexts == null) { + decoratorContexts = new HashMap<Locale, Collection<DecoratorContext<?>>>(); + } + return decoratorContexts; + } + + protected Collection<DecoratorContext<?>> getDecoratorContexts(Locale locale, + boolean doLoad) { + + Collection<DecoratorContext<?>> decoratorContexts = + getDecoratorContexts().get(locale); + + if (decoratorContexts == null) { + decoratorContexts = new ArrayList<DecoratorContext<?>>(); + getDecoratorContexts().put(locale, decoratorContexts); + if (doLoad) { + loadDecorators(locale); + } + } + return decoratorContexts; + } + + @SuppressWarnings({"unchecked"}) + protected <T> DecoratorContext<T> getDecoratorContext(Locale locale, + Class<T> type, + String context, + boolean doLoad) { + DecoratorContext<T> result = null; + + Collection<DecoratorContext<?>> decoratorContexts = + getDecoratorContexts(locale, doLoad); + + if (decoratorContexts != null) { + for (DecoratorContext<?> d : decoratorContexts) { + if (type == null) { + if (d.accept(context)) { + result = (DecoratorContext<T>) d; + break; + } + continue; + } + if (d.accept(type, context)) { + result = (DecoratorContext<T>) d; + break; + } + } + } + return result; + } + public static class DecoratorContext<T> { /** the context name of the decorator */ Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorProvider.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorProvider.java 2012-08-19 11:07:20 UTC (rev 2402) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/decorator/DecoratorProvider.java 2012-08-20 10:44:03 UTC (rev 2403) @@ -113,22 +113,16 @@ loadDecorators(); } - public void clear() { - if (decorators != null) { - decorators.clear(); - } - } - - protected void registerPropertyDecorator(Class<?> klass, + public void registerPropertyDecorator(Class<?> klass, String expression) { registerPropertyDecorator(klass, null, expression); } - protected void registerJXPathDecorator(Class<?> klass, String expression) { + public void registerJXPathDecorator(Class<?> klass, String expression) { registerJXPathDecorator(klass, null, expression); } - protected void registerMultiJXPathDecorator(Class<?> klass, + public void registerMultiJXPathDecorator(Class<?> klass, String expression, String separator, String separatorReplacement) { @@ -136,7 +130,7 @@ separatorReplacement); } - protected void registerPropertyDecorator(Class<?> klass, + public void registerPropertyDecorator(Class<?> klass, String name, String expression) { Decorator<?> decorator = @@ -144,7 +138,7 @@ registerDecorator(name, decorator); } - protected void registerJXPathDecorator(Class<?> klass, + public void registerJXPathDecorator(Class<?> klass, String name, String expression) { Decorator<?> decorator = @@ -152,7 +146,7 @@ registerDecorator(name, decorator); } - protected void registerMultiJXPathDecorator(Class<?> klass, + public void registerMultiJXPathDecorator(Class<?> klass, String name, String expression, String separator, @@ -163,7 +157,7 @@ registerDecorator(name, decorator); } - protected void registerDecorator(Decorator<?> decorator) { + public void registerDecorator(Decorator<?> decorator) { registerDecorator(null, decorator); } @@ -174,7 +168,7 @@ * @param context the name decorator * @param decorator the decorator to register */ - protected <T> void registerDecorator(String context, + public <T> void registerDecorator(String context, Decorator<T> decorator) { // obtain the decorator context @@ -195,6 +189,12 @@ getDecorators().add(decoratorContext); } + public void clear() { + if (decorators != null) { + decorators.clear(); + } + } + protected List<DecoratorContext<?>> getDecorators() { if (decorators == null) { decorators = new ArrayList<DecoratorContext<?>>();

1 0

r2402 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 19 Aug '12

19 Aug '12

Author: tchemit Date: 2012-08-19 13:07:20 +0200 (Sun, 19 Aug 2012) New Revision: 2402 Url: http://nuiton.org/repositories/revision/nuiton-utils/2402 Log: refs #2275: Deprecate some codes Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileCompletion.java trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java trunk/nuiton-utils/src/main/java/org/nuiton/util/Transformer.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileCompletion.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/FileCompletion.java 2012-08-17 13:50:06 UTC (rev 2401) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/FileCompletion.java 2012-08-19 11:07:20 UTC (rev 2402) @@ -79,7 +79,9 @@ * </p> * * @author Letellier Sylvain + * @deprecated since 2.6.12, is this very useful at the end ? don't thing so :( */ +@Deprecated public class FileCompletion { private boolean exit; Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java 2012-08-17 13:50:06 UTC (rev 2401) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java 2012-08-19 11:07:20 UTC (rev 2402) @@ -520,7 +520,9 @@ * * @param o Object to transform * @return the same object + * @deprecated since 2.6 (since java 5 boxing-unboxing does it for you) */ + @Deprecated public static Object toObject(Object o) { return o; } @@ -532,7 +534,9 @@ * * @param c the char to transform * @return the Charactere object corresponding + * @deprecated since 2.6 (since java 5 boxing-unboxing does it for you) */ + @Deprecated public static Object toObject(char c) { return new Character(c); } @@ -544,7 +548,9 @@ * * @param b the byte to transform * @return the byte object corresponding + * @deprecated since 2.6 (since java 5 boxing-unboxing does it for you) */ + @Deprecated public static Object toObject(byte b) { return new Byte(b); } @@ -556,7 +562,9 @@ * * @param s the short to transform * @return the Short object corresponding + * @deprecated since 2.6 (since java 5 boxing-unboxing does it for you) */ + @Deprecated public static Object toObject(short s) { return new Short(s); } @@ -568,7 +576,9 @@ * * @param i the int to transform * @return the Integer Object corresponding + * @deprecated since 2.6 (since java 5 boxing-unboxing does it for you) */ + @Deprecated public static Object toObject(int i) { return new Integer(i); } @@ -580,7 +590,9 @@ * * @param l the long to transform * @return the Long Object corresponding + * @deprecated since 2.6 (since java 5 boxing-unboxing does it for you) */ + @Deprecated public static Object toObject(long l) { return new Long(l); } @@ -592,7 +604,9 @@ * * @param f the float to transform * @return the Float Object corresponding + * @deprecated since 2.6 (since java 5 boxing-unboxing does it for you) */ + @Deprecated public static Object toObject(float f) { return new Float(f); } @@ -604,7 +618,9 @@ * * @param d the double to transform * @return the Double object corresponding + * @deprecated since 2.6 (since java 5 boxing-unboxing does it for you) */ + @Deprecated public static Object toObject(double d) { return new Double(d); } @@ -616,7 +632,9 @@ * * @param b the boolean to transform * @return the Boolean object corresponding + * @deprecated since 2.6 (since java 5 boxing-unboxing does it for you) */ + @Deprecated public static Object toObject(boolean b) { return b ? Boolean.TRUE : Boolean.FALSE; } @@ -627,8 +645,11 @@ * * @param type the type to test * @return the {@code null} value or default value for primitive types + * @see com.google.common.base.Defaults * @since 1.1.5 + * @deprecated since 2.6 (there is some other library which does it */ + @Deprecated public static Object getNullValue(Class<?> type) { if (type == null) { throw new NullPointerException("parameter 'type' can not be null"); @@ -749,7 +770,10 @@ * @param clazz la classe dont on souhaite le type primitf * @return le type primitif associé a la classe en paramètre, ou null s'il * n'y a pas de type primitif associé. + * @see com.google.common.primitives.Primitives + * @deprecated since 2.6 there is other libraty which does it */ + @Deprecated public static Class<?> getPrimitiveClass(Class<?> clazz) { if (clazz == Boolean.class) { return Boolean.TYPE; Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Transformer.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/Transformer.java 2012-08-17 13:50:06 UTC (rev 2401) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/Transformer.java 2012-08-19 11:07:20 UTC (rev 2402) @@ -43,7 +43,9 @@ * * @param <E> le type de l'objet a transformer * @param <F> le type de l'objet transforme + * @deprecated since 2.6.12 (there some other library which does it guava function, commons-collection function) */ +@Deprecated public interface Transformer<E, F> extends Serializable { // Transformer F transform(E e);

1 0

r2401 - in trunk/nuiton-csv/src: main/java/org/nuiton/util/csv test/java/org/nuiton/util/csv
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 15:50:06 +0200 (Fri, 17 Aug 2012) New Revision: 2401 Url: http://nuiton.org/repositories/revision/nuiton-utils/2401 Log: fixes #2270: Add a way to import/export Enumeration in csv API (add tests) Added: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Common.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/MyModelBuilderTest.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Common.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Common.java 2012-08-16 15:19:43 UTC (rev 2400) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Common.java 2012-08-17 13:50:06 UTC (rev 2401) @@ -32,6 +32,7 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -104,10 +105,18 @@ return new MapProperty<E, T>(propertyName); } - public static <E , T> BeanProperty<E, T> newBeanProperty(String propertyName) { + public static <E, T> BeanProperty<E, T> newBeanProperty(String propertyName) { return new BeanProperty<E, T>(propertyName); } - + + public static <E extends Enum<E>> ValueParserFormatter<E> newEnumByNameParserFormatter(Class<E> enumType) { + return new EnumByNameParserFormatter<E>(enumType); + } + + public static <E extends Enum<E>> ValueParserFormatter<E> newEnumByOrdinalParserFormatter(Class<E> enumType) { + return new EnumByOrdinalParserFormatter<E>(enumType); + } + public static class StringValueParser implements ValueParserFormatter<String> { @Override @@ -196,6 +205,82 @@ } } + public static class EnumByNameParserFormatter<E extends Enum<E>> implements ValueParserFormatter<E> { + + + private final Class<E> enumType; + + public EnumByNameParserFormatter(Class<E> enumType) { + this.enumType = enumType; + } + + @Override + public E parse(String value) throws ParseException { + E result; + if (StringUtils.isBlank(value)) { + result = null; + } else { + result = Enum.valueOf(enumType, value); + } + return result; + } + + @Override + public String format(E date) { + String value = ""; + if (date != null) { + value = date.name(); + } + return value; + } + } + + public static class EnumByOrdinalParserFormatter<E extends Enum<E>> implements ValueParserFormatter<E> { + + private final E[] universe; + + private final int maxValue; + + public EnumByOrdinalParserFormatter(Class<E> enumType) { + universe = enumType.getEnumConstants(); + maxValue = universe.length - 1; + } + + @Override + public E parse(String value) throws ParseException { + E result; + if (StringUtils.isBlank(value)) { + result = null; + } else { + Integer ordinal = null; + try { + ordinal = Integer.valueOf(value); + } catch (NumberFormatException e) { + throw new ParseException( + "Could not parse ordinal value [" + value + "]", 0); + } + if (ordinal > maxValue) { + throw new ParseException( + "Ordinal value [" + ordinal + + "] not inbound (possible value from [0.." + + maxValue + "] for enum " + Arrays.toString(universe), + 0); + } + result = universe[ordinal]; + } + return result; + } + + @Override + public String format(E date) { + String value = ""; + if (date != null) { + value = date.name(); + } + return value; + } + } + public static class ToStringParserFormatter<E> implements ValueParserFormatter<E> { protected Map<E, String> toStrings = new HashMap<E, String>(); Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java 2012-08-16 15:19:43 UTC (rev 2400) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java 2012-08-17 13:50:06 UTC (rev 2401) @@ -54,15 +54,15 @@ @Before public void setUp() { - oneSizedSet.add(new RowBean(DateUtil.createDate(1, 12, 2011), "Batman", 1)); + oneSizedSet.add(new RowBean(DateUtil.createDate(1, 12, 2011), "Batman", 1, RowBeanEnum.ONE)); twoSizedSet.addAll(oneSizedSet); - twoSizedSet.add(new RowBean(DateUtil.createDate(2, 12, 2011), "", 7)); + twoSizedSet.add(new RowBean(DateUtil.createDate(2, 12, 2011), "", 7, RowBeanEnum.TWO)); fiveSizedSet.addAll(twoSizedSet); - fiveSizedSet.add(new RowBean(DateUtil.createDate(7, 12, 2011), "", 9)); - fiveSizedSet.add(new RowBean(DateUtil.createDate(18, 12, 2011), "", 18)); - fiveSizedSet.add(new RowBean(DateUtil.createDate(23, 12, 2011), "", 4)); + fiveSizedSet.add(new RowBean(DateUtil.createDate(7, 12, 2011), "", 9, RowBeanEnum.ZERO)); + fiveSizedSet.add(new RowBean(DateUtil.createDate(18, 12, 2011), "", 18, RowBeanEnum.ONE)); + fiveSizedSet.add(new RowBean(DateUtil.createDate(23, 12, 2011), "", 4, RowBeanEnum.TWO)); sets = Arrays.asList(new HashSet<RowBean>(), oneSizedSet, twoSizedSet, fiveSizedSet); } 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 2012-08-16 15:19:43 UTC (rev 2400) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java 2012-08-17 13:50:06 UTC (rev 2401) @@ -53,24 +53,24 @@ @Test public void testSimpleImportWithNoData() throws Exception { - String content = "DATE;NUMBER;TITLE"; + String content = "DATE;NUMBER;TITLE;ROWBEANENUM"; List<RowBean> rows; rows = importContent(new SimpleImportModel(), content); Assert.assertEquals(0, rows.size()); - content = "DATE;NUMBER;TITLE\n"; + content = "DATE;NUMBER;TITLE;ROWBEANENUM\n"; rows = importContent(new SimpleImportModel(), content); Assert.assertEquals(0, rows.size()); } @Test public void testSimpleImportWithOneLine() throws Exception { - String content = "DATE;NUMBER;TITLE\n2011-12-05;18;\"1ère ligne\""; + String content = "DATE;NUMBER;TITLE;ROWBEANENUM\n2011-12-05;18;\"1ère ligne\";ZERO;"; List<RowBean> rows = importContent(new SimpleImportModel(), content); Assert.assertEquals(1, rows.size()); - assertRowEquals(rows.get(0), DateUtil.createDate(5, 12, 2011), 18, "1ère ligne"); + assertRowEquals(rows.get(0), DateUtil.createDate(5, 12, 2011), 18, "1ère ligne",RowBeanEnum.ZERO); } /** @@ -80,14 +80,14 @@ */ @Test public void testSimpleImport() throws Exception { - String content = "DATE;NUMBER;TITLE\n" + - "2011-12-05;18;\"1ère ligne\"\n" + - "2011-12-06;19;\"2ème ligne\"\n" + - "2011-12-07;21;\"3ème ligne\""; + String content = "DATE;NUMBER;TITLE;ROWBEANENUM\n" + + "2011-12-05;18;\"1ère ligne\";ZERO\n" + + "2011-12-06;19;\"2ème ligne\";ONE\n" + + "2011-12-07;21;\"3ème ligne\";TWO"; List<RowBean> rows = importContent(new SimpleImportModel(), content); - assertRowEquals(rows.get(0), DateUtil.createDate(5, 12, 2011), 18, "1ère ligne"); - assertRowEquals(rows.get(1), DateUtil.createDate(6, 12, 2011), 19, "2ème ligne"); - assertRowEquals(rows.get(2), DateUtil.createDate(7, 12, 2011), 21, "3ème ligne"); + assertRowEquals(rows.get(0), DateUtil.createDate(5, 12, 2011), 18, "1ère ligne",RowBeanEnum.ZERO); + assertRowEquals(rows.get(1), DateUtil.createDate(6, 12, 2011), 19, "2ème ligne",RowBeanEnum.ONE); + assertRowEquals(rows.get(2), DateUtil.createDate(7, 12, 2011), 21, "3ème ligne",RowBeanEnum.TWO); } /** @@ -97,15 +97,14 @@ */ @Test public void testColumnImport() throws Exception { - String content = "DATE;NUMBER;TITLE\n" + - "2011-12-05;18;\"1ère ligne\"\n" + - "2011-12-06;19;\"2ème ligne\"\n" + - "2011-12-07;21;\"3ème ligne\""; + String content = "DATE;NUMBER;TITLE;ROWBEANENUM\n" + + "2011-12-05;18;\"1ère ligne\";2\n" + + "2011-12-06;19;\"2ème ligne\";1\n" + + "2011-12-07;21;\"3ème ligne\";0"; List<RowBean> rows = importContent(new ColumnImportModel(), content); - assertRowEquals(rows.get(0), DateUtil.createDate(5, 12, 2011), 18, "1ère ligne"); - assertRowEquals(rows.get(1), DateUtil.createDate(6, 12, 2011), 19, "2ème ligne"); - assertRowEquals(rows.get(2), DateUtil.createDate(7, 12, 2011), 21, "3ème ligne"); - + assertRowEquals(rows.get(0), DateUtil.createDate(5, 12, 2011), 18, "1ère ligne",RowBeanEnum.TWO); + assertRowEquals(rows.get(1), DateUtil.createDate(6, 12, 2011), 19, "2ème ligne",RowBeanEnum.ONE); + assertRowEquals(rows.get(2), DateUtil.createDate(7, 12, 2011), 21, "3ème ligne",RowBeanEnum.ZERO); } protected List<RowBean> importContent(ImportModel<RowBean> model, @@ -127,10 +126,11 @@ } } - private void assertRowEquals(RowBean row, Date date, Integer number, String title) { + private void assertRowEquals(RowBean row, Date date, Integer number, String title,RowBeanEnum rowBeanEnum) { Assert.assertEquals(date, row.getDate()); Assert.assertEquals(number, row.getNumber()); Assert.assertEquals(title, row.getTitle()); + Assert.assertEquals(rowBeanEnum, row.getRowBeanEnum()); } private static class ColumnImportModel implements ImportModel<RowBean> { @@ -157,6 +157,7 @@ result.add(getTitleColumn()); result.add(getNumberColumn()); result.add(getDateColumn()); + result.add(getEnumColumn()); return result; } @@ -187,6 +188,14 @@ ); } + private Column getEnumColumn() { + return Column.newImportableColumn( + "ROWBEANENUM", + Common.newEnumByOrdinalParserFormatter(RowBeanEnum.class), + withBeanSetter("rowBeanEnum", RowBeanEnum.class), + false + ); + } @SuppressWarnings({"UnusedParameters"}) private <T> ValueSetter<RowBean, T> withBeanSetter(String propertyName, Class<T> propertyClass) { // propertyClass is not used but useful to check type @@ -232,6 +241,7 @@ result.add(getTitleImportable()); result.add(getNumberImportable()); result.add(getDateImportable()); + result.add(getEnumImportable()); return result; } @@ -331,6 +341,38 @@ } }; } + + private ImportableColumn<RowBean, Object> getEnumImportable() { + return new AbstractImportableColumn<RowBean, RowBeanEnum>() { + + @Override + public String getHeaderName() { + return "ROWBEANENUM"; + } + + @Override + public boolean isMandatory() { + return true; + } + + @Override + public boolean isIgnored() { + return false; + } + + @Override + public RowBeanEnum parseValue(String value) { + return RowBeanEnum.valueOf(value); + } + + @Override + public void update(RowBean object, + RowBeanEnum value) + throws Exception { + object.setRowBeanEnum(value); + } + }; + } } private static abstract class AbstractImportableColumn<E, F> implements ImportableColumn<E, Object> { Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/MyModelBuilderTest.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/MyModelBuilderTest.java 2012-08-16 15:19:43 UTC (rev 2400) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/MyModelBuilderTest.java 2012-08-17 13:50:06 UTC (rev 2401) @@ -32,10 +32,10 @@ @Test public void testNewEmptyModel() throws Exception { - String content = "DATE;NUMBER;TITLE\n" + - "25/12/2011;18;\"1ère ligne\"\n" + - "26/12/2011;19;\"2ème ligne\"\n" + - "27/12/2011;21;\"3ème ligne\""; + String content = "DATE;NUMBER;TITLE;ROWBEANENUM\n" + + "25/12/2011;18;\"1ère ligne\";ZERO\n" + + "26/12/2011;19;\"2ème ligne\";ONE\n" + + "27/12/2011;21;\"3ème ligne\";TWO"; CsvModel.Factory<RowBean> emptyRowBeanFactory = new CsvModel.Factory<RowBean>() { @Override @@ -44,8 +44,7 @@ } }; - MyModelBuilder<RowBean> modelBuilder = new MyModelBuilder<RowBean>(); - CsvModel<RowBean> model = modelBuilder.newEmptyModel(';') + CsvModel<RowBean> model = new MyModelBuilder<RowBean>().newEmptyModel(';') .addColumn("DATE") .mandatoryAtImport("date", Common.DAY) .writeAtExport("date", Common.DAY) @@ -58,6 +57,10 @@ .mandatoryAtImport("number", Common.INTEGER) .ignoredAtExport() .add() + .addColumn("ROWBEANENUM") + .mandatoryAtImport("rowBeanEnum", Common.newEnumByNameParserFormatter(RowBeanEnum.class)) + .ignoredAtExport() + .add() .buildModelForImport(emptyRowBeanFactory); Import<RowBean> rowBeans = Import.newImport(model, IOUtils.toInputStream(content, "UTF-8")); Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java 2012-08-16 15:19:43 UTC (rev 2400) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java 2012-08-17 13:50:06 UTC (rev 2401) @@ -34,13 +34,16 @@ private Integer number; + private RowBeanEnum rowBeanEnum; + public RowBean() { } - public RowBean(Date date, String title, Integer number) { + public RowBean(Date date, String title, Integer number, RowBeanEnum rowBeanEnum) { this.date = date; this.title = title; this.number = number; + this.rowBeanEnum = rowBeanEnum; } public Date getDate() { @@ -67,6 +70,14 @@ this.number = number; } + public RowBeanEnum getRowBeanEnum() { + return rowBeanEnum; + } + + public void setRowBeanEnum(RowBeanEnum rowBeanEnum) { + this.rowBeanEnum = rowBeanEnum; + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -76,6 +87,7 @@ if (!date.equals(row.date)) return false; if (!number.equals(row.number)) return false; + if (!rowBeanEnum.equals(row.rowBeanEnum)) return false; return title.equals(row.title); } @@ -85,6 +97,7 @@ int result = date.hashCode(); result = 31 * result + title.hashCode(); result = 31 * result + number.hashCode(); + result = 31 * result + rowBeanEnum.hashCode(); return result; } @@ -94,6 +107,7 @@ "date=" + date + ", title='" + title + '\'' + ", number=" + number + + ", rowBeanEnum=" + rowBeanEnum + '}'; } } Added: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java (rev 0) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java 2012-08-17 13:50:06 UTC (rev 2401) @@ -0,0 +1,11 @@ +package org.nuiton.util.csv; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since TODO + */ +public enum RowBeanEnum { + ZERO,ONE,TWO +} Property changes on: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanEnum.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r2400 - trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext
by tchemit＠users.nuiton.org 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-16 17:19:43 +0200 (Thu, 16 Aug 2012) New Revision: 2400 Url: http://nuiton.org/repositories/revision/nuiton-utils/2400 Log: refs #2259: Add a csv ext package (for extended stuff) (more nice models) Added: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractExportModel.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportModel.java Added: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractExportModel.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractExportModel.java (rev 0) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractExportModel.java 2012-08-16 15:19:43 UTC (rev 2400) @@ -0,0 +1,84 @@ +package org.nuiton.util.csv.ext; +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ + +import org.nuiton.util.csv.ExportModel; +import org.nuiton.util.csv.ExportableColumn; +import org.nuiton.util.csv.ModelBuilder; +import org.nuiton.util.csv.ValueFormatter; +import org.nuiton.util.csv.ValueGetter; + +/** + * Abstract implementation of a {@link ExportModel} to avoid all the + * boilerplate code when creating a new model. + * + * @param <E> type of object to export + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public abstract class AbstractExportModel<E> implements ExportModel<E> { + + private final char separator; + + protected final ModelBuilder<E> modelBuilder; + + public AbstractExportModel(char separator) { + this.separator = separator; + modelBuilder = new ModelBuilder<E>(); + } + + @Override + public final char getSeparator() { + return separator; + } + + @Override + public final Iterable<ExportableColumn<E, Object>> getColumnsForExport() { + return (Iterable) modelBuilder.getColumnsForExport(); + } + + public ExportableColumn<E, String> newColumnForExport(String headerName) { + return modelBuilder.newColumnForExport(headerName, headerName); + } + + public ExportableColumn<E, String> newColumnForExport(String headerName, String propertyName) { + return modelBuilder.newColumnForExport(headerName, propertyName); + } + + public ExportableColumn<E, String> newColumnForExport(String headerName, ValueGetter<E, String> eStringValueGetter) { + return modelBuilder.newColumnForExport(headerName, eStringValueGetter); + } + + public <T> ExportableColumn<E, T> newColumnForExport(String headerName, ValueFormatter<T> valueFormatter) { + return modelBuilder.newColumnForExport(headerName, headerName, valueFormatter); + } + + public <T> ExportableColumn<E, T> newColumnForExport(String headerName, String propertyName, ValueFormatter<T> valueFormatter) { + return modelBuilder.newColumnForExport(headerName, propertyName, valueFormatter); + } + + public <T> ExportableColumn<E, T> newColumnForExport(String headerName, ValueGetter<E, T> etValueGetter, ValueFormatter<T> valueFormatter) { + return modelBuilder.newColumnForExport(headerName, etValueGetter, valueFormatter); + } +} \ No newline at end of file Property changes on: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractExportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: 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 (rev 0) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java 2012-08-16 15:19:43 UTC (rev 2400) @@ -0,0 +1,153 @@ +package org.nuiton.util.csv.ext; +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ + +import org.nuiton.util.csv.ExportableColumn; +import org.nuiton.util.csv.ImportExportModel; +import org.nuiton.util.csv.ImportableColumn; +import org.nuiton.util.csv.ImportableExportableColumn; +import org.nuiton.util.csv.ModelBuilder; +import org.nuiton.util.csv.ValueFormatter; +import org.nuiton.util.csv.ValueGetter; +import org.nuiton.util.csv.ValueGetterSetter; +import org.nuiton.util.csv.ValueParser; +import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.util.csv.ValueSetter; + +import java.util.List; + +/** + * Abstract implementation of a {@link ImportExportModel} to avoid all the + * boilerplate code when creating a new model. + * + * @param <E> type of object to import/export + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public abstract class AbstractImportExportModel<E> implements ImportExportModel<E> { + + private final char separator; + + protected final ModelBuilder<E> modelBuilder; + + public AbstractImportExportModel(char separator) { + this.separator = separator; + modelBuilder = new ModelBuilder<E>(); + } + + @Override + public final char getSeparator() { + return separator; + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + @Override + public final Iterable<ExportableColumn<E, Object>> getColumnsForExport() { + return (Iterable) modelBuilder.getColumnsForExport(); + } + + @Override + public final Iterable<ImportableColumn<E, Object>> getColumnsForImport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + + public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { + return modelBuilder.newIgnoredColumn(headerName); + } + + public ImportableColumn<E, String> newMandatoryColumn(String headerName) { + return modelBuilder.newMandatoryColumn(headerName, headerName); + } + + public ImportableColumn<E, String> newMandatoryColumn(String headerName, String propertyName) { + return modelBuilder.newMandatoryColumn(headerName, propertyName); + } + + public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, ValueParser<T> valueParser) { + return modelBuilder.newMandatoryColumn(headerName, headerName, valueParser); + } + + public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, String propertyName, ValueParser<T> valueParser) { + return modelBuilder.newMandatoryColumn(headerName, propertyName, valueParser); + } + + public ImportableColumn<E, String> newMandatoryColumn(String headerName, ValueSetter<E, String> eStringValueSetter) { + return modelBuilder.newMandatoryColumn(headerName, eStringValueSetter); + } + + public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> etValueSetter) { + return modelBuilder.newMandatoryColumn(headerName, valueParser, etValueSetter); + } + + public ExportableColumn<E, String> newColumnForExport(String headerName) { + return modelBuilder.newColumnForExport(headerName, headerName); + } + + public ExportableColumn<E, String> newColumnForExport(String headerName, String propertyName) { + return modelBuilder.newColumnForExport(headerName, propertyName); + } + + public ExportableColumn<E, String> newColumnForExport(String headerName, ValueGetter<E, String> eStringValueGetter) { + return modelBuilder.newColumnForExport(headerName, eStringValueGetter); + } + + public <T> ExportableColumn<E, T> newColumnForExport(String headerName, ValueFormatter<T> valueFormatter) { + return modelBuilder.newColumnForExport(headerName, headerName, valueFormatter); + } + + public <T> ExportableColumn<E, T> newColumnForExport(String headerName, String propertyName, ValueFormatter<T> valueFormatter) { + return modelBuilder.newColumnForExport(headerName, propertyName, valueFormatter); + } + + public <T> ExportableColumn<E, T> newColumnForExport(String headerName, ValueGetter<E, T> etValueGetter, ValueFormatter<T> valueFormatter) { + return modelBuilder.newColumnForExport(headerName, etValueGetter, valueFormatter); + } + + public ImportableExportableColumn<E, String> newColumnForImportExport(String headerName) { + return modelBuilder.newColumnForImportExport(headerName, headerName); + } + + public ImportableExportableColumn<E, String> newColumnForImportExport(String headerName, String propertyName) { + return modelBuilder.newColumnForImportExport(headerName, propertyName); + } + + public ImportableExportableColumn<E, String> newColumnForImportExport(String headerName, ValueGetterSetter<E, String> eStringValueGetterSetter) { + return modelBuilder.newColumnForImportExport(headerName, eStringValueGetterSetter); + } + + public <T> ImportableExportableColumn<E, T> newColumnForImportExport(String headerName, ValueParserFormatter<T> valueParserFormatter) { + return modelBuilder.newColumnForImportExport(headerName, headerName, valueParserFormatter); + } + + public <T> ImportableExportableColumn<E, T> newColumnForImportExport(String headerName, String propertyName, ValueParserFormatter<T> valueParserFormatter) { + return modelBuilder.newColumnForImportExport(headerName, propertyName, valueParserFormatter); + } + + public <T> ImportableExportableColumn<E, T> newColumnForImportExport(String headerName, ValueGetterSetter<E, T> etValueGetterSetter, ValueParserFormatter<T> valueParserFormatter) { + return modelBuilder.newColumnForImportExport(headerName, etValueGetterSetter, valueParserFormatter); + } +} \ No newline at end of file Property changes on: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportExportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportModel.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportModel.java (rev 0) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportModel.java 2012-08-16 15:19:43 UTC (rev 2400) @@ -0,0 +1,95 @@ +package org.nuiton.util.csv.ext; +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ + +import org.nuiton.util.csv.ImportModel; +import org.nuiton.util.csv.ImportableColumn; +import org.nuiton.util.csv.ModelBuilder; +import org.nuiton.util.csv.ValueParser; +import org.nuiton.util.csv.ValueSetter; + +import java.util.List; + +/** + * Abstract implementation of a {@link ImportModel} to avoid all the + * boilerplate code when creating a new model. + * + * @param <E> type of object to import + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public abstract class AbstractImportModel<E> implements ImportModel<E> { + + private final char separator; + + protected final ModelBuilder<E> modelBuilder; + + public AbstractImportModel(char separator) { + this.separator = separator; + modelBuilder = new ModelBuilder<E>(); + } + + @Override + public final char getSeparator() { + return separator; + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + @Override + public final Iterable<ImportableColumn<E, Object>> getColumnsForImport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + + public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { + return modelBuilder.newIgnoredColumn(headerName); + } + + public ImportableColumn<E, String> newMandatoryColumn(String headerName) { + return modelBuilder.newMandatoryColumn(headerName, headerName); + } + + public ImportableColumn<E, String> newMandatoryColumn(String headerName, String propertyName) { + return modelBuilder.newMandatoryColumn(headerName, propertyName); + } + + public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, ValueParser<T> valueParser) { + return modelBuilder.newMandatoryColumn(headerName, headerName, valueParser); + } + + public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, String propertyName, ValueParser<T> valueParser) { + return modelBuilder.newMandatoryColumn(headerName, propertyName, valueParser); + } + + public ImportableColumn<E, String> newMandatoryColumn(String headerName, ValueSetter<E, String> eStringValueSetter) { + return modelBuilder.newMandatoryColumn(headerName, eStringValueSetter); + } + + public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, ValueParser<T> valueParser, ValueSetter<E, T> etValueSetter) { + return modelBuilder.newMandatoryColumn(headerName, valueParser, etValueSetter); + } + +} \ No newline at end of file Property changes on: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/AbstractImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2399 - trunk/nuiton-csv/src/main/java/org/nuiton/util/csv
by tchemit＠users.nuiton.org 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-16 17:18:59 +0200 (Thu, 16 Aug 2012) New Revision: 2399 Url: http://nuiton.org/repositories/revision/nuiton-utils/2399 Log: #2263: Be able to change the *safetySwitch* configuration on import Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Import.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Import.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Import.java 2012-08-16 15:16:28 UTC (rev 2398) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Import.java 2012-08-16 15:18:59 UTC (rev 2399) @@ -89,6 +89,18 @@ return new Import<E>(model, reader); } + public static <E> Import<E> newImport(ImportModel<E> model, + InputStream inputStream, + boolean safetySwitch) { + return new Import<E>(model, inputStream, safetySwitch); + } + + public static <E> Import<E> newImport(ImportModel<E> model, + Reader reader, + boolean safetySwitch) { + return new Import<E>(model, reader, safetySwitch); + } + /** * Define iterator over import. First of all, the input stream will be * validated based on defined model. Iteration will be done on all csv @@ -185,7 +197,7 @@ if (log.isTraceEnabled()) { log.trace("headers of the CSV file are : " + - Arrays.toString(headers)); + Arrays.toString(headers)); } // hook to do some stuff from the model @@ -223,7 +235,7 @@ } catch (Exception e) { String message = _("csv.import.error.unableToParseValue", value, field.getHeaderName(), lineNumber) - + "\n" + e.getMessage(); + + "\n" + e.getMessage(); throw new ImportRuntimeException(message, e); } } @@ -350,21 +362,31 @@ } protected Import(ImportModel<E> model, InputStream inputStream) { + this(model, inputStream, true); + } + + protected Import(ImportModel<E> model, Reader reader) { + this(model, reader, true); + } + + protected Import(ImportModel<E> model, InputStream inputStream, boolean safetySwitch) { if (inputStream == null) { throw new NullPointerException("inputStream is null"); } this.model = model; reader = new CsvReader(inputStream, model.getSeparator(), Charset.forName("UTF-8")); reader.setTrimWhitespace(true); + this.reader.setSafetySwitch(safetySwitch); } - protected Import(ImportModel<E> model, Reader reader) { + protected Import(ImportModel<E> model, Reader reader, boolean safetySwitch) { if (reader == null) { throw new NullPointerException("reader is null"); } this.model = model; this.reader = new CsvReader(reader, model.getSeparator()); this.reader.setTrimWhitespace(true); + this.reader.setSafetySwitch(safetySwitch); } /**

1 0

r2398 - trunk/nuiton-csv/src/main/java/org/nuiton/util/csv
by tchemit＠users.nuiton.org 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-16 17:16:28 +0200 (Thu, 16 Aug 2012) New Revision: 2398 Url: http://nuiton.org/repositories/revision/nuiton-utils/2398 Log: #2263: Be able to change the *safetySwitch* configuration on export Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ImportToMap.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ImportToMap.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ImportToMap.java 2012-08-16 12:35:36 UTC (rev 2397) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ImportToMap.java 2012-08-16 15:16:28 UTC (rev 2398) @@ -53,6 +53,16 @@ return new ImportToMap(model, reader); } + public static ImportToMap newImportToMap(ImportModel<Map<String, Object>> model, + InputStream inputStream, boolean safetySwitch) { + return new ImportToMap(model, inputStream, safetySwitch); + } + + public static ImportToMap newImportToMap(ImportModel<Map<String, Object>> model, + Reader reader, boolean safetySwitch) { + return new ImportToMap(model, reader, safetySwitch); + } + @Override public Iterator<Map<String, Object>> iterator() { @@ -120,11 +130,23 @@ protected ImportToMap(ImportModel<Map<String, Object>> mapImportModel, InputStream inputStream) { + this(mapImportModel, inputStream, true); + } + + protected ImportToMap(ImportModel<Map<String, Object>> mapImportModel, + Reader reader) { + this(mapImportModel, reader, true); + } + + protected ImportToMap(ImportModel<Map<String, Object>> mapImportModel, + InputStream inputStream, boolean safetySwitch) { super(mapImportModel, inputStream); + this.reader.setSafetySwitch(safetySwitch); } protected ImportToMap(ImportModel<Map<String, Object>> mapImportModel, - Reader reader) { + Reader reader, boolean safetySwitch) { super(mapImportModel, reader); + this.reader.setSafetySwitch(safetySwitch); } }

1 0

r2397 - trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext
by tchemit＠users.nuiton.org 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-16 14:35:36 +0200 (Thu, 16 Aug 2012) New Revision: 2397 Url: http://nuiton.org/repositories/revision/nuiton-utils/2397 Log: add missing license header Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/package-info.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/package-info.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/package-info.java 2012-08-16 12:31:13 UTC (rev 2396) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/package-info.java 2012-08-16 12:35:36 UTC (rev 2397) @@ -4,4 +4,27 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.6 */ -package org.nuiton.util.csv.ext; \ No newline at end of file +package org.nuiton.util.csv.ext; +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */

1 0

r2396 - in trunk: nuiton-csv nuiton-csv/src/main/java/org/nuiton/util/csv nuiton-csv/src/main/java/org/nuiton/util/csv/ext nuiton-validator/src/main/java/org/nuiton/validator/bean/simple
by tchemit＠users.nuiton.org 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-16 14:31:13 +0200 (Thu, 16 Aug 2012) New Revision: 2396 Url: http://nuiton.org/repositories/revision/nuiton-utils/2396 Log: refs #2259: Add a csv ext package (for extended stuff) Added: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/CsvReaders.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/RepeatableExport.java trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/package-info.java Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidators.java Modified: trunk/nuiton-csv/pom.xml =================================================================== --- trunk/nuiton-csv/pom.xml 2012-08-11 07:54:22 UTC (rev 2395) +++ trunk/nuiton-csv/pom.xml 2012-08-16 12:31:13 UTC (rev 2396) @@ -65,6 +65,11 @@ </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>net.sourceforge.javacsv</groupId> <artifactId>javacsv</artifactId> </dependency> Added: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/CsvReaders.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/CsvReaders.java (rev 0) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/CsvReaders.java 2012-08-16 12:31:13 UTC (rev 2396) @@ -0,0 +1,57 @@ +package org.nuiton.util.csv.ext; +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ + +import com.google.common.base.Charsets; +import com.google.common.io.Files; +import org.nuiton.util.csv.ImportRuntimeException; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; + +/** + * Useful method around csv readers. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class CsvReaders { + + public static String[] getHeader(File file, char charSeprator) { + + try { + BufferedReader reader = Files.newReader(file, Charsets.UTF_8); + try { + String header = reader.readLine(); + String[] result = header.split(charSeprator + ""); + return result; + } finally { + reader.close(); + } + } catch (IOException e) { + throw new ImportRuntimeException("Could not obtain header of file " + file, e); + } + } +} Property changes on: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/CsvReaders.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/RepeatableExport.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/RepeatableExport.java (rev 0) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/RepeatableExport.java 2012-08-16 12:31:13 UTC (rev 2396) @@ -0,0 +1,101 @@ +package org.nuiton.util.csv.ext; +/* + * #%L + * Nuiton Utils :: Nuiton Csv + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ + +import org.nuiton.util.csv.Export; +import org.nuiton.util.csv.ExportModel; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.nio.charset.Charset; + +/** + * Extends the {@link Export} classes to be able to generate only once + * the header. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6 + */ +public class RepeatableExport<E> extends Export<E> { + + public static <E> RepeatableExport<E> newExport(ExportModel<E> model, + Iterable<E> data, + boolean writeOnceHeader) { + return new RepeatableExport<E>(model, data, writeOnceHeader); + } + + public static <E> void exportToWriter(ExportModel<E> model, + Iterable<E> data, + Writer writer, + boolean writeOnceHeader) throws Exception { + Export<E> exporter = newExport(model, data, writeOnceHeader); + exporter.write(writer); + } + + public static <E> void exportToFile(ExportModel<E> model, + Iterable<E> data, + File file, + Charset charset, + boolean writeOnceHeader) throws Exception { + Export<E> exporter = newExport(model, data, writeOnceHeader); + exporter.write(file, charset); + } + + public static <E> String exportToString(ExportModel<E> model, + Iterable<E> data, + Charset charset, + boolean writeOnceHeader) throws Exception { + Export<E> exporter = newExport(model, data, writeOnceHeader); + return exporter.toString(charset); + } + + protected final boolean writeOnceHeader; + + protected boolean headerWritten; + + public boolean isHeaderWritten() { + return headerWritten; + } + + protected RepeatableExport(ExportModel<E> model, + Iterable<E> data, + boolean writeOnceHeader) { + super(model, data); + this.writeOnceHeader = writeOnceHeader; + } + + @Override + protected void writeHeader(Writer writer) throws IOException { + if (!writeOnceHeader || !headerWritten) { + + // no header generated, let's do it! + + super.writeHeader(writer); + + // mark it as written + headerWritten = true; + } + } +} Property changes on: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/RepeatableExport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/package-info.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/package-info.java (rev 0) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/package-info.java 2012-08-16 12:31:13 UTC (rev 2396) @@ -0,0 +1,7 @@ +/** + * Offers some extended api. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6 + */ +package org.nuiton.util.csv.ext; \ No newline at end of file Property changes on: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ext/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidators.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidators.java 2012-08-11 07:54:22 UTC (rev 2395) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidators.java 2012-08-16 12:31:13 UTC (rev 2396) @@ -1,4 +1,27 @@ package org.nuiton.validator.bean.simple; +/* + * #%L + * Nuiton Utils :: Nuiton Validator + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ import org.nuiton.validator.NuitonValidatorScope; Property changes on: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/simple/SimpleBeanValidators.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0