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

r2292 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by bleny＠users.nuiton.org 26 Jan '12

26 Jan '12

Author: bleny Date: 2012-01-26 15:26:52 +0100 (Thu, 26 Jan 2012) New Revision: 2292 Url: http://nuiton.org/repositories/revision/nuiton-utils/2292 Log: #1923 add a truncate to week utility method Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2012-01-19 11:45:45 UTC (rev 2291) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2012-01-26 14:26:52 UTC (rev 2292) @@ -420,4 +420,26 @@ calendar.setTime(date); return calendar; } + + /** + * Truncate a date to its week (to monday). It's equivalent to a call to + * {@link org.apache.commons.lang3.time.DateUtils#truncate(java.util.Date, int)} + * and giving {@link java.util.Calendar#DAY_OF_WEEK} argument, but such a call + * raise an exception showing that this field is not supported. This method + * allows you to bypass this limitation. + * + * @param date any date + * @return a date in the same week as given date, a monday. All field below + * (hours, secondes, ms) are zeroed. + */ + public static Date truncateToDayOfWeek(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + return calendar.getTime(); + } } Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2012-01-19 11:45:45 UTC (rev 2291) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2012-01-26 14:26:52 UTC (rev 2292) @@ -25,6 +25,7 @@ package org.nuiton.util; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -34,7 +35,6 @@ import java.text.ParseException; import java.util.Calendar; import java.util.Date; -import java.util.GregorianCalendar; import java.util.Locale; /** @@ -294,4 +294,26 @@ Assert.assertEquals("Juli", juli); } + /** + * Shows that {@link org.nuiton.util.DateUtil#truncateToDayOfWeek(java.util.Date)} works + * fine and that using commons library for this operation is not possible. + */ + @Test + public void testTruncateToDayOfWeek() { + + Date aDate = DateUtil.createDate(23, 45, 6, 19, 10, 2011); + Date expectedWeek = DateUtil.createDate(17, 10, 2011); + Date actualWeek; + + // show that commons-lang do not support this operation with truncate + try { + actualWeek = DateUtils.truncate(aDate, Calendar.DAY_OF_WEEK); + Assert.assertEquals(expectedWeek, actualWeek); + } catch (IllegalArgumentException e) { + Assert.assertEquals(String.format("The field %d is not supported", Calendar.DAY_OF_WEEK), e.getMessage()); + } + + actualWeek = DateUtil.truncateToDayOfWeek(aDate); + Assert.assertEquals(expectedWeek, actualWeek); + } }

1 0

r2291 - in trunk/nuiton-utils/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org 19 Jan '12

19 Jan '12

