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

r1870 - trunk/src/main/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org 28 May '10

28 May '10

Author: tchemit Date: 2010-05-28 12:13:06 +0200 (Fri, 28 May 2010) New Revision: 1870 Url: http://nuiton.org/repositories/revision/nuiton-utils/1870 Log: fix bug (too much code...) Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-05-25 13:41:02 UTC (rev 1869) +++ trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-05-28 10:13:06 UTC (rev 1870) @@ -209,7 +209,7 @@ */ public void copy(I source, O target, String... propertyNames) { copy(source, target, false, propertyNames); - } + } /** * Copy properties from a source bean to a destination one according to @@ -236,24 +236,24 @@ * Note: If {@code from} object is null, then {@code null} values * will be set to mapped properties into {@code dst}. * - * @param source the bean to read - * @param target the bean to write + * @param source the bean to read + * @param target the bean to write * @param excludeProperties true to exclude following {@code propertyNames} - * @param propertyNames optional subset of properties to copy (if none is - * specifed, will use all the properties defined in - * binder) + * @param propertyNames optional subset of properties to copy (if none is + * specifed, will use all the properties defined in + * binder) * @throws NullPointerException if target parameter is {@code null} */ protected void copy(I source, O target, boolean excludeProperties, - String... propertyNames) + String... propertyNames) throws NullPointerException { if (target == null) { throw new NullPointerException("parameter 'target' can no be null"); } propertyNames = excludeProperties ? - getAllPropertiesExclude(propertyNames) : - getProperties(propertyNames); + getAllPropertiesExclude(propertyNames) : + getProperties(propertyNames); for (String sourceProperty : propertyNames) { @@ -288,10 +288,6 @@ // specific collection strategy is set, must use it read = getCollectionValue(sourceProperty, read); } - if (model.containsCollectionProperty(sourceProperty)) { - // specific collection strategy is set, must use it - read = getCollectionValue(sourceProperty, read); - } model.getTargetWriteMethod(targetProperty).invoke(target, read); } catch (IllegalAccessException e) { throw new RuntimeException(e); @@ -350,10 +346,10 @@ } /** - * Obtains all properties from binder's model except those {@code + * Obtains all properties from binder's model except those {@code * propertyNameExcludes}. Unknown properties will be ignored. * - * @param propertyNameExcludes name of properties to exclude + * @param propertyNameExcludes name of properties to exclude * @return the array of property names without those in argument */ protected String[] getAllPropertiesExclude(String... propertyNameExcludes) { @@ -361,7 +357,7 @@ List<String> results = new ArrayList<String>(); for (String propertyName : model.getSourceDescriptors()) { if (!excludes.contains(propertyName)) { - results.add(propertyName); + results.add(propertyName); } } return results.toArray(new String[results.size()]);

1 0

r1869 - trunk/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org 25 May '10

25 May '10

Author: sletellier Date: 2010-05-25 15:41:02 +0200 (Tue, 25 May 2010) New Revision: 1869 Url: http://nuiton.org/repositories/revision/nuiton-utils/1869 Log: Add 3 method to get the difference between two dates in second, minutes and hours Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-05-25 13:36:14 UTC (rev 1868) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-05-25 13:41:02 UTC (rev 1869) @@ -87,8 +87,8 @@ * The month is the real month of the year and not the one which is stored * in Calendar object. * @param s value of the seconds 1-60 - * @param dd value of the minutes 1-60 - * @param dd value of the hours 1-24 + * @param m value of the minutes 1-60 + * @param h value of the hours 1-24 * @param dd value of the day 1-31 * @param mm value of the month 1-12 * @param yy value of the year 0-9999

1 0

r1868 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by sletellier＠users.nuiton.org 25 May '10

25 May '10

