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

r2228 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org 18 Nov '11

18 Nov '11

Author: sletellier Date: 2011-11-18 12:25:39 +0100 (Fri, 18 Nov 2011) New Revision: 2228 Url: http://nuiton.org/repositories/revision/nuiton-utils/2228 Log: - #1811 add methods to escape CSV data Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-11-15 11:08:33 UTC (rev 2227) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-11-18 11:25:39 UTC (rev 2228) @@ -499,6 +499,18 @@ } /** + * Load all default options of enum pass in param (enum must extend {@link OptionDef}) + * + * @param optionClasses to load + * @param <O> type of enum extend {@link OptionDef} + */ + public <O extends OptionDef> void loadAllDefaultOptions(Class<O>[] optionClasses) { + for (Class<O> optionClass : optionClasses) { + loadDefaultOptions(optionClass); + } + } + + /** * Load default options of enum pass in param (enum must extend {@link OptionDef}) * * @param optionClass to load @@ -515,6 +527,18 @@ } /** + * Load all actions of enum pass in param (enum must extend {@link ActionDef}) + * + * @param actionClasses to load + * @param <A> type of enum extend {@link ActionDef} + */ + public <A extends ActionDef> void loadAllActions(Class<A>[] actionClasses) { + for (Class<A> optionClass : actionClasses) { + loadActions(optionClass); + } + } + + /** * Load actions of enum pass in param (enum must extend {@link ActionDef}) * * @param actionClass to load Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2011-11-15 11:08:33 UTC (rev 2227) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/StringUtil.java 2011-11-18 11:25:39 UTC (rev 2228) @@ -83,6 +83,30 @@ } /** + * Add cotes if needed to escape special csv chars (',', '\n', '\t', ',', ';') + * + * @param value to escape + * @param csvSeparator separator used for csv + * @return escaped if needed value + */ + public static String escapeCsvValue(String value, String csvSeparator) { + + boolean valueNeedQuotes = + value.contains("\n") + || value.contains("\t") + || value.contains(",") + || value.contains(";") + || value.contains(csvSeparator); + + if (valueNeedQuotes) { + // escape '"' char to prevent + value = value.replaceAll("\"", "\"\""); + value = "\"" + value + "\""; + } + return value; + } + + /** * Contract to use in {@link StringUtil#join(Iterable , ToString, String, boolean) } * method. This will provide a toString method to convert an object in a * string. @@ -101,6 +125,39 @@ } /** + * Used to build csv file using {@link StringUtil#join(Iterable , ToString, String, boolean) } + * method. This will provide a toString method to convert an object in a + * string and escape csv values if needed. + * + * @param <O> type of object manipulated + */ + public static class ToCSV<O> implements StringUtil.ToString<O> { + + protected String csvSeparator; + + public ToCSV(String csvSeparator) { + this.csvSeparator = csvSeparator; + } + + @Override + public String toString(O o) { + String value = getStringValue(o); + return escapeCsvValue(value, csvSeparator); + } + + /** + * Use {@link Object#toString()} method by default + * Must be {@link @Override} to use other methods to get string value. + * + * @param o to convert + * @return String value + */ + public String getStringValue(O o) { + return o.toString(); + } + } + + /** * Used to concat an {@code iterable} of Object separated * by {@code separator} using the toString() method of each object. * You can specify if the string must be trimmed or not.

1 0

r2227 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by ymartel＠users.nuiton.org 15 Nov '11

15 Nov '11

