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

r2051 - in trunk/nuiton-utils/src/main: java/org/nuiton/util resources/i18n
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 14:36:13 +0100 (Tue, 25 Jan 2011) New Revision: 2051 Url: http://nuiton.org/repositories/revision/nuiton-utils/2051 Log: fix others i18n Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java trunk/nuiton-utils/src/main/resources/i18n/nuiton-utils_en_GB.properties trunk/nuiton-utils/src/main/resources/i18n/nuiton-utils_fr_FR.properties Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java 2011-01-25 13:26:40 UTC (rev 2050) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ObjectUtil.java 2011-01-25 13:36:13 UTC (rev 2051) @@ -92,7 +92,7 @@ static public <E> E newInstance(Class<E> clazz, Collection args, boolean nullIfMissing) { Constructor<E>[] constructors = (Constructor<E>[])clazz.getConstructors(); if (constructors.length != 1) { - throw new IllegalArgumentException(_("Your class %s has more than one constructor", clazz)); + throw new IllegalArgumentException(_("nuitonutil.erro.class.with.more.than.one.constructor", clazz)); } // copy collection into modifiable list to add new object @@ -112,8 +112,8 @@ return result; } catch (Exception eee) { throw new IllegalArgumentException(_( - "Class %s can't be instanciated with %s", - clazz, Arrays.toString(params)), eee); + _("nuitonutil.error.cant.instanciate.class", + clazz, Arrays.toString(params))), eee); } } @@ -155,7 +155,7 @@ // si on ne retrouve rien, result est reste a null if (result == null && !nullIfMissing) { throw new IllegalArgumentException(_( - "Can't find assignable argument for %s in %s", clazz, args)); + _("nuitonutil.error.unfound.assignable.argument", clazz, args))); } return result; } Modified: trunk/nuiton-utils/src/main/resources/i18n/nuiton-utils_en_GB.properties =================================================================== --- trunk/nuiton-utils/src/main/resources/i18n/nuiton-utils_en_GB.properties 2011-01-25 13:26:40 UTC (rev 2050) +++ trunk/nuiton-utils/src/main/resources/i18n/nuiton-utils_en_GB.properties 2011-01-25 13:36:13 UTC (rev 2051) @@ -1,13 +1,12 @@ -Can't\ find\ assignable\ argument\ for\ %s\ in\ %s= -Class\ %s\ can't\ be\ instanciated\ with\ %s= -Your\ class\ %s\ has\ more\ than\ one\ constructor= nuitonutil.config.moving.conf=Moving old configuration file from %s to %s nuitonutil.debug.objectutil.create=Try to create %s with %s nuitonutil.debug.objectutil.instantiate=Can't instantiate %s with params %s nuitonutil.debug.objectutil.invoke=Invoke %s with %s +nuitonutil.erro.class.with.more.than.one.constructor=Your class %s has more than one constructor nuitonutil.erro.could.not.find.MD5=Could not find MD5 algorithm nuitonutil.error.add.url.in.classloader=Can't add url in classloader %1$s for reason %2$s nuitonutil.error.applicationconfig.save=Can't save config in file %s +nuitonutil.error.cant.instanciate.class=Class %s can't be instanciated with %s nuitonutil.error.convert.file.to.url=Can't convert %s for reason %s nuitonutil.error.convertor.noValue=No value specified for converter %s nuitonutil.error.could.not.addPCL=Could not add the PropertychangeListener %1$s on object %2$s for following reason \: %3$s @@ -17,6 +16,7 @@ nuitonutil.error.not.an.enum=The type %1$s ins not an Enum type nuitonutil.error.null.parameter=The parameter %1$s is null\! nuitonutil.error.resource.not.found=Can't find resource \: %s +nuitonutil.error.unfound.assignable.argument=Can't find assignable argument for %s in %s nuitonutil.error.unfound.month=could not found month from '%s', use default month '%s' nuitonutil.error.unknown.url.type=could not treate unknown type of url %1$s nuitonutil.error.url.convertor=a problem occurs while converting value '%s' with url convertor %s for reason %s Modified: trunk/nuiton-utils/src/main/resources/i18n/nuiton-utils_fr_FR.properties =================================================================== --- trunk/nuiton-utils/src/main/resources/i18n/nuiton-utils_fr_FR.properties 2011-01-25 13:26:40 UTC (rev 2050) +++ trunk/nuiton-utils/src/main/resources/i18n/nuiton-utils_fr_FR.properties 2011-01-25 13:36:13 UTC (rev 2051) @@ -1,35 +1,35 @@ -Can't\ find\ assignable\ argument\ for\ %s\ in\ %s= -Class\ %s\ can't\ be\ instanciated\ with\ %s= -Your\ class\ %s\ has\ more\ than\ one\ constructor= -nuitonutil.config.moving.conf=D\u00E9placement du fichier de configuration depuis %s vers %s -nuitonutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s -nuitonutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s +nuitonutil.config.moving.conf=D\u00e9placement du fichier de configuration depuis %s vers %s +nuitonutil.debug.objectutil.create=Essaye de cr\u00e9er %s avec %s +nuitonutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00eatres %s nuitonutil.debug.objectutil.invoke=Invocation de %s avec %s -nuitonutil.erro.could.not.find.MD5=L'algorithme MD5 n'a pas \u00E9t\u00E9 trouv\u00E9\! +nuitonutil.erro.class.with.more.than.one.constructor=Votre classe %s a plus d'un constructeur +nuitonutil.erro.could.not.find.MD5=L'algorithme MD5 n'a pas \u00e9t\u00e9 trouv\u00e9\! nuitonutil.error.add.url.in.classloader=Impossible d'ajouter une url dans le classloader %s pour la raison \: %s nuitonutil.error.applicationconfig.save=Impossible de sauvegarder le fichier de configuration dans %s -nuitonutil.error.convert.file.to.url=Le fichier '%1$s' n'a pas pu \u00EAtre converti en URL pour la raison suivante \: %2$S -nuitonutil.error.convertor.noValue=Aucune valeur \u00E0 convertir pour le convertisseur %s -nuitonutil.error.could.not.addPCL=N'a pas pu ajout\u00E9 le PropertychangeListener %1$s sur l'objet %2$s pour la raison suivante \: %3$s -nuitonutil.error.could.not.removePCL=N'a pas pu enlev\u00E9 le PropertychangeListener %1$s sur l'objet %2$s pour la raison suivante \: %3$s -nuitonutil.error.get.url.from.zip=Erreur lors de la lecture du fichier compress\u00E9 %1$s \: %2$s -nuitonutil.error.no.convertor=Aucun convertisseur trouv\u00E9 pour le type %2$s et l''objet '%1$s' +nuitonutil.error.cant.instanciate.class=La Classe %s n'a pas pu \u00eatre instanci\u00e9e avec %s +nuitonutil.error.convert.file.to.url=Le fichier '%1$s' n'a pas pu \u00eatre converti en URL pour la raison suivante \: %2$S +nuitonutil.error.convertor.noValue=Aucune valeur \u00e0 convertir pour le convertisseur %s +nuitonutil.error.could.not.addPCL=N'a pas pu ajout\u00e9 le PropertychangeListener %1$s sur l'objet %2$s pour la raison suivante \: %3$s +nuitonutil.error.could.not.removePCL=N'a pas pu enlev\u00e9 le PropertychangeListener %1$s sur l'objet %2$s pour la raison suivante \: %3$s +nuitonutil.error.get.url.from.zip=Erreur lors de la lecture du fichier compress\u00e9 %1$s \: %2$s +nuitonutil.error.no.convertor=Aucun convertisseur trouv\u00e9 pour le type %2$s et l''objet '%1$s' nuitonutil.error.not.an.enum=Le type %1$s n'est pas une enumeration java -nuitonutil.error.null.parameter=Le param\u00E8tre '%1$s' est null\! +nuitonutil.error.null.parameter=Le param\u00e8tre '%1$s' est null\! nuitonutil.error.resource.not.found=Impossible de trouver la ressource \: %s -nuitonutil.error.unfound.month=n'a pas pu trouv\u00E9 le mois \u00E0 partir de '%s', utilise le mois par d\u00E9faut '%s' +nuitonutil.error.unfound.assignable.argument=N'a pas pu trouver un argument assignable pour %s dans %s +nuitonutil.error.unfound.month=n'a pas pu trouv\u00e9 le mois \u00e0 partir de '%s', utilise le mois par d\u00e9faut '%s' nuitonutil.error.unknown.url.type=could not treate unknown type of url %1$s -nuitonutil.error.url.convertor=Un probl\u00E8me est apparu lors de la convertion en url de '%s' avec le convertisseur %s pour la raison suivante \: %s +nuitonutil.error.url.convertor=Un probl\u00e8me est apparu lors de la convertion en url de '%s' avec le convertisseur %s pour la raison suivante \: %s nuitonutil.error.version.convertor=N'a pas pu convertir la valeur %1$s avec le converter %2$s pour la raison suivante \: %3$s nuitonutil.error.version.pattern=Pattern de version non connu pour %1$s -nuitonutil.fileCompletion.cancel=.. pour annuler ou pour revenir au repertoire pr\u00E9c\u00E9dent -nuitonutil.fileCompletion.enter=Entrer pour afficher la liste des fichiers, ou pour compl\u00E9ter le chemin +nuitonutil.fileCompletion.cancel=.. pour annuler ou pour revenir au repertoire pr\u00e9c\u00e9dent +nuitonutil.fileCompletion.enter=Entrer pour afficher la liste des fichiers, ou pour compl\u00e9ter le chemin nuitonutil.fileCompletion.exit=Saisir "\!q" pour quitter nuitonutil.fileCompletion.save=Saisir "\!s" a la fin du nom de fichier pour l'enregistrer nuitonutil.month.april=avril -nuitonutil.month.august=ao\u00FBt -nuitonutil.month.december=d\u00E9cembre -nuitonutil.month.february=f\u00E9vrier +nuitonutil.month.august=ao\u00fbt +nuitonutil.month.december=d\u00e9cembre +nuitonutil.month.february=f\u00e9vrier nuitonutil.month.january=janvier nuitonutil.month.july=juillet nuitonutil.month.june=juin