Author: tchemit Date: 2012-01-19 12:45:45 +0100 (Thu, 19 Jan 2012) New Revision: 2291 Url: http://nuiton.org/repositories/revision/nuiton-utils/2291 Log: Evolution #1913: Default binder should not take account of properties with different types Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanAA.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java 2012-01-17 12:21:21 UTC (rev 2290) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java 2012-01-19 11:45:45 UTC (rev 2291) @@ -161,6 +161,24 @@ */ public static <S, T> BinderModelBuilder<S, T> newDefaultBuilder(Class<S> sourceType, Class<T> targetType) { + return newDefaultBuilder(sourceType, targetType, true); + } + + /** + * Creates a new model builder and fill the model with all matching + * and available properties from the source type to the target type. + * + * @param sourceType the source type of the model to create + * @param targetType the target type of the model to create + * @param <S> the source type of the binder model to create + * @param <T> the target type of the binder model to create + * @param checkType flag to check if properties has same types, otherwise skip them + * @return the new instanciated model builder fully filled + * @since 2.4.5 + */ + public static <S, T> BinderModelBuilder<S, T> newDefaultBuilder(Class<S> sourceType, + Class<T> targetType, + boolean checkType) { BinderModelBuilder<S, T> builder = newEmptyBuilder(sourceType, targetType); Map<String, PropertyDescriptor> source = builder.sourceDescriptors; @@ -173,18 +191,32 @@ continue; } PropertyDescriptor sourceDescriptor = source.get(propertyName); - if (sourceDescriptor.getReadMethod() == null) { + Method readMethod = sourceDescriptor.getReadMethod(); + if (readMethod == null) { // no getter on source, do not use this property continue; } PropertyDescriptor targetDescriptor = target.get(propertyName); - if (targetDescriptor.getWriteMethod() == null) { + Method writeMethod = targetDescriptor.getWriteMethod(); + if (writeMethod == null) { // no setter on target, do not use this property continue; } + if (checkType) { + + // check types are compatible + + Class<?> writerType = writeMethod.getParameterTypes()[0]; + Class<?> readerType = readMethod.getReturnType(); + if (!writerType.equals(readerType)) { + + // types are not compatible + continue; + } + } // can safely use this property properties.add(propertyName); } @@ -308,7 +340,7 @@ if (sourceAndTargetProperties.length % 2 != 0) { throw new IllegalArgumentException( "must have couple(s) of sourceProperty,targetProperty) " + - "but had " + Arrays.toString(sourceAndTargetProperties)); + "but had " + Arrays.toString(sourceAndTargetProperties)); } for (int i = 0, max = sourceAndTargetProperties.length / 2; i < max; i++) { @@ -317,12 +349,12 @@ if (sourceProperty == null) { throw new NullPointerException( "parameter 'sourceAndTargetProperties' can not " + - "contains a null value"); + "contains a null value"); } if (targetProperty == null) { throw new NullPointerException( "parameter 'sourceAndTargetProperties' can not " + - "contains a null value"); + "contains a null value"); } addProperty0(sourceProperty, targetProperty); } @@ -335,7 +367,7 @@ if (!model.containsSourceProperty(propertyName)) { throw new IllegalArgumentException( "source property '" + propertyName + "' " + - " is NOT registred."); + " is NOT registred."); } // check property is the same type of given binder @@ -343,11 +375,11 @@ Class<?> type = descriptor.getPropertyType(); if (!Collection.class.isAssignableFrom(type) && - !binder.model.getSourceType().isAssignableFrom(type)) { + !binder.model.getSourceType().isAssignableFrom(type)) { throw new IllegalStateException( "source property '" + propertyName + - "' has not the same type [" + type + - "] of the binder [" + binder.model.getSourceType() + "]."); + "' has not the same type [" + type + + "] of the binder [" + binder.model.getSourceType() + "]."); } // can safely add the strategy @@ -365,7 +397,7 @@ if (!model.containsSourceProperty(propertyName)) { throw new IllegalArgumentException( "source property '" + propertyName + "' " + - " is NOT registred."); + " is NOT registred."); } // check property is collection type @@ -374,7 +406,7 @@ if (!Collection.class.isAssignableFrom(type)) { throw new IllegalStateException( "source property '" + propertyName + - "' is not a collection type [" + type + "]"); + "' is not a collection type [" + type + "]"); } // can safely add the strategy @@ -400,7 +432,7 @@ if (model != null) { throw new IllegalStateException( "there is already a binderModel in construction, release " + - "it with the method createBinder before using this method." + "it with the method createBinder before using this method." ); } @@ -425,14 +457,14 @@ sourceDescriptors.get(sourceProperty); if (sourceDescriptor == null) { throw new IllegalArgumentException("no property '" + - sourceProperty + "' " + "found on type " + - model.getSourceType()); + sourceProperty + "' " + "found on type " + + model.getSourceType()); } // check srcProperty is readable Method readMethod = sourceDescriptor.getReadMethod(); if (readMethod == null) { throw new IllegalArgumentException("property '" + sourceProperty + - "' " + "is not readable on type " + model.getSourceType()); + "' " + "is not readable on type " + model.getSourceType()); } // obtain dst descriptor @@ -440,14 +472,14 @@ targetDescriptors.get(targetProperty); if (targetDescriptor == null) { throw new IllegalArgumentException("no property '" + - targetProperty + "' " + "found on type " + - model.getTargetType()); + targetProperty + "' " + "found on type " + + model.getTargetType()); } // check dstProperty is writable Method writeMethod = targetDescriptor.getWriteMethod(); if (writeMethod == null) { throw new IllegalArgumentException("property '" + targetProperty + - "' " + "is not writable on type " + model.getTargetType()); + "' " + "is not writable on type " + model.getTargetType()); } // check types are ok @@ -456,9 +488,9 @@ //TODO-TC20100221 : should check if primitive and boxed it in such case if (!sourceType.equals(targetType)) { throw new IllegalArgumentException("source property '" + - sourceProperty + "' and target property '" + - targetProperty + "' are not compatible ( sourceType : " + - sourceType + " vs targetType :" + targetType + ')'); + sourceProperty + "' and target property '" + + targetProperty + "' are not compatible ( sourceType : " + + sourceType + " vs targetType :" + targetType + ')'); } // check srcProperty does not exist @@ -474,7 +506,7 @@ // property for the entry and this is a bit unatural if (model.containsTargetProperty(targetProperty)) { throw new IllegalArgumentException("destination property '" + - targetProperty + "' " + " was already registred."); + targetProperty + "' " + " was already registred."); } // safe to add the binding model.addBinding(sourceDescriptor, targetDescriptor); @@ -505,7 +537,7 @@ } } catch (IntrospectionException e) { throw new RuntimeException("Could not obtain bean properties " + - "descriptors for source type " + type, e); + "descriptors for source type " + type, e); } Class<?>[] interfaces = type.getInterfaces(); for (Class<?> i : interfaces) { Copied: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanAA.java (from rev 2290, trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanA.java) =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanAA.java (rev 0) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BeanAA.java 2012-01-19 11:45:45 UTC (rev 2291) @@ -0,0 +1,143 @@ +/* + * #%L + * Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 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% + */ + +package org.nuiton.util.beans; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +public class BeanAA { + + public static final String PROPERTY_AA = "aa"; + + public static final String PROPERTY_A = "a"; + + public static final String PROPERTY_B = "b"; + + public static final String PROPERTY_C = "c"; + + public static final String PROPERTY_D = "d"; + + public static final String PROPERTY_E = "e"; + + public static final String PROPERTY_F = "f"; + + protected String aa, b, c, d; + + protected int a, e, f; + + protected PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + public void setAa(String aa) { + this.aa = aa; + } + + public int getA() { + return a; + } + + public void setA(int a) { + Object oldValue = this.a; + this.a = a; + firePropertyChange(PROPERTY_A, oldValue, a); + } + + public String getB() { + return b; + } + + public void setB(String b) { + Object oldValue = this.b; + this.b = b; + firePropertyChange(PROPERTY_B, oldValue, b); + } + + public String getC() { + return c; + } + + public void setC(String c) { + Object oldValue = this.c; + this.c = c; + firePropertyChange(PROPERTY_C, oldValue, c); + } + + public String getD() { + return d; + } + + public void setD(String d) { + Object oldValue = this.d; + this.d = d; + firePropertyChange(PROPERTY_D, oldValue, d); + } + + public int getE() { + return e; + } + + public void setE(int e) { + Object oldValue = this.e; + this.e = e; + firePropertyChange(PROPERTY_E, oldValue, e); + } + + public int getF() { + return f; + } + + public void setF(int f) { + Object oldValue = this.f; + this.f = f; + firePropertyChange(PROPERTY_F, oldValue, f); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, + Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + + protected PropertyChangeListener[] getPropertyChangeListeners() { + return pcs.getPropertyChangeListeners(); + } +} Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java 2012-01-17 12:21:21 UTC (rev 2290) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java 2012-01-19 11:45:45 UTC (rev 2291) @@ -560,4 +560,32 @@ Assert.assertEquals(salutationCode, destination.getGender()); } + @Test + public void testEvol1913() throws Exception { + + // This is test for http://nuiton.org/issues/1913 + + // A --> AA + + BinderModelBuilder<BeanA, BeanAA> builderAAA; + + builderAAA = BinderModelBuilder.newDefaultBuilder(BeanA.class, BeanAA.class); + assertBuilder(builderAAA, BeanA.class, BeanAA.class); + assertDescriptor(builderAAA.getModel().propertiesMapping, + BeanA.PROPERTY_B, + BeanA.PROPERTY_C, + BeanA.PROPERTY_D, + BeanA.PROPERTY_E, + BeanA.PROPERTY_F + ); + + try { + // property a is not the same, will fail + builderAAA = BinderModelBuilder.newDefaultBuilder(BeanA.class, BeanAA.class, false); + Assert.fail(); + } catch (IllegalArgumentException e) { + Assert.assertTrue(true); + } + } + }