Author: ymartel Date: 2011-11-15 12:08:33 +0100 (Tue, 15 Nov 2011) New Revision: 2227 Url: http://nuiton.org/repositories/revision/nuiton-utils/2227 Log: Anomalie #1634 : In PeriodDates setters, check Chronological Order of dates Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/PeriodDates.java trunk/nuiton-utils/src/test/java/org/nuiton/util/PeriodDatesTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/PeriodDates.java 2011-11-13 15:14:17 UTC (rev 2226) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/PeriodDates.java 2011-11-15 11:08:33 UTC (rev 2227) @@ -144,7 +144,10 @@ public void setFromDate(Date fromDate) { //this.fromDate = fromDate; if (fromDate != null) { - if (fromCalendar == null) { + if (thruCalendar != null && fromDate.after(thruCalendar.getTime())) { + throw new IllegalArgumentException("The fromDate can't be after the thruDate !"); + } + if (fromCalendar == null) { fromCalendar = Calendar.getInstance(); } fromCalendar.setTime(fromDate); @@ -164,7 +167,10 @@ public void setThruDate(Date thruDate) { //this.thruDate = thruDate; if (thruDate != null) { - if (thruCalendar == null) { + if (fromCalendar != null && thruDate.before(fromCalendar.getTime())) { + throw new IllegalArgumentException("The thruDate can't be before the fromDate !"); + } + if (thruCalendar == null) { thruCalendar = Calendar.getInstance(); } thruCalendar.setTime(thruDate); Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/PeriodDatesTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/PeriodDatesTest.java 2011-11-13 15:14:17 UTC (rev 2226) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/PeriodDatesTest.java 2011-11-15 11:08:33 UTC (rev 2227) @@ -100,8 +100,7 @@ } } - @Ignore("to be done as described in issue #1634") - @Test(timeout = 60 * 1000) + @Test(timeout = 60 * 1000, expected = IllegalArgumentException.class) public void whatIfPeriodDatesIsNotInChronologicalOrder() { Date january = DateUtil.createDate(1, 1, 2011); Date december = DateUtil.createDate(1, 12, 2011); @@ -118,8 +117,19 @@ PeriodDates periodDates = new PeriodDates(); periodDates.setFromDate(december); periodDates.setThruDate(january); - periodDates.getMonths(); // infinite loop ! } + @Test(expected = IllegalArgumentException.class) + public void testSetFromDateAfterThruDate() { + Date january = DateUtil.createDate(1, 1, 2011); + Date december = DateUtil.createDate(1, 12, 2011); + PeriodDates periodDates = new PeriodDates(); + // Set thruDate before setting fromDate + periodDates.setThruDate(january); + // FromDate is after thruDate : should throw IllegalArgumentException + periodDates.setFromDate(december); + } + + }

1 0

r2226 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: maven-release Date: 2011-11-13 16:14:17 +0100 (Sun, 13 Nov 2011) New Revision: 2226 Url: http://nuiton.org/repositories/revision/nuiton-utils/2226 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-11-13 15:14:16 UTC (rev 2225) +++ trunk/nuiton-profiling/pom.xml 2011-11-13 15:14:17 UTC (rev 2226) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3.1</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-11-13 15:14:16 UTC (rev 2225) +++ trunk/nuiton-utils/pom.xml 2011-11-13 15:14:17 UTC (rev 2226) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3.1</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-11-13 15:14:16 UTC (rev 2225) +++ trunk/nuiton-validator/pom.xml 2011-11-13 15:14:17 UTC (rev 2226) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3.1</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-13 15:14:16 UTC (rev 2225) +++ trunk/pom.xml 2011-11-13 15:14:17 UTC (rev 2226) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.3.1</version> + <version>2.4-SNAPSHOT</version> <modules> <module>nuiton-utils</module> @@ -206,12 +206,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-parent-2.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-parent-2.3… + scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-pa…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <distributionManagement>

1 0

r2225 - in tags: . nuiton-utils-parent-2.3.1
by maven-release＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: maven-release Date: 2011-11-13 16:14:16 +0100 (Sun, 13 Nov 2011) New Revision: 2225 Url: http://nuiton.org/repositories/revision/nuiton-utils/2225 Log: [maven-release-plugin] copy for tag nuiton-utils-parent-2.3.1 Added: tags/nuiton-utils-parent-2.3.1/ Property changes on: tags/nuiton-utils-parent-2.3.1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir Added: svn:mergeinfo +

1 0

