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

r2203 - trunk/nuiton-utils/src/main/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org Sept. 9, 2011

Sept. 9, 2011

Author: tchemit Date: 2011-09-09 07:09:07 +0200 (Fri, 09 Sep 2011) New Revision: 2203 Url: http://nuiton.org/repositories/revision/nuiton-utils/2203 Log: Evolution #1728: add diff method in Binder to compare the values of two bean : add type in PropertyDiff + reformat code Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 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-09-09 05:08:34 UTC (rev 2202) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-09-09 05:09:07 UTC (rev 2203) @@ -140,16 +140,16 @@ * Obtain from the given object all properties registered in the binder * model. * - * @param source the bean to read - * @param propertyNames subset of properties to load + * @param source the bean to read + * @param propertyNames subset of properties to load * @param includeNullValues get all the properties and - * values for the given bean. If false, you'll get only the values + * values for the given bean. If false, you'll get only the values * @return the map of properties obtained indexed by their property name, * or an empty map is the given {@code from} is {@code null}. * @since 2.3 */ public Map<String, Object> obtainProperties(I source, - boolean includeNullValues, String... propertyNames) { + boolean includeNullValues, String... propertyNames) { if (source == null) { // special limit case return Collections.emptyMap(); @@ -188,7 +188,7 @@ } } - boolean include = read != null || read == null && includeNullValues; + boolean include = read != null || includeNullValues; if (include) { result.put(sourceProperty, read); } @@ -329,7 +329,7 @@ } protected Object readProperty(String sourceProperty, Object source, - Method readMethod) { + Method readMethod) { try { Object read = null; if (source != null) { @@ -368,6 +368,8 @@ public class PropertyDiff { + protected Class<?> propertyType; + protected String sourceProperty; protected Object sourceValue; @@ -376,13 +378,19 @@ protected Object targetValue; - public PropertyDiff() {} + public PropertyDiff() { + } - public PropertyDiff(String sourceProperty, Object sourceValue, String targetProperty, Object targetValue) { + 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() { @@ -416,10 +424,20 @@ 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, - String... propertyNames) { + protected List<PropertyDiff> diff(I source, + O target, + boolean excludeProperties, + String... propertyNames) { if (source == null) { throw new NullPointerException("parameter 'source' can no be null"); } @@ -437,16 +455,24 @@ Method sourceReadMethod = model.getSourceReadMethod(sourceProperty); - Object sourceRead = readProperty(sourceProperty, source, sourceReadMethod); + Object sourceRead = readProperty(sourceProperty, source, + sourceReadMethod); String targetProperty = model.getTargetProperty(sourceProperty); Method targetReadMethod = model.getTargetReadMethod(targetProperty); - Object targetRead = readProperty(targetProperty, target, targetReadMethod); + Object targetRead = readProperty(targetProperty, target, + targetReadMethod); if (ObjectUtils.notEqual(sourceRead, targetRead)) { - PropertyDiff propertyDiff = new PropertyDiff(sourceProperty, sourceRead, targetProperty, targetRead); + PropertyDiff propertyDiff = new PropertyDiff( + sourceProperty, + sourceRead, + targetProperty, + targetRead, + sourceReadMethod.getReturnType() + ); result.add(propertyDiff); } } @@ -454,34 +480,39 @@ return result; } - /** Compare two beans property by property according to the model. - * + /** + * Compare two beans property by property according to the model. + * * List contains one element per property with different values (according * to the result of an equals() call) * * @param source a bean of type I * @param target a bean of type O * @return a list with all the properties which values differ in source - * and target. Properties with equal values are not included. + * and target. Properties with equal values are not included. * @since 2.3 */ public List<PropertyDiff> diff(I source, O target) { return diff(source, target, false); } - /** Compare two beans property by property according to the model. - * + /** + * Compare two beans property by property according to the model. + * * List contains one element per property with different values (according * to the result of an equals() call) * * @param source a bean of type I * @param target a bean of type O + * @param propertyNames property names to exclude from the diff * @return a list with all the properties which values differ in source - * and target. Properties with equal values and excluded properties will - * not be contained in the result + * and target. Properties with equal values and excluded properties + * will not be contained in the result * @since 2.3 */ - public List<PropertyDiff> diffExcluding(I source, O target, String... propertyNames) { + public List<PropertyDiff> diffExcluding(I source, + O target, + String... propertyNames) { return diff(source, target, true, propertyNames); }