1 0

r2290 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: maven-release Date: 2012-01-17 13:21:21 +0100 (Tue, 17 Jan 2012) New Revision: 2290 Url: http://nuiton.org/repositories/revision/nuiton-utils/2290 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/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-01-17 12:21:20 UTC (rev 2289) +++ trunk/nuiton-csv/pom.xml 2012-01-17 12:21:21 UTC (rev 2290) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4</version> + <version>2.4.5-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-01-17 12:21:20 UTC (rev 2289) +++ trunk/nuiton-profiling/pom.xml 2012-01-17 12:21:21 UTC (rev 2290) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4</version> + <version>2.4.5-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-01-17 12:21:20 UTC (rev 2289) +++ trunk/nuiton-utils/pom.xml 2012-01-17 12:21:21 UTC (rev 2290) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4</version> + <version>2.4.5-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-01-17 12:21:20 UTC (rev 2289) +++ trunk/nuiton-validator/pom.xml 2012-01-17 12:21:21 UTC (rev 2290) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4</version> + <version>2.4.5-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 12:21:20 UTC (rev 2289) +++ trunk/pom.xml 2012-01-17 12:21:21 UTC (rev 2290) @@ -35,7 +35,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4</version> + <version>2.4.5-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -214,12 +214,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.4 + 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.4.4 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <distributionManagement>