1 0

r2050 - trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 14:26:40 +0100 (Tue, 25 Jan 2011) New Revision: 2050 Url: http://nuiton.org/repositories/revision/nuiton-utils/2050 Log: add some documentation on BeanValidatorFactory Fix order when rebuilding a delegate validator Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/package-info.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-25 13:07:59 UTC (rev 2049) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-25 13:26:40 UTC (rev 2050) @@ -407,6 +407,17 @@ protected void rebuildDelegateValidator(Class<O> beanType, String context, NuitonValidatorScope... scopes) { + + // changing context could change fields definition + // so dettach bean, must rebuild the fields + + // Dettach the bean before any thing, because with the new delegate + // validator some old fields could not be used any longer, and then + // listeners will never have the full reset of their model... + if (bean != null) { + setBean(null); + } + if (scopes.length == 0) { scopes = NuitonValidatorScope.values(); } @@ -419,12 +430,6 @@ // remove old delegate validator delegate = validatorProvider.newValidator(validatorModel); - - // changing context could change fields definition - // so dettach bean, must rebuild the fields - if (bean != null) { - setBean(null); - } } public BeanValidator<?> getParentValidator() { Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java 2011-01-25 13:07:59 UTC (rev 2049) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java 2011-01-25 13:26:40 UTC (rev 2050) @@ -52,8 +52,22 @@ LogFactory.getLog(BeanValidatorFactory.class); + /** + * Object to create new validators. + * <p/> + * If none is given, it will use the default one, says the + * {@link DefaultBeanValidatorCreator}. + */ protected static BeanValidatorCreator creator; + /** + * Obtain the bean validator creator. + * <p/> + * If none is defined, then will use a default one, says the + * {@link DefaultBeanValidatorCreator}. + * + * @return the bean validator creator + */ public static BeanValidatorCreator getCreator() { if (creator == null) { creator = new DefaultBeanValidatorCreator(); @@ -65,6 +79,11 @@ return creator; } + /** + * Sets an explicit bean validator creator. + * + * @param creator the creator to use + */ public static void setCreator(BeanValidatorCreator creator) { BeanValidatorFactory.creator = creator; if (log.isInfoEnabled()) { @@ -132,10 +151,16 @@ "type parameter can not be null."); } - NuitonValidatorProvider provider = NuitonValidatorFactory.getProvider(providerName); + // get delegate validator provider + NuitonValidatorProvider provider = + NuitonValidatorFactory.getProvider(providerName); + // get bean validator creator + BeanValidatorCreator creator = getCreator(); + + // create the new instance of bean validator BeanValidator<O> beanValidator = - getCreator().newBeanValidator(provider, type, context, scopes); + creator.newBeanValidator(provider, type, context, scopes); return beanValidator; } @@ -147,6 +172,16 @@ */ public interface BeanValidatorCreator { + /** + * Given the parameters, instanciate a new {@link BeanValidator}. + * + * @param provider the delegate validator provider + * @param type the type of object to validate + * @param context the context of validation (can be {@code null}) + * @param scopes scopes to use (if none given, will use all available scopes) + * @param <O> type of object to validate + * @return the new instance of bean validator + */ <O> BeanValidator<O> newBeanValidator( NuitonValidatorProvider provider, Class<O> type, @@ -157,14 +192,20 @@ } /** - * TODO + * Default implementation of {@link BeanValidatorCreator} which just + * instanciate a {@link BeanValidator} from the given parameters. * * @author tchemit <chemit(a)codelutin.com> - * @since TODO + * @since 2.0 */ public static class DefaultBeanValidatorCreator implements BeanValidatorCreator { @Override - public <O> BeanValidator<O> newBeanValidator(NuitonValidatorProvider provider, Class<O> type, String context, NuitonValidatorScope... scopes) { + public <O> BeanValidator<O> newBeanValidator( + NuitonValidatorProvider provider, + Class<O> type, + String context, + NuitonValidatorScope... scopes) { + BeanValidator<O> beanValidator = new BeanValidator<O>(provider, type, context, Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/package-info.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/package-info.java 2011-01-25 13:07:59 UTC (rev 2049) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/package-info.java 2011-01-25 13:26:40 UTC (rev 2050) @@ -52,10 +52,22 @@ * BeanValidator<O> validator = BeanValidatorFactory.newBeanValidator(O.class); * </pre> * + * <h2>Using the {@link BeanValidatorCreator}</h2> + * + * It is possible to use a {@link BeanValidatorCreator} to change the + * implementation of {@link BeanValidator} instanticated by the factory. + * + * For this just use the method + * {@link BeanValidatorFactory#setCreator(BeanValidatorCreator)}. + * + * By default it will us a default creator + * ({@link BeanValidatorFactory.DefaultBeanValidatorCreator}). + * * <strong>To be continued...</strong> * * @since 2.0 */ import org.nuiton.validator.bean.BeanValidatorFactory; +import org.nuiton.validator.bean.BeanValidatorFactory.BeanValidatorCreator; import org.nuiton.validator.bean.BeanValidator;