1 0

r2202 - trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field
by tchemit＠users.nuiton.org Sept. 9, 2011

Sept. 9, 2011

Author: tchemit Date: 2011-09-09 07:08:34 +0200 (Fri, 09 Sep 2011) New Revision: 2202 Url: http://nuiton.org/repositories/revision/nuiton-utils/2202 Log: add svn properties Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredFieldValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredStringFieldValidator.java Property changes on: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredFieldValidator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/SkipableRequiredStringFieldValidator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2201 - in trunk/nuiton-utils/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util/beans
by bleny＠users.nuiton.org Sept. 1, 2011

Sept. 1, 2011

Author: bleny Date: 2011-09-01 15:30:35 +0200 (Thu, 01 Sep 2011) New Revision: 2201 Url: http://nuiton.org/repositories/revision/nuiton-utils/2201 Log: #1729 add flag argument in Binder#obtainProperties to get all values even if null Modified: 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/Binder.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-09-01 12:23:57 UTC (rev 2200) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-09-01 13:30:35 UTC (rev 2201) @@ -137,19 +137,19 @@ } /** - * Obtain from the given object all properties registred in the binder + * Obtain from the given object all properties registered in the binder * model. - * - * Note: If a property's value is null, it will not be injected in - * the result. * * @param source the bean to read * @param propertyNames subset of properties to load + * @param includeNullValues get all the properties and + * values for the given bean. If false, you'll get only the values * @return the map of properties obtained indexed by their property name, * or an empty map is the given {@code from} is {@code null}. + * @since 2.3 */ public Map<String, Object> obtainProperties(I source, - String... propertyNames) { + boolean includeNullValues, String... propertyNames) { if (source == null) { // special limit case return Collections.emptyMap(); @@ -174,22 +174,24 @@ // for primitive type case, force nullity read = null; } - if (read == null) { - continue; + if (read != null) { + if (model.containsBinderProperty(sourceProperty)) { + if (model.containsCollectionProperty(sourceProperty)) { + read = bindCollection(sourceProperty, read); + } else { + read = bindProperty(sourceProperty, read); + } + } else if (model.containsCollectionProperty(sourceProperty)) { + + // specific collection strategy is set, must use it + read = getCollectionValue(sourceProperty, read); + } } - if (model.containsBinderProperty(sourceProperty)) { - if (model.containsCollectionProperty(sourceProperty)) { - read = bindCollection(sourceProperty, read); - } else { - read = bindProperty(sourceProperty, read); - } - } else if (model.containsCollectionProperty(sourceProperty)) { - // specific collection strategy is set, must use it - read = getCollectionValue(sourceProperty, read); + boolean include = read != null || read == null && includeNullValues; + if (include) { + result.put(sourceProperty, read); } - - result.put(sourceProperty, read); } catch (IllegalAccessException e) { throw new RuntimeException(e); } catch (InvocationTargetException e) { @@ -202,6 +204,23 @@ } /** + * Obtain from the given object all properties registered in the binder + * model. + * + * Note: If a property's value is null, it will not be injected in + * the result. + * + * @param source the bean to read + * @param propertyNames subset of properties to load + * @return the map of properties obtained indexed by their property name, + * or an empty map is the given {@code from} is {@code null}. + */ + public Map<String, Object> obtainProperties(I source, + String... propertyNames) { + return obtainProperties(source, false, propertyNames); + } + + /** * Copy properties from a source bean to a destination one according to * the model of the binder. If {@code propertyNames} is defined, only * those properties will be copied. @@ -265,7 +284,6 @@ getAllPropertiesExclude(propertyNames) : getProperties(propertyNames); - for (String sourceProperty : propertyNames) { String targetProperty = model.getTargetProperty(sourceProperty); 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-09-01 12:23:57 UTC (rev 2200) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderTest.java 2011-09-01 13:30:35 UTC (rev 2201) @@ -107,6 +107,9 @@ map = binderA.obtainProperties(a); Assert.assertEquals(0, map.size()); + map = binderA.obtainProperties(a, true); + Assert.assertEquals(1, map.size()); + map = binderB.obtainProperties(a); Assert.assertEquals(0, map.size());