1 0

r2289 - in tags: . nuiton-utils-2.4.4
by maven-release＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: maven-release Date: 2012-01-17 13:21:20 +0100 (Tue, 17 Jan 2012) New Revision: 2289 Url: http://nuiton.org/repositories/revision/nuiton-utils/2289 Log: [maven-release-plugin] copy for tag nuiton-utils-2.4.4 Added: tags/nuiton-utils-2.4.4/ Property changes on: tags/nuiton-utils-2.4.4 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2288 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: maven-release Date: 2012-01-17 13:21:19 +0100 (Tue, 17 Jan 2012) New Revision: 2288 Url: http://nuiton.org/repositories/revision/nuiton-utils/2288 Log: [maven-release-plugin] prepare release nuiton-utils-2.4.4 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/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-01-17 11:08:01 UTC (rev 2287) +++ trunk/nuiton-csv/pom.xml 2012-01-17 12:21:19 UTC (rev 2288) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4-SNAPSHOT</version> + <version>2.4.4</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-01-17 11:08:01 UTC (rev 2287) +++ trunk/nuiton-profiling/pom.xml 2012-01-17 12:21:19 UTC (rev 2288) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4-SNAPSHOT</version> + <version>2.4.4</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-01-17 11:08:01 UTC (rev 2287) +++ trunk/nuiton-utils/pom.xml 2012-01-17 12:21:19 UTC (rev 2288) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4-SNAPSHOT</version> + <version>2.4.4</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-01-17 11:08:01 UTC (rev 2287) +++ trunk/nuiton-validator/pom.xml 2012-01-17 12:21:19 UTC (rev 2288) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4-SNAPSHOT</version> + <version>2.4.4</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 11:08:01 UTC (rev 2287) +++ trunk/pom.xml 2012-01-17 12:21:19 UTC (rev 2288) @@ -35,7 +35,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.4-SNAPSHOT</version> + <version>2.4.4</version> <modules> <module>nuiton-utils</module> @@ -214,12 +214,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.4.4 </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.4.4 </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.…</url> </scm> <distributionManagement>

1 0