1 0

r2049 - in trunk/nuiton-validator/src/main/java/org/nuiton/validator: bean xwork2
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 14:07:59 +0100 (Tue, 25 Jan 2011) New Revision: 2049 Url: http://nuiton.org/repositories/revision/nuiton-utils/2049 Log: add a way to change the implementation of beanValidator Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProvider.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-25 11:35:33 UTC (rev 2048) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-25 13:07:59 UTC (rev 2049) @@ -800,6 +800,7 @@ } } + // now deal with mixte field (toAdd and toDelete) for (String field : newFields) { List<String> newMessagesForScope = newMessages.getMessagesForScope(field, scope); @@ -821,8 +822,6 @@ )); } - - } } Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java 2011-01-25 11:35:33 UTC (rev 2048) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java 2011-01-25 13:07:59 UTC (rev 2049) @@ -24,6 +24,8 @@ */ package org.nuiton.validator.bean; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorFactory; import org.nuiton.validator.NuitonValidatorProvider; @@ -31,19 +33,50 @@ /** * Factory of {@link BeanValidator}. - * + * <p/> * To obtain a new {@link BeanValidator}, use one of the method - * + * <p/> * <pre> * BeanValidatorFactory.newBeanValidator(XXX) * </pre> * * @author tchemit <chemit(a)codelutin.com> + * @see BeanValidator * @since 2.0 - * @see BeanValidator */ public class BeanValidatorFactory { + + /** Logger. */ + static private final Log log = + LogFactory.getLog(BeanValidatorFactory.class); + + + protected static BeanValidatorCreator creator; + + public static BeanValidatorCreator getCreator() { + if (creator == null) { + creator = new DefaultBeanValidatorCreator(); + if (log.isInfoEnabled()) { + log.info("Will use default beanValidator creator : " + creator); + } + + } + return creator; + } + + public static void setCreator(BeanValidatorCreator creator) { + BeanValidatorFactory.creator = creator; + if (log.isInfoEnabled()) { + log.info("Will use injected beanValidator creator : " + creator); + } + } + + public static boolean isDefaultCreator() { + return creator == null || + creator.getClass().equals(DefaultBeanValidatorCreator.class); + } + /** * Obtain a new {@link BeanValidator} for the given parameters. * <p/> @@ -72,10 +105,8 @@ scopes ); return beanValidator; - } - /** * Obtain a new {@link BeanValidator} for the given parameters. * <p/> @@ -103,12 +134,43 @@ NuitonValidatorProvider provider = NuitonValidatorFactory.getProvider(providerName); - BeanValidator<O> beanValidator = new BeanValidator<O>(provider, - type, - context, - scopes - ); + BeanValidator<O> beanValidator = + getCreator().newBeanValidator(provider, type, context, scopes); + return beanValidator; + } + /** + * Contract to create a {@link BeanValidator}. + * + * @since 2.0 + */ + public interface BeanValidatorCreator { + + <O> BeanValidator<O> newBeanValidator( + NuitonValidatorProvider provider, + Class<O> type, + String context, + NuitonValidatorScope... scopes + + ); } + + /** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since TODO + */ + public static class DefaultBeanValidatorCreator implements BeanValidatorCreator { + @Override + public <O> BeanValidator<O> newBeanValidator(NuitonValidatorProvider provider, Class<O> type, String context, NuitonValidatorScope... scopes) { + BeanValidator<O> beanValidator = new BeanValidator<O>(provider, + type, + context, + scopes + ); + return beanValidator; + } + } } Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProvider.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProvider.java 2011-01-25 11:35:33 UTC (rev 2048) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProvider.java 2011-01-25 13:07:59 UTC (rev 2049) @@ -55,7 +55,6 @@ public static final String PROVIDER_NAME = "xwork2"; - /** Logger. */ static private final Log log = LogFactory.getLog(XWork2NuitonValidatorProvider.class);