r2224 - in trunk: . nuiton-profiling nuiton-utils nuiton-validator
by maven-release＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: maven-release Date: 2011-11-13 16:14:15 +0100 (Sun, 13 Nov 2011) New Revision: 2224 Url: http://nuiton.org/repositories/revision/nuiton-utils/2224 Log: [maven-release-plugin] prepare release nuiton-utils-parent-2.3.1 Modified: trunk/nuiton-profiling/pom.xml trunk/nuiton-utils/pom.xml trunk/nuiton-validator/pom.xml trunk/pom.xml Modified: trunk/nuiton-profiling/pom.xml =================================================================== --- trunk/nuiton-profiling/pom.xml 2011-11-09 11:19:23 UTC (rev 2223) +++ trunk/nuiton-profiling/pom.xml 2011-11-13 15:14:15 UTC (rev 2224) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.1</version> </parent> <artifactId>nuiton-profiling</artifactId> Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-11-09 11:19:23 UTC (rev 2223) +++ trunk/nuiton-utils/pom.xml 2011-11-13 15:14:15 UTC (rev 2224) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.1</version> </parent> <artifactId>nuiton-utils</artifactId> Modified: trunk/nuiton-validator/pom.xml =================================================================== --- trunk/nuiton-validator/pom.xml 2011-11-09 11:19:23 UTC (rev 2223) +++ trunk/nuiton-validator/pom.xml 2011-11-13 15:14:15 UTC (rev 2224) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.1</version> </parent> <artifactId>nuiton-validator</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-09 11:19:23 UTC (rev 2223) +++ trunk/pom.xml 2011-11-13 15:14:15 UTC (rev 2224) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils-parent</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.3.1</version> <modules> <module>nuiton-utils</module> @@ -206,12 +206,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-parent-2.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-parent-2.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-pa…</url> </scm> <distributionManagement>

1 0

r2223 - in trunk/nuiton-utils/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org 09 Nov '11

09 Nov '11

Author: tchemit Date: 2011-11-09 12:19:23 +0100 (Wed, 09 Nov 2011) New Revision: 2223 Url: http://nuiton.org/repositories/revision/nuiton-utils/2223 Log: Evolution #1799: Add a PagerUtil class Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/PagerUtil.java trunk/nuiton-utils/src/test/java/org/nuiton/util/PagerUtilTest.java Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/PagerUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/PagerUtil.java (rev 0) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/PagerUtil.java 2011-11-09 11:19:23 UTC (rev 2223) @@ -0,0 +1,109 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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; + +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.List; + +/** + * Common methods to deal with a pager. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class PagerUtil { + + /** + * Given a total count of elements and a page size, compute the number of + * pages available. + * + * @param totalCount total count of elements in the pager + * @param pageSize size of a page + * @return the number of available pages + */ + public static int getTotalPage(int totalCount, int pageSize) { + int result = (int) Math.ceil((double) totalCount / (double) pageSize); + return result; + } + + /** + * Compute the pager bound given his datas: + * <ul> + * <li>{@code totalCount}: count of all elements of the pager</li> + * <li>{@code pageSize}: number of elements in a page</li> + * <li>{@code page}: the requested page number starting at {@code 1}</li> + * </ul> + * + * @param totalCount total count of elements in the pager + * @param page pager page number (starting at {@code 1}) + * @param pageSize number of elements in a page + * @return the bound of start and end index of the requested elements of the pager + */ + public static Pair<Integer, Integer> getPageBound(int totalCount, + int page, + int pageSize) { + + page = Math.max(page, 1); + pageSize = Math.max(pageSize, 1); + + int start = (page - 1) * pageSize; + int end = page * pageSize; // End in subList is exclusive + + end = Math.min(end, totalCount); //To be sure that end will not be out of bound in subList + + Pair<Integer, Integer> result = Pair.of(start, end); + return result; + } + + /** + * Get the elements of the lists using the pager datas: + * <p/> + * <ul> + * <li>{@code elements}:all elements of the pager</li> + * <li>{@code pageSize}: number of elements in a page</li> + * <li>{@code page}: the requested page number starting at {@code 1}</li> + * </ul> + * + * @param elements all pager elements + * @param page pager page number (starting at {@code 1}) + * @param pageSize number of elements in a page + * @param <E> n'importe quel type + * @return la liste une fois filtrée + */ + public static <E> List<E> getPage(List<E> elements, int page, int pageSize) { + + Pair<Integer, Integer> bound = getPageBound(elements.size(), page, pageSize); + + int start = bound.getLeft(); + int end = bound.getRight(); + + List<E> subList = elements.subList(start, end); + List<E> result = new ArrayList<E>(subList); + + return result; + } +} Property changes on: trunk/nuiton-utils/src/main/java/org/nuiton/util/PagerUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/PagerUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/PagerUtilTest.java (rev 0) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/PagerUtilTest.java 2011-11-09 11:19:23 UTC (rev 2223) @@ -0,0 +1,63 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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; + +import org.apache.commons.lang3.tuple.Pair; +import org.junit.Assert; +import org.junit.Test; + +/** + * Tests the {@link PagerUtil}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.4 + */ +public class PagerUtilTest { + + @Test + public void getPageBound() throws Exception { + + Pair<Integer, Integer> actualBound; + + // page size is greater than total count, only returns that is available + actualBound = PagerUtil.getPageBound(10, 1, 11); + Assert.assertEquals(Pair.of(0, 10), actualBound); + + } + + @Test + public void getTotalPage() throws Exception { + int totalPage; + + totalPage = PagerUtil.getTotalPage(9, 10); + Assert.assertEquals(1, totalPage); + + totalPage = PagerUtil.getTotalPage(10, 10); + Assert.assertEquals(1, totalPage); + + totalPage = PagerUtil.getTotalPage(11, 10); + Assert.assertEquals(2, totalPage); + } +} Property changes on: trunk/nuiton-utils/src/test/java/org/nuiton/util/PagerUtilTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2222 - trunk/nuiton-utils/src/main/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org 08 Nov '11