Author: sletellier Date: 2010-05-25 15:36:14 +0200 (Tue, 25 May 2010) New Revision: 1868 Url: http://nuiton.org/repositories/revision/nuiton-utils/1868 Log: Add 3 method to get the difference between two dates in second, minutes and hours Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java trunk/src/test/java/org/nuiton/util/DateUtilsTest.java Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-05-20 14:34:45 UTC (rev 1867) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-05-25 13:36:14 UTC (rev 1868) @@ -85,6 +85,29 @@ /** * Create a new date from day, month and year (French version). * The month is the real month of the year and not the one which is stored + * in Calendar object. + * @param s value of the seconds 1-60 + * @param dd value of the minutes 1-60 + * @param dd value of the hours 1-24 + * @param dd value of the day 1-31 + * @param mm value of the month 1-12 + * @param yy value of the year 0-9999 + * @return a new date + */ + public static Date createDate(int s, int m, int h, int dd, int mm, int yy) { + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.YEAR, yy); + calendar.set(Calendar.MONTH, mm-1); + calendar.set(Calendar.DAY_OF_MONTH, dd); + calendar.set(Calendar.HOUR_OF_DAY, h); + calendar.set(Calendar.MINUTE, m); + calendar.set(Calendar.SECOND, s); + return calendar.getTime(); + } + + /** + * Create a new date from day, month and year (French version). + * The month is the real month of the year and not the one which is stored * in Calendar object. Time is set to 00:00:00.000 * @param dd value of the day 1-31 * @param mm value of the month 1-12 @@ -221,6 +244,50 @@ /** * Do the difference between the two dates in argument. The result is a number + * of seconds between the two dates. + * + * @param beginDate first date + * @param endDate second date + * @return a number of seconds between beginDate and endDate + */ + public static int getDifferenceInSeconds(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + return (int) Math.ceil((end - begin) / 1000); + } + + /** + * Do the difference between the two dates in argument. The result is a number + * of minutes between the two dates. + * + * @param beginDate first date + * @param endDate second date + * @return a number of minutes between beginDate and endDate + */ + public static int getDifferenceInMinutes(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + // 60000 = 60 * 1000 + return (int) Math.ceil((end - begin) / 60000); + } + + /** + * Do the difference between the two dates in argument. The result is a number + * of hours between the two dates. + * + * @param beginDate first date + * @param endDate second date + * @return a number of hours between beginDate and endDate + */ + public static int getDifferenceInHours(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + // 3600000 = 60 * 60 * 1000 + return (int) Math.ceil((end - begin) / 3600000); + } + + /** + * Do the difference between the two dates in argument. The result is a number * of days between the two dates. * Ex : 28/01/2009 and 08/02/2009 return 11. * @@ -249,7 +316,7 @@ int count = 0; Calendar fromCalendar = getDefaultCalendar(beginDate); Calendar thruCalendar = getDefaultCalendar(endDate); - + while (fromCalendar.before(thruCalendar)) { fromCalendar.add(Calendar.MONTH, 1); count++; @@ -279,7 +346,7 @@ } /** - * Get the date before today (so yesterday no ?) + * Get the date before today * * @param date concerned * @return Date before today Modified: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-05-20 14:34:45 UTC (rev 1867) +++ trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-05-25 13:36:14 UTC (rev 1868) @@ -178,6 +178,57 @@ } @Test + public void testGetDifferenceInSeconds() { + System.out.println("getDifferenceInSecondes"); + + Date beginDate = DateUtils.createDate(30, 10, 0, 3, 2, 2009); + Date endDate = DateUtils.createDate(00, 11, 0, 3, 2, 2009); + + int result = DateUtils.getDifferenceInSeconds(beginDate, endDate); + Assert.assertEquals(30, result); + + beginDate = DateUtils.createDate(9, 28, 0, 28, 1, 2009); + endDate = DateUtils.createDate(50, 30, 0, 28, 1, 2009); + + result = DateUtils.getDifferenceInSeconds(beginDate, endDate); + Assert.assertEquals(161, result); + } + + @Test + public void testGetDifferenceInMinutes() { + System.out.println("getDifferenceInMinutes"); + + Date beginDate = DateUtils.createDate(30, 10, 0, 3, 2, 2009); + Date endDate = DateUtils.createDate(00, 12, 0, 3, 2, 2009); + + int result = DateUtils.getDifferenceInMinutes(beginDate, endDate); + Assert.assertEquals(1, result); + + beginDate = DateUtils.createDate(9, 28, 0, 28, 1, 2009); + endDate = DateUtils.createDate(50, 30, 0, 28, 1, 2009); + + result = DateUtils.getDifferenceInMinutes(beginDate, endDate); + Assert.assertEquals(2, result); + } + + @Test + public void testGetDifferenceInHours() { + System.out.println("getDifferenceInHours"); + + Date beginDate = DateUtils.createDate(30, 10, 0, 3, 2, 2009); + Date endDate = DateUtils.createDate(00, 11, 0, 4, 2, 2009); + + int result = DateUtils.getDifferenceInHours(beginDate, endDate); + Assert.assertEquals(24, result); + + beginDate = DateUtils.createDate(9, 28, 0, 28, 1, 2009); + endDate = DateUtils.createDate(50, 30, 8, 28, 1, 2009); + + result = DateUtils.getDifferenceInHours(beginDate, endDate); + Assert.assertEquals(8, result); + } + + @Test public void testGetDifferenceInDays() { System.out.println("getDifferenceInDays");