r2287 - trunk/nuiton-csv/src/test/java/org/nuiton/util/csv
by bleny＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: bleny Date: 2012-01-17 12:08:01 +0100 (Tue, 17 Jan 2012) New Revision: 2287 Url: http://nuiton.org/repositories/revision/nuiton-utils/2287 Log: add a test for Export in csv api Added: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanExportModel.java Modified: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java Added: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java (rev 0) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ExportTest.java 2012-01-17 11:08:01 UTC (rev 2287) @@ -0,0 +1,67 @@ +package org.nuiton.util.csv; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.util.DateUtil; + +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class ExportTest { + + private static final Log log = LogFactory.getLog(ExportTest.class); + + protected Set<RowBean> oneSizedSet = new HashSet<RowBean>(); + + protected Set<RowBean> twoSizedSet = new HashSet<RowBean>(); + + protected Set<RowBean> fiveSizedSet = new HashSet<RowBean>(); + + protected List<Set<RowBean>> sets; + + protected ExportModel<RowBean> model = new RowBeanExportModel(); + + @Before + public void setUp() { + + oneSizedSet.add(new RowBean(DateUtil.createDate(1, 12, 2011), "Batman", 1)); + + twoSizedSet.addAll(oneSizedSet); + twoSizedSet.add(new RowBean(DateUtil.createDate(2, 12, 2011), "", 7)); + + 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)); + + sets = Arrays.asList(new HashSet<RowBean>(), oneSizedSet, twoSizedSet, fiveSizedSet); + } + + @Test + public void testExportToString() throws Exception { + + for (Set<RowBean> set : sets) { + + String csv = Export.exportToString(model, set, Charset.forName("UTF-8")); + + if (log.isDebugEnabled()) { + log.debug("exported csv:\n" + csv); + } + + // 1 header line + one line per RowBean instance + int expectedLineCount = 1 + set.size(); + // number of '\n' in csv + int actualLineCount = csv.split("\n").length; + Assert.assertEquals("exported CSV must have all lines", + expectedLineCount, actualLineCount); + } + + } + +} 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-01-17 11:07:34 UTC (rev 2286) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/ImportTest.java 2012-01-17 11:08:01 UTC (rev 2287) @@ -55,7 +55,7 @@ public void testSimpleImportWithNoData() throws Exception { String content = "DATE;NUMBER;TITLE"; - List<Row> rows; + List<RowBean> rows; rows = importContent(new SimpleImportModel(), content); Assert.assertEquals(0, rows.size()); @@ -68,7 +68,7 @@ public void testSimpleImportWithOneLine() throws Exception { String content = "DATE;NUMBER;TITLE\n2011-12-05;18;\"1ère ligne\""; - List<Row> rows = importContent(new SimpleImportModel(), content); + 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"); } @@ -84,7 +84,7 @@ "2011-12-05;18;\"1ère ligne\"\n" + "2011-12-06;19;\"2ème ligne\"\n" + "2011-12-07;21;\"3ème ligne\""; - List<Row> rows = importContent(new SimpleImportModel(), content); + 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"); @@ -101,21 +101,21 @@ "2011-12-05;18;\"1ère ligne\"\n" + "2011-12-06;19;\"2ème ligne\"\n" + "2011-12-07;21;\"3ème ligne\""; - List<Row> rows = importContent(new ColumnImportModel(), content); + 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"); } - protected List<Row> importContent(ImportModel<Row> model, + protected List<RowBean> importContent(ImportModel<RowBean> model, String content) throws IOException { Reader reader = new StringReader(content); try { - Import<Row> rowImport = Import.newImport(model, reader); + Import<RowBean> rowImport = Import.newImport(model, reader); try { - List<Row> result = new ArrayList<Row>(); - for (Row row : rowImport) { + List<RowBean> result = new ArrayList<RowBean>(); + for (RowBean row : rowImport) { result.add(row); } return result; @@ -127,78 +127,15 @@ } } - private void assertRowEquals(Row row, Date date, Integer number, String title) { + private void assertRowEquals(RowBean row, Date date, Integer number, String title) { Assert.assertEquals(date, row.getDate()); Assert.assertEquals(number, row.getNumber()); Assert.assertEquals(title, row.getTitle()); } - public static class Row { + private static class ColumnImportModel implements ImportModel<RowBean> { - private Date date; - - private String title; - - private Integer number; - - public Row() { - } - - public Row(Date date, String title, Integer number) { - this.date = date; - this.title = title; - this.number = number; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Integer getNumber() { - return number; - } - - public void setNumber(Integer number) { - this.number = number; - } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Row)) return false; - - Row row = (Row) o; - - if (!date.equals(row.date)) return false; - if (!number.equals(row.number)) return false; - return title.equals(row.title); - - } - - @Override - public int hashCode() { - int result = date.hashCode(); - result = 31 * result + title.hashCode(); - result = 31 * result + number.hashCode(); - return result; - } - } - - private static class ColumnImportModel implements ImportModel<Row> { - - @Override public char getSeparator() { return ';'; } @@ -208,14 +145,14 @@ } @Override - public Row newEmptyInstance() { - return new Row(); + public RowBean newEmptyInstance() { + return new RowBean(); } @SuppressWarnings({"unchecked"}) @Override - public Collection<ImportableColumn<Row, Object>> getColumnsForImport() { - List<ImportableColumn<Row, Object>> result = new ArrayList<ImportableColumn<Row, Object>>(); + public Collection<ImportableColumn<RowBean, Object>> getColumnsForImport() { + List<ImportableColumn<RowBean, Object>> result = new ArrayList<ImportableColumn<RowBean, Object>>(); // Column types are not checked but safe because Object is necessary, and element type is always Row result.add(getTitleColumn()); result.add(getNumberColumn()); @@ -251,9 +188,9 @@ } @SuppressWarnings({"UnusedParameters"}) - private <T> ValueSetter<Row, T> withBeanSetter(String propertyName, Class<T> propertyClass) { + private <T> ValueSetter<RowBean, T> withBeanSetter(String propertyName, Class<T> propertyClass) { // propertyClass is not used but useful to check type - return new BeanProperty<Row, T>(propertyName); + return new BeanProperty<RowBean, T>(propertyName); } private ValueParser<Date> withDateParser() { @@ -268,7 +205,7 @@ } } - private static class SimpleImportModel implements ImportModel<Row> { + private static class SimpleImportModel implements ImportModel<RowBean> { private Log log = LogFactory.getLog(SimpleImportModel.class); @@ -285,21 +222,21 @@ } @Override - public Row newEmptyInstance() { - return new Row(); + public RowBean newEmptyInstance() { + return new RowBean(); } @Override - public Collection<ImportableColumn<Row, Object>> getColumnsForImport() { - List<ImportableColumn<Row, Object>> result = new ArrayList<ImportableColumn<Row, Object>>(); + public Collection<ImportableColumn<RowBean, Object>> getColumnsForImport() { + List<ImportableColumn<RowBean, Object>> result = new ArrayList<ImportableColumn<RowBean, Object>>(); result.add(getTitleImportable()); result.add(getNumberImportable()); result.add(getDateImportable()); return result; } - private ImportableColumn<Row, Object> getTitleImportable() { - return new AbstractImportableColumn<Row, String>() { + private ImportableColumn<RowBean, Object> getTitleImportable() { + return new AbstractImportableColumn<RowBean, String>() { @Override public String getHeaderName() { @@ -322,7 +259,7 @@ } @Override - public void update(Row object, + public void update(RowBean object, String value) throws Exception { object.setTitle(value); @@ -330,8 +267,8 @@ }; } - private ImportableColumn<Row, Object> getDateImportable() { - return new AbstractImportableColumn<Row, Date>() { + private ImportableColumn<RowBean, Object> getDateImportable() { + return new AbstractImportableColumn<RowBean, Date>() { @Override public String getHeaderName() { @@ -355,7 +292,7 @@ } @Override - public void update(Row object, + public void update(RowBean object, Date value) throws Exception { object.setDate(value); @@ -363,8 +300,8 @@ }; } - private ImportableColumn<Row, Object> getNumberImportable() { - return new AbstractImportableColumn<Row, Integer>() { + private ImportableColumn<RowBean, Object> getNumberImportable() { + return new AbstractImportableColumn<RowBean, Integer>() { @Override public String getHeaderName() { @@ -387,7 +324,7 @@ } @Override - public void update(Row object, + public void update(RowBean object, Integer value) throws Exception { object.setNumber(value); Added: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java (rev 0) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBean.java 2012-01-17 11:08:01 UTC (rev 2287) @@ -0,0 +1,66 @@ +package org.nuiton.util.csv; + +import java.util.Date; + +public class RowBean { + + private Date date; + + private String title; + + private Integer number; + + public RowBean() { + } + + public RowBean(Date date, String title, Integer number) { + this.date = date; + this.title = title; + this.number = number; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof RowBean)) return false; + + RowBean row = (RowBean) o; + + if (!date.equals(row.date)) return false; + if (!number.equals(row.number)) return false; + return title.equals(row.title); + + } + + @Override + public int hashCode() { + int result = date.hashCode(); + result = 31 * result + title.hashCode(); + result = 31 * result + number.hashCode(); + return result; + } +} Added: trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanExportModel.java =================================================================== --- trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanExportModel.java (rev 0) +++ trunk/nuiton-csv/src/test/java/org/nuiton/util/csv/RowBeanExportModel.java 2012-01-17 11:08:01 UTC (rev 2287) @@ -0,0 +1,18 @@ +package org.nuiton.util.csv; + +class RowBeanExportModel implements ExportModel<RowBean> { + + @Override + public char getSeparator() { + return ';'; + } + + @Override + public Iterable<ExportableColumn<RowBean, Object>> getColumnsForExport() { + ModelBuilder<RowBean> modelBuilder = new ModelBuilder<RowBean>(); + modelBuilder.newColumnForExport("DATE", "date", Common.DAY); + modelBuilder.newColumnForExport("TITLE", "title"); + modelBuilder.newColumnForExport("NUMBER", "number", Common.INTEGER); + return (Iterable) modelBuilder.getColumnsForExport(); + } +}