1 0

r2048 - trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 12:35:33 +0100 (Tue, 25 Jan 2011) New Revision: 2048 Url: http://nuiton.org/repositories/revision/nuiton-utils/2048 Log: fix change of context in BeanValidator Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-25 11:34:29 UTC (rev 2047) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-25 11:35:33 UTC (rev 2048) @@ -355,10 +355,16 @@ String oldContext = getContext(); + if (context == null && oldContext == null || context != null && context.equals(oldContext)) { + + // same context do nothing + return; + } NuitonValidatorModel<O> validatorModel = delegate.getModel(); // compute the new validator model - NuitonValidatorScope[] scopes = new NuitonValidatorScope[validatorModel.getScopes().size()]; + NuitonValidatorScope[] scopes = validatorModel.getScopes().toArray( + new NuitonValidatorScope[validatorModel.getScopes().size()]); rebuildDelegateValidator( validatorModel.getType(),

1 0

r2047 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 12:34:29 +0100 (Tue, 25 Jan 2011) New Revision: 2047 Url: http://nuiton.org/repositories/revision/nuiton-utils/2047 Log: Evolution #1235: Add a new method in ReflectUtil to find a given annotation on all fields of a class Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ReflectUtil.java 2011-01-25 07:05:55 UTC (rev 2046) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ReflectUtil.java 2011-01-25 11:34:29 UTC (rev 2047) @@ -28,13 +28,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -269,7 +272,27 @@ // not a primitive type return type; + } + /** + * Obtain all the fields with the given annotation type. + * + * @param objectClass the type to scan + * @param annotationClass the type of annotation to scan + * @param <A> type of annotation to scan + * @return the dictionnary of fields with the given annotation + * @since 2.0 + */ + public static <A extends Annotation> Map<Field, A> getFieldAnnotation(Class<?> objectClass, + Class<A> annotationClass) { + Map<Field, A> result = new HashMap<Field, A>(); + for (Field field : objectClass.getDeclaredFields()) { + A annotation = field.getAnnotation(annotationClass); + if (annotation != null) { + result.put(field, annotation); + } + } + return result; } protected static Method getDeclaredMethod(Class<?> klass,