1 0

r2200 - trunk/nuiton-utils/src/main/java/org/nuiton/util/beans
by bleny＠users.nuiton.org Sept. 1, 2011

Sept. 1, 2011

Author: bleny Date: 2011-09-01 14:23:57 +0200 (Thu, 01 Sep 2011) New Revision: 2200 Url: http://nuiton.org/repositories/revision/nuiton-utils/2200 Log: #1728: add diffExluding and @since tag Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 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-09-01 10:09:16 UTC (rev 2199) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-09-01 12:23:57 UTC (rev 2200) @@ -445,11 +445,28 @@ * @param target a bean of type O * @return a list with all the properties which values differ in source * and target. Properties with equal values are not included. + * @since 2.3 */ public List<PropertyDiff> diff(I source, O target) { return diff(source, target, false); } + /** Compare two beans property by property according to the model. + * + * List contains one element per property with different values (according + * to the result of an equals() call) + * + * @param source a bean of type I + * @param target a bean of type O + * @return a list with all the properties which values differ in source + * and target. Properties with equal values and excluded properties will + * not be contained in the result + * @since 2.3 + */ + public List<PropertyDiff> diffExcluding(I source, O target, String... propertyNames) { + return diff(source, target, true, propertyNames); + } + /** * Get the model of the binder. *

1 0

r2199 - trunk/nuiton-utils/src/main/java/org/nuiton/util/beans
by bleny＠users.nuiton.org Sept. 1, 2011

Sept. 1, 2011

Author: bleny Date: 2011-09-01 12:09:16 +0200 (Thu, 01 Sep 2011) New Revision: 2199 Url: http://nuiton.org/repositories/revision/nuiton-utils/2199 Log: #1728: a bit of refactoring on diff() Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 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-09-01 09:53:58 UTC (rev 2198) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-09-01 10:09:16 UTC (rev 2199) @@ -310,10 +310,10 @@ } } - protected Object readSourceProperty(String sourceProperty, I source) { + protected Object readProperty(String sourceProperty, Object source, + Method readMethod) { try { Object read = null; - Method readMethod = model.getSourceReadMethod(sourceProperty); if (source != null) { // obtain value from source read = readMethod.invoke(source); @@ -348,44 +348,6 @@ } } - protected Object readTargetProperty(String targetProperty, O target) { - try { - Object read = null; - Method readMethod = model.getTargetReadMethod(targetProperty); - if (target != null) { - // obtain value from source - read = readMethod.invoke(target); - } - // obtain acceptable null value (for primitive types, use - // default values). - if (read == null) { - read = ObjectUtil.getNullValue(readMethod.getReturnType()); - } - if (log.isDebugEnabled()) { - log.debug("property " + targetProperty + ", type : " + - readMethod.getReturnType() + ", value = " + read); - } - - if (model.containsBinderProperty(targetProperty)) { - if (model.containsCollectionProperty(targetProperty)) { - read = bindCollection(targetProperty, read); - } else { - read = bindProperty(targetProperty, read); - } - } else if (model.containsCollectionProperty(targetProperty)) { - - // specific collection strategy is set, must use it - read = getCollectionValue(targetProperty, read); - } - - return read; - } catch (Exception e) { - throw new RuntimeException( - "could not read property " + targetProperty + - " on target " + target); - } - } - public class PropertyDiff { protected String sourceProperty; @@ -440,6 +402,9 @@ protected List<PropertyDiff> diff(I source, O target, boolean excludeProperties, String... propertyNames) { + if (source == null) { + throw new NullPointerException("parameter 'source' can no be null"); + } if (target == null) { throw new NullPointerException("parameter 'target' can no be null"); } @@ -452,12 +417,16 @@ for (String sourceProperty : propertyNames) { - Object sourceRead = readSourceProperty(sourceProperty, source); + Method sourceReadMethod = model.getSourceReadMethod(sourceProperty); + Object sourceRead = readProperty(sourceProperty, source, sourceReadMethod); + String targetProperty = model.getTargetProperty(sourceProperty); - Object targetRead = readTargetProperty(targetProperty, target); + Method targetReadMethod = model.getTargetReadMethod(targetProperty); + Object targetRead = readProperty(targetProperty, target, targetReadMethod); + if (ObjectUtils.notEqual(sourceRead, targetRead)) { PropertyDiff propertyDiff = new PropertyDiff(sourceProperty, sourceRead, targetProperty, targetRead); result.add(propertyDiff);