1 0

r1867 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 20 May '10

20 May '10

Author: echatellier Date: 2010-05-20 16:34:45 +0200 (Thu, 20 May 2010) New Revision: 1867 Url: http://nuiton.org/repositories/revision/nuiton-utils/1867 Log: Load both SystemClassLoader and currentclassloader Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-05-20 13:52:30 UTC (rev 1866) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-05-20 14:34:45 UTC (rev 1867) @@ -1465,19 +1465,21 @@ Enumeration<URL> enumInClasspath = ClassLoader.getSystemClassLoader().getResources(filename); List<URL> urlsInClasspath = EnumerationUtils.toList(enumInClasspath); + enumInClasspath = ApplicationConfig.class.getClassLoader().getResources(filename); + urlsInClasspath.addAll(EnumerationUtils.toList(enumInClasspath)); + + if (log.isDebugEnabled() && urlsInClasspath.isEmpty()) { + log.debug("No configuration file found in classpath : /" + filename); + } + + /* TODO EC20100515 not sure if it's usefull :( if (urlsInClasspath.isEmpty()) { URL inClasspath = ApplicationConfig.class.getResource("/" + filename); if (inClasspath != null) { urlsInClasspath.add(inClasspath); } - else { - if (log.isDebugEnabled()) { - log.debug("No configuration file found in classpath : /" + - filename); - } - } - } + }*/ for (URL inClasspath : urlsInClasspath) { if (log.isInfoEnabled()) { log.info("Loading configuration file (classpath) : " +

1 0

r1866 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 20 May '10

20 May '10

Author: echatellier Date: 2010-05-20 15:52:30 +0200 (Thu, 20 May 2010) New Revision: 1866 Url: http://nuiton.org/repositories/revision/nuiton-utils/1866 Log: #627 : Support multiples loading from classpath Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-05-18 15:39:59 UTC (rev 1865) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-05-20 13:52:30 UTC (rev 1866) @@ -27,6 +27,7 @@ package org.nuiton.util; import org.apache.commons.beanutils.ConstructorUtils; +import org.apache.commons.collections.EnumerationUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,6 +50,7 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; +import java.util.Enumeration; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -1460,13 +1462,23 @@ // classpath String filename = getConfigFileName(); - URL inClasspath = - ClassLoader.getSystemClassLoader().getResource(filename); - if (inClasspath == null) { - inClasspath = ApplicationConfig.class.getResource("/" + + Enumeration<URL> enumInClasspath = ClassLoader.getSystemClassLoader().getResources(filename); + List<URL> urlsInClasspath = EnumerationUtils.toList(enumInClasspath); + + if (urlsInClasspath.isEmpty()) { + URL inClasspath = ApplicationConfig.class.getResource("/" + filename); + if (inClasspath != null) { + urlsInClasspath.add(inClasspath); + } + else { + if (log.isDebugEnabled()) { + log.debug("No configuration file found in classpath : /" + + filename); + } + } } - if (inClasspath != null) { + for (URL inClasspath : urlsInClasspath) { if (log.isInfoEnabled()) { log.info("Loading configuration file (classpath) : " + inClasspath); @@ -1478,12 +1490,6 @@ stream.close(); } } - else { - if (log.isDebugEnabled()) { - log.debug("No configuration file found in classpath : /" + - filename); - } - } // system directory File etcConfig = getSystemConfigFile();

1 0

r1865 - trunk/src/site/apt
by echatellier＠users.nuiton.org 18 May '10

18 May '10

Author: echatellier Date: 2010-05-18 17:39:59 +0200 (Tue, 18 May 2010) New Revision: 1865 Url: http://nuiton.org/repositories/revision/nuiton-utils/1865 Log: Revert previous commit : aggregate version is the one to use Modified: trunk/src/site/apt/Warlauncher.apt Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2010-05-18 15:39:45 UTC (rev 1864) +++ trunk/src/site/apt/Warlauncher.apt 2010-05-18 15:39:59 UTC (rev 1865) @@ -123,7 +123,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> + <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> <version>7.1.0.v20100505</version> <scope>provided</scope>