1 0

r2046 - trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 08:05:55 +0100 (Tue, 25 Jan 2011) New Revision: 2046 Url: http://nuiton.org/repositories/revision/nuiton-utils/2046 Log: add headers Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-25 07:04:54 UTC (rev 2045) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-25 07:05:55 UTC (rev 2046) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Validator + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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.validator.bean; import org.apache.commons.beanutils.ConversionException; Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java 2011-01-25 07:04:54 UTC (rev 2045) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorFactory.java 2011-01-25 07:05:55 UTC (rev 2046) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Validator + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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.validator.bean; import org.nuiton.validator.NuitonValidator; Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java 2011-01-25 07:04:54 UTC (rev 2045) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java 2011-01-25 07:05:55 UTC (rev 2046) @@ -1,23 +1,23 @@ /* * #%L * Nuiton Utils :: Nuiton Validator - * + * * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% * 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 + * 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 + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L%

1 0

r2045 - in trunk/nuiton-validator/src/main: java/org/nuiton/validator java/org/nuiton/validator/bean resources
by tchemit＠users.nuiton.org 25 Jan '11

25 Jan '11

Author: tchemit Date: 2011-01-25 08:04:54 +0100 (Tue, 25 Jan 2011) New Revision: 2045 Url: http://nuiton.org/repositories/revision/nuiton-utils/2045 Log: fire all events in BeanValidator only after complete result merge + remove validators.xml file from api Removed: trunk/nuiton-validator/src/main/resources/validators.xml Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidatorResult.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidatorResult.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidatorResult.java 2011-01-24 20:11:37 UTC (rev 2044) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidatorResult.java 2011-01-25 07:04:54 UTC (rev 2045) @@ -65,7 +65,8 @@ return result; } - public boolean hasMessagesForScope(String field, NuitonValidatorScope scope) { + public boolean hasMessagesForScope(String field, + NuitonValidatorScope scope) { boolean result = false; if (messages != null) { result = messages.containsKey(scope); @@ -206,7 +207,9 @@ List<String> result = null; if (messages != null) { FieldMap<List<String>> fieldMap = messages.get(scope); - result = new ArrayList<String>(fieldMap.keySet()); + if (fieldMap != null) { + result = new ArrayList<String>(fieldMap.keySet()); + } } if (result == null) { result = Collections.emptyList(); Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-24 20:11:37 UTC (rev 2044) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-25 07:04:54 UTC (rev 2045) @@ -2,6 +2,7 @@ import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.BeanUtil; @@ -17,6 +18,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; @@ -317,7 +319,7 @@ validate(); } setChanged(false); - setValid(!messages.hasFatalMessages() && !messages.hasErrorMessagess()); + setValid(messages == null || messages.isValid()); firePropertyChange(BEAN_PROPERTY, oldBean, bean); } @@ -516,7 +518,7 @@ public void doValidate() { validate(); - setValid(!messages.hasFatalMessages() && !messages.hasErrorMessagess()); + setValid(messages == null || messages.isValid()); setChanged(true); } @@ -621,19 +623,37 @@ pcs.firePropertyChange(propertyName, oldValue, newValue); } + protected BeanValidatorEvent createEvent(String field, + NuitonValidatorScope scope, + String[] toAdd, + String[] toDelete) { + BeanValidatorEvent evt = new BeanValidatorEvent( + this, + field, + scope, + toAdd, + toDelete + ); + return evt; + } + protected void fireFieldChanged(String field, NuitonValidatorScope scope, String[] toAdd, String[] toDelete) { - BeanValidatorEvent evt = new BeanValidatorEvent( - this, + BeanValidatorEvent evt = createEvent( field, scope, toAdd, toDelete ); + fireFieldChanged(evt); + } + + protected void fireFieldChanged(BeanValidatorEvent evt) { + for (BeanValidatorListener listener : listenerList.getListeners(BeanValidatorListener.class)) { listener.onFieldChanged(evt); @@ -651,10 +671,13 @@ Set<NuitonValidatorScope> scopes = getDelegate().getEffectiveScopes(); + // list of events to send after the merge of messages + List<BeanValidatorEvent> events = new ArrayList<BeanValidatorEvent>(); + for (NuitonValidatorScope scope : scopes) { // do the merge at scope level - mergeMessages(scope, newMessages); + mergeMessages(scope, newMessages, events); } @@ -665,10 +688,19 @@ // finally keep the new messages as the current messages messages = newMessages; } + + if (CollectionUtils.isNotEmpty(events)) { + + // send all messages + for (BeanValidatorEvent event : events) { + fireFieldChanged(event); + } + } } protected void mergeMessages(NuitonValidatorScope scope, - NuitonValidatorResult newMessages) { + NuitonValidatorResult newMessages, + List<BeanValidatorEvent> events) { if (newMessages == null) { @@ -678,7 +710,7 @@ for (String field : fieldsForScope) { List<String> messagesForScope = messages.getMessagesForScope(field, scope); - fireFieldChanged(field, scope, null, messagesForScope.toArray(new String[messagesForScope.size()])); + events.add(createEvent(field, scope, null, messagesForScope.toArray(new String[messagesForScope.size()]))); } // suppress all messages for this scope @@ -695,7 +727,7 @@ for (String field : newFields) { List<String> messagesForScope = newMessages.getMessagesForScope(field, scope); - fireFieldChanged(field, scope, messagesForScope.toArray(new String[messagesForScope.size()]), null); + events.add(createEvent(field, scope, messagesForScope.toArray(new String[messagesForScope.size()]), null)); } // nothing else to do @@ -715,7 +747,7 @@ // this fields has now messages but not before : new messages List<String> messagesForScope = newMessages.getMessagesForScope(newField, scope); - fireFieldChanged(newField, scope, messagesForScope.toArray(new String[messagesForScope.size()]), null); + events.add(createEvent(newField, scope, messagesForScope.toArray(new String[messagesForScope.size()]), null)); // treated field itr.remove(); @@ -731,7 +763,7 @@ // this fields has no more messages List<String> messagesForScope = messages.getMessagesForScope(oldField, scope); - fireFieldChanged(oldField, scope, null, messagesForScope.toArray(new String[messagesForScope.size()])); + events.add(createEvent(oldField, scope, null, messagesForScope.toArray(new String[messagesForScope.size()]))); // treated field itr.remove(); @@ -751,12 +783,12 @@ Set<String> toAdd = new HashSet<String>(newMessagesForScope); toAdd.removeAll(oldMessagesForScope); - fireFieldChanged( + events.add(createEvent( field, scope, toAdd.isEmpty() ? null : toAdd.toArray(new String[toAdd.size()]), toDelete.isEmpty() ? null : toDelete.toArray(new String[toDelete.size()]) - ); + )); } Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java 2011-01-24 20:11:37 UTC (rev 2044) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java 2011-01-25 07:04:54 UTC (rev 2045) @@ -1,23 +1,23 @@ /* * #%L * Nuiton Utils :: Nuiton Validator - * + * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 CodeLutin, Tony Chemit * %% * 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 + * 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 + * + * 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% @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.0 */ -public class BeanValidatorMessage<E extends BeanValidatorMessage<?>> implements Comparable<E> , Serializable{ +public class BeanValidatorMessage<E extends BeanValidatorMessage<?>> implements Comparable<E>, Serializable { private static final long serialVersionUID = 1L; @@ -103,22 +103,22 @@ if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { + if (!(o instanceof BeanValidatorMessage<?>)) { return false; } BeanValidatorMessage<?> that = (BeanValidatorMessage<?>) o; return field.equals(that.field) && - message.equals(that.message) && + (message != null ? !message.equals(that.message) : that.message == null) && scope == that.scope; } @Override public int hashCode() { int result = field.hashCode(); - result = 31 * result + message.hashCode(); - result = 31 * result + scope.hashCode(); + result = 31 * result + (message != null ? message.hashCode() : 0); + result = 31 * result + (scope != null ? scope.hashCode() : 0); return result; } Deleted: trunk/nuiton-validator/src/main/resources/validators.xml =================================================================== --- trunk/nuiton-validator/src/main/resources/validators.xml 2011-01-24 20:11:37 UTC (rev 2044) +++ trunk/nuiton-validator/src/main/resources/validators.xml 2011-01-25 07:04:54 UTC (rev 2045) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator Config 1.0//EN" - "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd"> - - -<validators> - <validator name="requiredFile" - class="org.nuiton.validator.field.RequiredFileFieldValidator"/> - <validator name="existingFile" - class="org.nuiton.validator.field.ExistingFileFieldValidator"/> - <validator name="notExistingFile" - class="org.nuiton.validator.field.NotExistingFileFieldValidator"/> - <validator name="existingDirectory" - class="org.nuiton.validator.field.ExistingDirectoryFieldValidator"/> - <validator name="notExistingDirectory" - class="org.nuiton.validator.field.NotExistingDirectoryFieldValidator"/> - <validator name="collectionFieldExpression" - class="org.nuiton.validator.field.CollectionFieldExpressionValidator"/> - <validator name="collectionUniqueKey" - class="org.nuiton.validator.field.CollectionUniqueKeyValidator"/> -</validators> -