1 0

r2286 - trunk/nuiton-csv/src/main/java/org/nuiton/util/csv
by bleny＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: bleny Date: 2012-01-17 12:07:34 +0100 (Tue, 17 Jan 2012) New Revision: 2286 Url: http://nuiton.org/repositories/revision/nuiton-utils/2286 Log: #1909 Stream in nuiton-csv export is not flushed Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Export.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Export.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Export.java 2012-01-17 08:44:46 UTC (rev 2285) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/Export.java 2012-01-17 11:07:34 UTC (rev 2286) @@ -162,7 +162,11 @@ public void write(OutputStream outputStream, Charset charset) throws Exception { Writer writer = new OutputStreamWriter(outputStream, charset); - write(writer); + try { + write(writer); + } finally { + writer.close(); + } } public void write(OutputStream outputStream) throws Exception { @@ -184,9 +188,9 @@ public String toString(Charset charset) throws Exception { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream, charset); - write(outputStreamWriter); - String result = new String(outputStream.toByteArray(), charset); + write(outputStream, charset); + byte[] bytes = outputStream.toByteArray(); + String result = new String(bytes, charset); return result; }

1 0

r2285 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: maven-release Date: 2012-01-17 09:44:46 +0100 (Tue, 17 Jan 2012) New Revision: 2285 Url: http://nuiton.org/repositories/revision/nuiton-utils/2285 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/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-01-17 08:44:45 UTC (rev 2284) +++ trunk/nuiton-csv/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-01-17 08:44:45 UTC (rev 2284) +++ trunk/nuiton-profiling/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-01-17 08:44:45 UTC (rev 2284) +++ trunk/nuiton-utils/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-01-17 08:44:45 UTC (rev 2284) +++ trunk/nuiton-validator/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 08:44:45 UTC (rev 2284) +++ trunk/pom.xml 2012-01-17 08:44:46 UTC (rev 2285) @@ -35,7 +35,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3</version> + <version>2.4.4-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -214,12 +214,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-2.4.3 + 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.4.3 + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-2.…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <distributionManagement>