08 Nov '11

Author: tchemit Date: 2011-11-08 21:30:57 +0100 (Tue, 08 Nov 2011) New Revision: 2222 Url: http://nuiton.org/repositories/revision/nuiton-utils/2222 Log: add svn properties + header Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/PropertyDiff.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/PropertyDiff.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/PropertyDiff.java 2011-11-08 20:27:22 UTC (rev 2221) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/PropertyDiff.java 2011-11-08 20:30:57 UTC (rev 2222) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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; /** Property changes on: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/PropertyDiff.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2221 - in trunk/nuiton-utils/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org 08 Nov '11

08 Nov '11

Author: tchemit Date: 2011-11-08 21:27:22 +0100 (Tue, 08 Nov 2011) New Revision: 2221 Url: http://nuiton.org/repositories/revision/nuiton-utils/2221 Log: Evolution #1798: [Bean] Improve the BeanMonitor api Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/PropertyDiff.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanMonitor.java trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanMonitor.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanMonitor.java 2011-10-28 21:25:38 UTC (rev 2220) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BeanMonitor.java 2011-11-08 20:27:22 UTC (rev 2221) @@ -30,7 +30,8 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Arrays; -import java.util.LinkedHashSet; +import java.util.Collection; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -68,10 +69,13 @@ protected final List<String> propertyNames; /** Names of monitored and modified properties for the attached bean. */ - protected final Set<String> modifiedProperties; + protected final Map<String, PropertyDiff> propertyDiffs; - /** To store the original values when watched properties are changing. */ - protected final Map<String, Object> originalValues; +// /** Names of monitored and modified properties for the attached bean. */ +// protected final Set<String> modifiedProperties; +// +// /** To store the original values when watched properties are changing. */ +// protected final Map<String, Object> originalValues; /** * The {@link PropertyChangeListener} which listen modification on bean @@ -89,8 +93,10 @@ */ public BeanMonitor(String... propertyNames) { this.propertyNames = Arrays.asList(propertyNames); - modifiedProperties = new LinkedHashSet<String>(); - originalValues = new TreeMap<String, Object>(); +// modifiedProperties = new LinkedHashSet<String>(); +// originalValues = new TreeMap<String, Object>(); + propertyDiffs = new LinkedHashMap<String, PropertyDiff>(); + listener = new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -104,31 +110,65 @@ Object newValue = evt.getNewValue(); Object oldValue = evt.getOldValue(); - if (modifiedProperties.contains(propertyName)) { + PropertyDiff propertyDiff; - // property already modified + if (propertyDiffs.containsKey(propertyName)) { + + // property was already modified + propertyDiff = propertyDiffs.get(propertyName); + + // change the target value + propertyDiff.setTargetValue(newValue); + // check if value did not come back to original - Object originalValue = originalValues.get(propertyName); - + Object originalValue = propertyDiff.getSourceValue(); if (originalValue == null && newValue == null || originalValue != null && originalValue.equals(newValue)) { // coming back to original value // the property is no more modified - modifiedProperties.remove(propertyName); - originalValues.remove(propertyName); - return; + propertyDiffs.remove(propertyName); +// return; } + } else { + propertyDiff = new PropertyDiff( + propertyName, + oldValue, + propertyName, + newValue, + null + ); - // can safely return since original is already known - // and property is already known to be modified - return; + // add it to modified properties + propertyDiffs.put(propertyName, propertyDiff); + } - // the property was not modified before - // just mark it and keep the original value - modifiedProperties.add(propertyName); - originalValues.put(propertyName, oldValue); +// if (modifiedProperties.contains(propertyName)) { +// +// // property already modified +// // check if value did not come back to original +// Object originalValue = originalValues.get(propertyName); +// +// if (originalValue == null && newValue == null || +// originalValue != null && originalValue.equals(newValue)) { +// +// // coming back to original value +// // the property is no more modified +// modifiedProperties.remove(propertyName); +// originalValues.remove(propertyName); +// return; +// } +// +// // can safely return since original is already known +// // and property is already known to be modified +// return; +// } +// +// // the property was not modified before +// // just mark it and keep the original value +// modifiedProperties.add(propertyName); +// originalValues.put(propertyName, oldValue); } }; } @@ -151,7 +191,7 @@ * the attached bean, {@code false} otherwise. */ public boolean wasModified() { - return !modifiedProperties.isEmpty(); + return !propertyDiffs.isEmpty(); } /** @@ -162,7 +202,8 @@ * @return the array of property names to monitor. */ public String[] getModifiedProperties() { - return modifiedProperties.toArray(new String[modifiedProperties.size()]); + Set<String> propertyNames = propertyDiffs.keySet(); + return propertyNames.toArray(new String[propertyNames.size()]); } /** @@ -173,11 +214,26 @@ public Map<String, Object> getOriginalValues() { // always expose a copy of map - Map<String, Object> map = new TreeMap<String, Object>(originalValues); + Map<String, Object> map = new TreeMap<String, Object>(); + for (PropertyDiff propertyDiff : propertyDiffs.values()) { + map.put(propertyDiff.getSourceProperty(), + propertyDiff.getSourceValue()); + } return map; } /** + * Obtains the property diffs since the bean is monitoried. + * + * @return the property diffs since the bean is monitoried. + * @since 2.4 + */ + public PropertyDiff[] getPropertyDiffs() { + Collection<PropertyDiff> values = propertyDiffs.values(); + return values.toArray(new PropertyDiff[values.size()]); + } + + /** * Sets the {@code bean} to monitor. * <p/> * As a side effect, it will attach the {@link #listener} to new bean @@ -219,7 +275,8 @@ /** To clear the modified states. */ public void clearModified() { - modifiedProperties.clear(); - originalValues.clear(); + propertyDiffs.clear(); +// modifiedProperties.clear(); +// originalValues.clear(); } } Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-10-28 21:25:38 UTC (rev 2220) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-11-08 20:27:22 UTC (rev 2221) @@ -366,74 +366,6 @@ } } - public class PropertyDiff { - - protected Class<?> propertyType; - - protected String sourceProperty; - - protected Object sourceValue; - - protected String targetProperty; - - protected Object targetValue; - - public PropertyDiff() { - } - - public PropertyDiff(String sourceProperty, - Object sourceValue, - String targetProperty, - Object targetValue, - Class<?> propertyType) { - this.sourceProperty = sourceProperty; - this.sourceValue = sourceValue; - this.targetProperty = targetProperty; - this.targetValue = targetValue; - this.propertyType= propertyType; - } - - public String getSourceProperty() { - return sourceProperty; - } - - public void setSourceProperty(String sourceProperty) { - this.sourceProperty = sourceProperty; - } - - public Object getSourceValue() { - return sourceValue; - } - - public void setSourceValue(Object sourceValue) { - this.sourceValue = sourceValue; - } - - public String getTargetProperty() { - return targetProperty; - } - - public void setTargetProperty(String targetProperty) { - this.targetProperty = targetProperty; - } - - public Object getTargetValue() { - return targetValue; - } - - public void setTargetValue(Object targetValue) { - this.targetValue = targetValue; - } - - public Class<?> getPropertyType() { - return propertyType; - } - - public void setPropertyType(Class<?> propertyType) { - this.propertyType = propertyType; - } - } - protected List<PropertyDiff> diff(I source, O target, boolean excludeProperties, Added: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/PropertyDiff.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/PropertyDiff.java (rev 0) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/PropertyDiff.java 2011-11-08 20:27:22 UTC (rev 2221) @@ -0,0 +1,76 @@ +package org.nuiton.util.beans; + +/** +* TODO +* +* @author bleny <leny(a)codelutin.com> +* @since 2.4 +*/ +public class PropertyDiff { + + protected Class<?> propertyType; + + protected String sourceProperty; + + protected Object sourceValue; + + protected String targetProperty; + + protected Object targetValue; + + public PropertyDiff() { + } + + public PropertyDiff(String sourceProperty, + Object sourceValue, + String targetProperty, + Object targetValue, + Class<?> propertyType) { + this.sourceProperty = sourceProperty; + this.sourceValue = sourceValue; + this.targetProperty = targetProperty; + this.targetValue = targetValue; + this.propertyType= propertyType; + } + + public String getSourceProperty() { + return sourceProperty; + } + + public void setSourceProperty(String sourceProperty) { + this.sourceProperty = sourceProperty; + } + + public Object getSourceValue() { + return sourceValue; + } + + public void setSourceValue(Object sourceValue) { + this.sourceValue = sourceValue; + } + + public String getTargetProperty() { + return targetProperty; + } + + public void setTargetProperty(String targetProperty) { + this.targetProperty = targetProperty; + } + + public Object getTargetValue() { + return targetValue; + } + + public void setTargetValue(Object targetValue) { + this.targetValue = targetValue; + } + + public Class<?> getPropertyType() { + return propertyType; + } + + public void setPropertyType(Class<?> propertyType) { + this.propertyType = propertyType; + } + +} Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderTest.java 2011-10-28 21:25:38 UTC (rev 2220) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderTest.java 2011-11-08 20:27:22 UTC (rev 2221) @@ -236,13 +236,13 @@ a.setB(VALUE_A); b.setB(VALUE_B); - List<Binder<BeanA, BeanB>.PropertyDiff> diff = binderB.diff(a, b); + List<PropertyDiff> diff = binderB.diff(a, b); // only one property has changed Assert.assertEquals(1, diff.size()); // names of the properties used for comparison - Binder.PropertyDiff propertyDiff = diff.get(0); + PropertyDiff propertyDiff = diff.get(0); Assert.assertEquals(BeanA.PROPERTY_B, propertyDiff.getSourceProperty()); Assert.assertEquals(BeanB.PROPERTY_B, propertyDiff.getTargetValue());

1 0