1 0

r2044 - trunk
by tchemit＠users.nuiton.org 24 Jan '11

24 Jan '11

Author: tchemit Date: 2011-01-24 21:11:37 +0100 (Mon, 24 Jan 2011) New Revision: 2044 Url: http://nuiton.org/repositories/revision/nuiton-utils/2044 Log: Evolution #1224: Updates to nuiton-i18n 2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-24 19:22:46 UTC (rev 2043) +++ trunk/pom.xml 2011-01-24 20:11:37 UTC (rev 2044) @@ -198,7 +198,7 @@ <projectId>nuiton-utils</projectId> - <nuitonI18nVersion>2.1-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.1</nuitonI18nVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion> <xworkVersion>2.1.3</xworkVersion>

1 0

r2043 - trunk
by tchemit＠users.nuiton.org 24 Jan '11

24 Jan '11

Author: tchemit Date: 2011-01-24 20:22:46 +0100 (Mon, 24 Jan 2011) New Revision: 2043 Url: http://nuiton.org/repositories/revision/nuiton-utils/2043 Log: Evolution #1231: Updates mavenpom to 2.4.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-24 16:38:52 UTC (rev 2042) +++ trunk/pom.xml 2011-01-24 19:22:46 UTC (rev 2043) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

r2042 - trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean
by tchemit＠users.nuiton.org 24 Jan '11