1 0

r1864 - in trunk: . src/site/apt
by echatellier＠users.nuiton.org 18 May '10

18 May '10

Author: echatellier Date: 2010-05-18 17:39:45 +0200 (Tue, 18 May 2010) New Revision: 1864 Url: http://nuiton.org/repositories/revision/nuiton-utils/1864 Log: Revert previous commit : aggregate version is the one to use Modified: trunk/pom.xml trunk/src/site/apt/Warlauncher.apt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-18 13:47:14 UTC (rev 1863) +++ trunk/pom.xml 2010-05-18 15:39:45 UTC (rev 1864) @@ -97,7 +97,7 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> + <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> <version>7.1.0.v20100505</version> <scope>provided</scope> Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2010-05-18 13:47:14 UTC (rev 1863) +++ trunk/src/site/apt/Warlauncher.apt 2010-05-18 15:39:45 UTC (rev 1864) @@ -160,7 +160,7 @@ </includes> </overlay> <overlay> - <groupId>org.eclipse.jetty</groupId> + <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> <type>jar</type> </overlay>

1 0

r1863 - in trunk: . src/site/apt
by echatellier＠users.nuiton.org 18 May '10

18 May '10

Author: echatellier Date: 2010-05-18 15:47:14 +0200 (Tue, 18 May 2010) New Revision: 1863 Url: http://nuiton.org/repositories/revision/nuiton-utils/1863 Log: org.eclipse.jetty:jetty-webapp seam to work better then org.eclipse.jetty.aggregate:jetty-webapp Modified: trunk/pom.xml trunk/src/site/apt/Warlauncher.apt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-17 08:57:34 UTC (rev 1862) +++ trunk/pom.xml 2010-05-18 13:47:14 UTC (rev 1863) @@ -97,7 +97,7 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <version>7.1.0.v20100505</version> <scope>provided</scope> Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2010-05-17 08:57:34 UTC (rev 1862) +++ trunk/src/site/apt/Warlauncher.apt 2010-05-18 13:47:14 UTC (rev 1863) @@ -59,7 +59,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.1.2</version> + <version>1.3</version> <scope>provided</scope> </dependency> <dependency> @@ -119,13 +119,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.1.2</version> + <version>1.3</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>7.0.1.v20091125</version> + <version>7.1.0.v20100505</version> <scope>provided</scope> </dependency> <dependency> @@ -160,7 +160,7 @@ </includes> </overlay> <overlay> - <groupId>org.eclipse.jetty.aggregate</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> <type>jar</type> </overlay>

1 0

r1862 - trunk
by echatellier＠users.nuiton.org 17 May '10

17 May '10

Author: echatellier Date: 2010-05-17 10:57:34 +0200 (Mon, 17 May 2010) New Revision: 1862 Url: http://nuiton.org/repositories/revision/nuiton-utils/1862 Log: Update to jetty 7.1.0.v20100505 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-12 20:16:51 UTC (rev 1861) +++ trunk/pom.xml 2010-05-17 08:57:34 UTC (rev 1862) @@ -99,7 +99,7 @@ <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> - <version>7.0.1.v20091125</version> + <version>7.1.0.v20100505</version> <scope>provided</scope> </dependency>

1 0

r1861 - in trunk/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util/beans
by fdesbois＠users.nuiton.org 12 May '10

12 May '10