1 0

r2198 - in trunk/nuiton-utils/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util/beans
by bleny＠users.nuiton.org Sept. 1, 2011

Sept. 1, 2011

Author: bleny Date: 2011-09-01 11:53:58 +0200 (Thu, 01 Sep 2011) New Revision: 2198 Url: http://nuiton.org/repositories/revision/nuiton-utils/2198 Log: #1728: fisrt try by computing a diff given two bean. test included Modified: 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/Binder.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-08-30 10:48:22 UTC (rev 2197) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2011-09-01 09:53:58 UTC (rev 2198) @@ -25,6 +25,7 @@ package org.nuiton.util.beans; +import org.apache.commons.lang.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ObjectUtil; @@ -38,6 +39,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -308,6 +310,177 @@ } } + protected Object readSourceProperty(String sourceProperty, I source) { + try { + Object read = null; + Method readMethod = model.getSourceReadMethod(sourceProperty); + if (source != null) { + // obtain value from source + read = readMethod.invoke(source); + } + // obtain acceptable null value (for primitive types, use + // default values). + if (read == null) { + read = ObjectUtil.getNullValue(readMethod.getReturnType()); + } + if (log.isDebugEnabled()) { + log.debug("property " + sourceProperty + ", type : " + + readMethod.getReturnType() + ", value = " + read); + } + + if (model.containsBinderProperty(sourceProperty)) { + if (model.containsCollectionProperty(sourceProperty)) { + read = bindCollection(sourceProperty, read); + } else { + read = bindProperty(sourceProperty, read); + } + } else if (model.containsCollectionProperty(sourceProperty)) { + + // specific collection strategy is set, must use it + read = getCollectionValue(sourceProperty, read); + } + + return read; + } catch (Exception e) { + throw new RuntimeException( + "could not read property " + sourceProperty + + " on source " + source); + } + } + + protected Object readTargetProperty(String targetProperty, O target) { + try { + Object read = null; + Method readMethod = model.getTargetReadMethod(targetProperty); + if (target != null) { + // obtain value from source + read = readMethod.invoke(target); + } + // obtain acceptable null value (for primitive types, use + // default values). + if (read == null) { + read = ObjectUtil.getNullValue(readMethod.getReturnType()); + } + if (log.isDebugEnabled()) { + log.debug("property " + targetProperty + ", type : " + + readMethod.getReturnType() + ", value = " + read); + } + + if (model.containsBinderProperty(targetProperty)) { + if (model.containsCollectionProperty(targetProperty)) { + read = bindCollection(targetProperty, read); + } else { + read = bindProperty(targetProperty, read); + } + } else if (model.containsCollectionProperty(targetProperty)) { + + // specific collection strategy is set, must use it + read = getCollectionValue(targetProperty, read); + } + + return read; + } catch (Exception e) { + throw new RuntimeException( + "could not read property " + targetProperty + + " on target " + target); + } + } + + public class PropertyDiff { + + protected String sourceProperty; + + protected Object sourceValue; + + protected String targetProperty; + + protected Object targetValue; + + public PropertyDiff() {} + + public PropertyDiff(String sourceProperty, Object sourceValue, String targetProperty, Object targetValue) { + this.sourceProperty = sourceProperty; + this.sourceValue = sourceValue; + this.targetProperty = targetProperty; + this.targetValue = targetValue; + } + + 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; + } + } + + protected List<PropertyDiff> diff(I source, O target, boolean excludeProperties, + String... propertyNames) { + if (target == null) { + throw new NullPointerException("parameter 'target' can no be null"); + } + + propertyNames = excludeProperties ? + getAllPropertiesExclude(propertyNames) : + getProperties(propertyNames); + + List<PropertyDiff> result = new LinkedList<PropertyDiff>(); + + for (String sourceProperty : propertyNames) { + + Object sourceRead = readSourceProperty(sourceProperty, source); + + String targetProperty = model.getTargetProperty(sourceProperty); + + Object targetRead = readTargetProperty(targetProperty, target); + + if (ObjectUtils.notEqual(sourceRead, targetRead)) { + PropertyDiff propertyDiff = new PropertyDiff(sourceProperty, sourceRead, targetProperty, targetRead); + result.add(propertyDiff); + } + } + + return result; + } + + /** Compare two beans property by property according to the model. + * + * List contains one element per property with different values (according + * to the result of an equals() call) + * + * @param source a bean of type I + * @param target a bean of type O + * @return a list with all the properties which values differ in source + * and target. Properties with equal values are not included. + */ + public List<PropertyDiff> diff(I source, O target) { + return diff(source, target, false); + } + /** * Get the model of the binder. * 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-08-30 10:48:22 UTC (rev 2197) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderTest.java 2011-09-01 09:53:58 UTC (rev 2198) @@ -31,6 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; +import java.util.List; import java.util.Map; public class BinderTest { @@ -101,7 +102,7 @@ } @Test - public void testObtainProperties() throws Exception { + public void testObtainProperties() { Map<String, Object> map; map = binderA.obtainProperties(a); Assert.assertEquals(0, map.size()); @@ -142,7 +143,7 @@ } @Test - public void testCopy() throws Exception { + public void testCopy() { a.setA(VALUE_A); a.setB(VALUE_B); @@ -172,7 +173,7 @@ } @Test - public void testCopyIncluding() throws Exception { + public void testCopyIncluding() { a.setA(VALUE_A); a.setB(VALUE_B); @@ -189,7 +190,7 @@ } @Test - public void testCopyExcluding() throws Exception { + public void testCopyExcluding() { a.setA(VALUE_A); a.setB(VALUE_B); @@ -224,4 +225,26 @@ Assert.assertEquals(VALUE_E, b.getE2()); } + + @Test + public void testDiff() { + a.setA(VALUE_A); + b.setA(VALUE_A); + a.setB(VALUE_A); + b.setB(VALUE_B); + + List<Binder<BeanA, BeanB>.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); + Assert.assertEquals(BeanA.PROPERTY_B, propertyDiff.getSourceProperty()); + Assert.assertEquals(BeanB.PROPERTY_B, propertyDiff.getTargetValue()); + + // old and new values + Assert.assertEquals(VALUE_A, propertyDiff.getSourceValue()); + Assert.assertEquals(VALUE_B, propertyDiff.getTargetValue()); + } }

1 0