24 Jan '11

Author: tchemit Date: 2011-01-24 17:38:52 +0100 (Mon, 24 Jan 2011) New Revision: 2042 Url: http://nuiton.org/repositories/revision/nuiton-utils/2042 Log: open api (for JAxx purpose to replace the old BeanValidator api) Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-24 16:19:19 UTC (rev 2041) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidator.java 2011-01-24 16:38:52 UTC (rev 2042) @@ -368,6 +368,10 @@ ); } + public Class<O> getType() { + return delegate.getModel().getType(); + } + protected void rebuildDelegateValidator(Class<O> beanType, String context, NuitonValidatorScope... scopes) { @@ -447,8 +451,8 @@ return result; } - public NuitonValidatorScope getHighestScope(String field) { - if (messages==null) { + public NuitonValidatorScope getHighestScope(String field) { + if (messages == null) { // no messages return null; @@ -457,7 +461,7 @@ NuitonValidatorScope scope = messages.getFieldHighestScope(field); return scope; } - + /** * Convert a value. * <p/> Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java 2011-01-24 16:19:19 UTC (rev 2041) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/bean/BeanValidatorMessage.java 2011-01-24 16:38:52 UTC (rev 2042) @@ -26,6 +26,7 @@ import org.nuiton.validator.NuitonValidatorScope; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; @@ -40,8 +41,10 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.0 */ -public class BeanValidatorMessage<E extends BeanValidatorMessage<?>> implements Comparable<E> { +public class BeanValidatorMessage<E extends BeanValidatorMessage<?>> implements Comparable<E> , Serializable{ + private static final long serialVersionUID = 1L; + /** the validator that produce the message */ protected BeanValidator<?> validator;

1 0