Author: fdesbois Date: 2010-05-12 22:16:51 +0200 (Wed, 12 May 2010) New Revision: 1861 Url: http://nuiton.org/repositories/revision/nuiton-utils/1861 Log: Evo #605 : add copyExcluding method in Binder Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java trunk/src/test/java/org/nuiton/util/beans/BinderTest.java Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-05-11 14:42:58 UTC (rev 1860) +++ trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-05-12 20:16:51 UTC (rev 1861) @@ -33,9 +33,11 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -192,7 +194,8 @@ /** * Copy properties from a source bean to a destination one according to - * the model of the binder. + * the model of the binder. If {@code propertyNames} is defined, only + * those properties will be copied. * * Note: If {@code from} object is null, then {@code null} values * will be set to mapped properties into {@code dst} @@ -204,13 +207,53 @@ * binder) * @throws NullPointerException if target parameter is {@code null} */ - public void copy(I source, O target, String... propertyNames) + public void copy(I source, O target, String... propertyNames) { + copy(source, target, false, propertyNames); + } + + /** + * Copy properties from a source bean to a destination one according to + * the model of the binder excluding {@code propertyNames}. + * + * Note: If {@code from} object is null, then {@code null} values + * will be set to mapped properties into {@code dst}. + * + * @param source the bean to read + * @param target the bean to write + * @param propertyNames optional subset of properties to copy (if none is + * specifed, will use all the properties defined in + * binder) + * @throws NullPointerException if target parameter is {@code null} + */ + public void copyExcluding(I source, O target, String... propertyNames) { + copy(source, target, true, propertyNames); + } + + /** + * Copy properties from a source bean to a destination one according to + * the model of the binder. + * + * Note: If {@code from} object is null, then {@code null} values + * will be set to mapped properties into {@code dst}. + * + * @param source the bean to read + * @param target the bean to write + * @param excludeProperties true to exclude following {@code propertyNames} + * @param propertyNames optional subset of properties to copy (if none is + * specifed, will use all the properties defined in + * binder) + * @throws NullPointerException if target parameter is {@code null} + */ + protected void copy(I source, O target, boolean excludeProperties, + String... propertyNames) throws NullPointerException { if (target == null) { throw new NullPointerException("parameter 'target' can no be null"); } - propertyNames = getProperties(propertyNames); + propertyNames = excludeProperties ? + getAllPropertiesExclude(propertyNames) : + getProperties(propertyNames); for (String sourceProperty : propertyNames) { @@ -306,6 +349,24 @@ return propertyNames; } + /** + * Obtains all properties from binder's model except those {@code + * propertyNameExcludes}. Unknown properties will be ignored. + * + * @param propertyNameExcludes name of properties to exclude + * @return the array of property names without those in argument + */ + protected String[] getAllPropertiesExclude(String... propertyNameExcludes) { + List<String> excludes = Arrays.asList(propertyNameExcludes); + List<String> results = new ArrayList<String>(); + for (String propertyName : model.getSourceDescriptors()) { + if (!excludes.contains(propertyName)) { + results.add(propertyName); + } + } + return results.toArray(new String[results.size()]); + } + protected Object getCollectionValue(String sourceProperty, Object readValue) { CollectionStrategy strategy = model.getCollectionStrategy(sourceProperty); Modified: trunk/src/test/java/org/nuiton/util/beans/BinderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/beans/BinderTest.java 2010-05-11 14:42:58 UTC (rev 1860) +++ trunk/src/test/java/org/nuiton/util/beans/BinderTest.java 2010-05-12 20:16:51 UTC (rev 1861) @@ -148,4 +148,41 @@ Assert.assertEquals(0,b.getE2()); } + + @Test + public void testCopyExcluding() throws Exception { + + a.setA(VALUE_A); + a.setB(VALUE_B); + a.setC(VALUE_C); + a.setE(VALUE_E); + + // #1 : Copy all properties defined by binderB instead of PROPERTY_A + binderB.copyExcluding(a, b, BeanA.PROPERTY_A); + Assert.assertNull(b.getA()); + // same result as copy + Assert.assertEquals(VALUE_B, b.getB()); + Assert.assertNull(b.getC()); + Assert.assertEquals(VALUE_C, b.getC2()); + Assert.assertEquals(VALUE_E, b.getE2()); + + // #2 : Copy all properties : same as binderB.copy(a, b); + binderB.copyExcluding(a, b); + // same result as copy + Assert.assertEquals(VALUE_A, b.getA()); + Assert.assertEquals(VALUE_B, b.getB()); + Assert.assertNull(b.getC()); + Assert.assertEquals(VALUE_C, b.getC2()); + Assert.assertEquals(VALUE_E, b.getE2()); + + // #3 : Copy all properties, excluding one is not considered from source + binderB.copyExcluding(a, b, BeanB.PROPERTY_C2); + // same result as copy + Assert.assertEquals(VALUE_A, b.getA()); + Assert.assertEquals(VALUE_B, b.getB()); + Assert.assertNull(b.getC()); + Assert.assertEquals(VALUE_C, b.getC2()); + Assert.assertEquals(VALUE_E, b.getE2()); + + } }

1 0