1 0

r2284 - in tags: . nuiton-utils-2.4.3
by maven-release＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: maven-release Date: 2012-01-17 09:44:45 +0100 (Tue, 17 Jan 2012) New Revision: 2284 Url: http://nuiton.org/repositories/revision/nuiton-utils/2284 Log: [maven-release-plugin] copy for tag nuiton-utils-2.4.3 Added: tags/nuiton-utils-2.4.3/ Property changes on: tags/nuiton-utils-2.4.3 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2283 - in trunk: . nuiton-csv nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: maven-release Date: 2012-01-17 09:44:44 +0100 (Tue, 17 Jan 2012) New Revision: 2283 Url: http://nuiton.org/repositories/revision/nuiton-utils/2283 Log: [maven-release-plugin] prepare release nuiton-utils-2.4.3 Modified: trunk/nuiton-csv/pom.xml trunk/nuiton-profiling/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-01-17 08:42:50 UTC (rev 2282) +++ trunk/nuiton-csv/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>nuiton-csv</artifactId> Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2012-01-17 08:42:50 UTC (rev 2282) +++ trunk/nuiton-profiling/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2012-01-17 08:42:50 UTC (rev 2282) +++ trunk/nuiton-utils/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2012-01-17 08:42:50 UTC (rev 2282) +++ trunk/nuiton-validator/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-17 08:42:50 UTC (rev 2282) +++ trunk/pom.xml 2012-01-17 08:44:44 UTC (rev 2283) @@ -35,7 +35,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.4.3</version> <modules> <module>nuiton-utils</module> @@ -214,12 +214,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.4.3 </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.4.3 </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.…</url> </scm> <distributionManagement>

1 0