- Nuiton-validator-commits - mailman.cloud.codelutin.com

r2602 - trunk/src/main/java/org/nuiton/validator/xwork2
by tchemit＠users.nuiton.org Sept. 12, 2013

Sept. 12, 2013

Author: tchemit Date: 2013-09-12 14:29:05 +0200 (Thu, 12 Sep 2013) New Revision: 2602 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2602 Log: fixes #2847: Add method to set the sharedValueStack fixes #2848: Make possible to reuse the ActionContext when possible Modified: trunk/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java Modified: trunk/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java 2013-09-11 15:24:03 UTC (rev 2601) +++ trunk/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java 2013-09-12 12:29:05 UTC (rev 2602) @@ -67,8 +67,8 @@ private static final Log log = LogFactory.getLog(XWork2ValidatorUtil.class); /** - * a shared value stack to allow external operations on it (for example add - * some datas in stack to be usedby validators + * A shared value stack to allow external operations on it (for example add + * some datas in stack to be used by validators. */ static private ValueStack sharedValueStack; @@ -84,14 +84,45 @@ return sharedValueStack; } + /** + * Sets the given value stack as shared (can be null). + * + * @param sharedValueStack the new shared value stack to use (can be null). + * @since 3.0 + */ + public static void setSharedValueStack(ValueStack sharedValueStack) { + if (log.isDebugEnabled()) { + log.debug("set shared value stack " + sharedValueStack); + } + XWork2ValidatorUtil.sharedValueStack = sharedValueStack; + } + public static ValueStack createValuestack() { - ConfigurationManager confManager = new ConfigurationManager(); - Configuration conf = confManager.getConfiguration(); - Container container = conf.getContainer(); - ValueStackFactory stackFactory = container.getInstance(ValueStackFactory.class); - ValueStack vs = stackFactory.createValueStack(); - return vs; + ValueStack result; + + ActionContext context = ActionContext.getContext(); + if (context == null) { + + // no action context, create a value stack from scratch + ConfigurationManager confManager = new ConfigurationManager(); + Configuration conf = confManager.getConfiguration(); + Container container = conf.getContainer(); + ValueStackFactory stackFactory = container.getInstance(ValueStackFactory.class); + result = stackFactory.createValueStack(); + } else { + + // there is an action context, try to use his value stack + result = context.getValueStack(); + + if (result == null) { + + // no value stack, create then a new one + ValueStackFactory stackFactory = context.getInstance(ValueStackFactory.class); + result = stackFactory.createValueStack(); + } + } + return result; } public static <O> XWork2ScopeValidator<O> newXWorkScopeValidator(Class<O> beanClass, String contextName, @@ -124,39 +155,46 @@ } } - ActionContext context = new ActionContext(vs.getContext()); + ActionContext context = ActionContext.getContext(); - // must set the action context otherwise can't obtain after validators - // with the method validator.getValidators(XXX) - // Later in the code, we could not having reference to the ValueStack - // before using a validator... Must be cleaned... - ActionContext.setContext(context); + if (context == null) { + context = new ActionContext(vs.getContext()); + // must set the action context otherwise can't obtain after validators + // with the method validator.getValidators(XXX) + // Later in the code, we could not having reference to the ValueStack + // before using a validator... Must be cleaned... + ActionContext.setContext(context); + + } Container container = context.getContainer(); - // We need sometimes a ActionInvocation (see http://nuiton.org/issues/2837) - Configuration configuration = container.getInstance(Configuration.class); + if (context.getActionInvocation() == null) { - UnknownHandlerConfig unknownHandlerStack = new UnknownHandlerConfig("nuiton"); - List<UnknownHandlerConfig> unknownHandlerStackList = configuration.getUnknownHandlerStack(); + // We need sometimes a ActionInvocation (see http://nuiton.org/issues/2837) + Configuration configuration = container.getInstance(Configuration.class); - if (unknownHandlerStackList == null) { - unknownHandlerStackList = Lists.newArrayList(); - configuration.setUnknownHandlerStack(unknownHandlerStackList); - } - unknownHandlerStackList.add(0, unknownHandlerStack); + UnknownHandlerConfig unknownHandlerStack = new UnknownHandlerConfig("nuiton"); + List<UnknownHandlerConfig> unknownHandlerStackList = configuration.getUnknownHandlerStack(); - Map<String, Object> extraContext = Maps.newHashMap(); - extraContext.put(ActionContext.VALUE_STACK, vs); - DefaultActionInvocation invocation = new DefaultActionInvocation(extraContext, false); - invocation.setObjectFactory(container.getInstance(ObjectFactory.class)); - invocation.setContainer(container); + if (unknownHandlerStackList == null) { + unknownHandlerStackList = Lists.newArrayList(); + configuration.setUnknownHandlerStack(unknownHandlerStackList); + } + unknownHandlerStackList.add(0, unknownHandlerStack); - ActionProxyFactory actionProxyFactory = context.getInstance(ActionProxyFactory.class); - ActionProxy actionProxy = actionProxyFactory.createActionProxy(invocation, "java.lang", "java.lang.Object", "nuiton-validation", false, false); - invocation.init(actionProxy); - context.setActionInvocation(invocation); + Map<String, Object> extraContext = Maps.newHashMap(); + extraContext.put(ActionContext.VALUE_STACK, vs); + DefaultActionInvocation invocation = new DefaultActionInvocation(extraContext, false); + invocation.setObjectFactory(container.getInstance(ObjectFactory.class)); + invocation.setContainer(container); + ActionProxyFactory actionProxyFactory = context.getInstance(ActionProxyFactory.class); + ActionProxy actionProxy = actionProxyFactory.createActionProxy(invocation, "java.lang", "java.lang.Object", "nuiton-validation", false, false); + invocation.init(actionProxy); + context.setActionInvocation(invocation); + + } // init validator ActionValidatorManager validatorManager =

1 0

r2601 - in trunk/src: main/java/org/nuiton/validator/xwork2 main/resources test/java/org/nuiton/validator/model test/java/org/nuiton/validator/xwork2 test/resources/org/nuiton/validator/model
by tchemit＠users.nuiton.org Sept. 11, 2013

Sept. 11, 2013

Author: tchemit Date: 2013-09-11 17:24:03 +0200 (Wed, 11 Sep 2013) New Revision: 2601 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2601 Log: fixes #2837: Can not validate when using a visitor validator Added: trunk/src/main/resources/xwork.xml trunk/src/test/java/org/nuiton/validator/model/Family.java trunk/src/test/resources/org/nuiton/validator/model/Family-error-validation.xml Modified: trunk/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java trunk/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorTest.java Modified: trunk/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java 2013-08-09 09:04:19 UTC (rev 2600) +++ trunk/src/main/java/org/nuiton/validator/xwork2/XWork2ValidatorUtil.java 2013-09-11 15:24:03 UTC (rev 2601) @@ -23,10 +23,22 @@ */ package org.nuiton.validator.xwork2; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.ActionProxyFactory; +import com.opensymphony.xwork2.DefaultActionInvocation; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.Result; +import com.opensymphony.xwork2.UnknownHandler; +import com.opensymphony.xwork2.XWorkException; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; +import com.opensymphony.xwork2.config.entities.ActionConfig; +import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; import com.opensymphony.xwork2.validator.ActionValidatorManager; @@ -38,6 +50,7 @@ import org.nuiton.validator.NuitonValidatorScope; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -119,8 +132,33 @@ // before using a validator... Must be cleaned... ActionContext.setContext(context); + Container container = context.getContainer(); + + // We need sometimes a ActionInvocation (see http://nuiton.org/issues/2837) + Configuration configuration = container.getInstance(Configuration.class); + + UnknownHandlerConfig unknownHandlerStack = new UnknownHandlerConfig("nuiton"); + List<UnknownHandlerConfig> unknownHandlerStackList = configuration.getUnknownHandlerStack(); + + if (unknownHandlerStackList == null) { + unknownHandlerStackList = Lists.newArrayList(); + configuration.setUnknownHandlerStack(unknownHandlerStackList); + } + unknownHandlerStackList.add(0, unknownHandlerStack); + + Map<String, Object> extraContext = Maps.newHashMap(); + extraContext.put(ActionContext.VALUE_STACK, vs); + DefaultActionInvocation invocation = new DefaultActionInvocation(extraContext, false); + invocation.setObjectFactory(container.getInstance(ObjectFactory.class)); + invocation.setContainer(container); + + ActionProxyFactory actionProxyFactory = context.getInstance(ActionProxyFactory.class); + ActionProxy actionProxy = actionProxyFactory.createActionProxy(invocation, "java.lang", "java.lang.Object", "nuiton-validation", false, false); + invocation.init(actionProxy); + context.setActionInvocation(invocation); + // init validator - Container container = context.getContainer(); + ActionValidatorManager validatorManager = container.getInstance(ActionValidatorManager.class, "no-annotations"); @@ -229,4 +267,45 @@ return fields; } + + /** + * A dummy unknown handler when we want to use for example visitor validators + * which need a invocation handler. + * + * Note: Do not use this for any purpose... + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ + public static class NuitonDefaultUnknownHandler implements UnknownHandler { + + protected Configuration configuration; + + protected ObjectFactory objectFactory; + + @Inject + public void setConfiguration(Configuration configuration) { + this.configuration = configuration; + } + + @Inject + public void setObjectFactory(ObjectFactory objectFactory) { + this.objectFactory = objectFactory; + } + + @Override + public ActionConfig handleUnknownAction(String namespace, String actionName) throws XWorkException { + return new ActionConfig.Builder(namespace, actionName, Object.class.getName()).build(); + } + + @Override + public Result handleUnknownResult(ActionContext actionContext, String actionName, ActionConfig actionConfig, String resultCode) throws XWorkException { + return null; + } + + @Override + public Object handleUnknownActionMethod(Object action, String methodName) throws NoSuchMethodException { + return null; + } + } } Added: trunk/src/main/resources/xwork.xml =================================================================== --- trunk/src/main/resources/xwork.xml (rev 0) +++ trunk/src/main/resources/xwork.xml 2013-09-11 15:24:03 UTC (rev 2601) @@ -0,0 +1,31 @@ + +<!DOCTYPE xwork PUBLIC + "-//Apache Struts//XWork 2.3//EN" + "http://struts.apache.org/dtds/xwork-2.3.dtd"> + +<xwork> + <bean type="com.opensymphony.xwork2.UnknownHandler" name="nuiton" class="org.nuiton.validator.xwork2.XWork2ValidatorUtil$NuitonDefaultUnknownHandler"/> + +</xwork> Property changes on: trunk/src/main/resources/xwork.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/src/test/java/org/nuiton/validator/model/Family.java =================================================================== --- trunk/src/test/java/org/nuiton/validator/model/Family.java (rev 0) +++ trunk/src/test/java/org/nuiton/validator/model/Family.java 2013-09-11 15:24:03 UTC (rev 2601) @@ -0,0 +1,46 @@ +package org.nuiton.validator.model; + +/* + * #%L + * Nuiton Validator + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 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% + */ + +import java.util.Collection; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class Family { + + public static final String PROPERTY_MEMBER = "member"; + + protected Collection<Person> member; + + public Collection<Person> getMember() { + return member; + } + + public void setMember(Collection<Person> member) { + this.member = member; + } +} Property changes on: trunk/src/test/java/org/nuiton/validator/model/Family.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorTest.java 2013-08-09 09:04:19 UTC (rev 2600) +++ trunk/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorTest.java 2013-09-11 15:24:03 UTC (rev 2601) @@ -23,11 +23,14 @@ */ package org.nuiton.validator.xwork2; +import com.google.common.collect.Sets; import org.junit.Assert; import org.junit.Test; import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorModel; +import org.nuiton.validator.NuitonValidatorResult; import org.nuiton.validator.ValidatorTestHelper; +import org.nuiton.validator.model.Family; import org.nuiton.validator.model.Person; /** @@ -56,4 +59,35 @@ } + @Test + public void testNewValidator2() throws Exception { + + XWork2NuitonValidatorProvider provider = + new XWork2NuitonValidatorProvider(); + + NuitonValidatorModel<Family> model = + provider.getModel(Family.class, null); + + NuitonValidator<Family> validator = provider.newValidator(model); + + Assert.assertNotNull(validator); + + Family f = new Family(); + Person father = new Person(); + Person mother = new Person(); + f.setMember(Sets.newHashSet(father, mother)); + + NuitonValidatorResult validate = validator.validate(f); + + Assert.assertFalse(validate.isValid()); + + father.setFirstname("john"); + father.setName("smith"); + mother.setFirstname("jim"); // since 18 mai 2013 possible in France! + mother.setName("smith"); + + validate = validator.validate(f); + + Assert.assertTrue(validate.isValid()); + } } Added: trunk/src/test/resources/org/nuiton/validator/model/Family-error-validation.xml =================================================================== --- trunk/src/test/resources/org/nuiton/validator/model/Family-error-validation.xml (rev 0) +++ trunk/src/test/resources/org/nuiton/validator/model/Family-error-validation.xml 2013-09-11 15:24:03 UTC (rev 2601) @@ -0,0 +1,37 @@ + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="member"> + <field-validator type="visitor"> + <param name="appendPrefix">true</param> + <param name="context">error</param> + <message>family.member.notValid</message> + </field-validator> + </field> + +</validators> Property changes on: trunk/src/test/resources/org/nuiton/validator/model/Family-error-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2600 - trunk
by tchemit＠users.nuiton.org Aug. 9, 2013

Aug. 9, 2013

Author: tchemit Date: 2013-08-09 11:04:19 +0200 (Fri, 09 Aug 2013) New Revision: 2600 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2600 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-08 13:12:30 UTC (rev 2599) +++ trunk/pom.xml 2013-08-09 09:04:19 UTC (rev 2600) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.13</version> + <version>4.0</version> </parent> <artifactId>nuiton-validator</artifactId> @@ -63,6 +63,8 @@  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> +  + <skipPostRelease>false</skipPostRelease> </properties> <dependencies>

1 0

r2599 - in trunk/src: main/java/org/nuiton/validator/xwork2/field test/java/org/nuiton/validator/model test/java/org/nuiton/validator/xwork2/field test/resources test/resources/org/nuiton/validator/model
by Bavencoff＠users.nuiton.org Aug. 8, 2013

Aug. 8, 2013

Author: Bavencoff Date: 2013-08-08 15:12:30 +0200 (Thu, 08 Aug 2013) New Revision: 2599 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2599 Log: Add French SIREN validator. Move Luhn checksum in FrenchSiretFieldValidator to FieldValidatorUtil add Luhn checksum in FrenchFinessValidator Added: trunk/src/main/java/org/nuiton/validator/xwork2/field/FieldValidatorUtil.java trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchSirenFieldValidator.java trunk/src/test/java/org/nuiton/validator/xwork2/field/FieldValidatorUtilTest.java trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchSirenFieldValidatorTest.java Modified: trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidator.java trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java trunk/src/test/java/org/nuiton/validator/model/Company.java trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidatorTest.java trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidatorTest.java trunk/src/test/resources/org/nuiton/validator/model/Company-error-validation.xml trunk/src/test/resources/validators.xml Added: trunk/src/main/java/org/nuiton/validator/xwork2/field/FieldValidatorUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/xwork2/field/FieldValidatorUtil.java (rev 0) +++ trunk/src/main/java/org/nuiton/validator/xwork2/field/FieldValidatorUtil.java 2013-08-08 13:12:30 UTC (rev 2599) @@ -0,0 +1,99 @@ +package org.nuiton.validator.xwork2.field; + +/** + * Util tool for Field validator + * + * + * + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + * @since 3.0 + * + */ + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class FieldValidatorUtil { + + /** + * Verifie la validite d'un numero en suivant l'algorithme Luhn tel que d'ecrit + * dans <a href="http://fr.wikipedia.org/wiki/Luhn">wikipedia</a> + * + * Algo: + * en fonction de la position du numero dans la sequence, + * on multiplie pas 1 (pour les impaires) ou par 2 pour les paires + * (1 etant le numero le plus a droite) + * On fait la somme de tous les chiffres qui resulte de ces multiplications + * (si un resultat etait 14, on ne fait pas +14 mais +1+4) + * + * Si le résultat de cette somme donne un reste de 0 une fois divisé par 10 + * le numero est valide. + * + * @param value une chaine composer que de chiffre + * @return vrai si on a reussi a valider le numero + */ + public static boolean luhnChecksum(String value) { + + char[] tab = value.toCharArray(); + int sum = 0; + + // on multiple alternativement par 1 ou par 2 les chiffres + // sachant que le chiffre le plus à droite est multiplié par 1 + + // l'offset permet de savoir si le premier chiffre( le plus a gauche) doit etre + // multiplier par 1 ( offset = 0) + // multiplier par 2 (offset = 1) + int offset = (tab.length + 1) % 2; + + + for (int i = 0; i < tab.length; i++) { + + // recuperation de la valeur + int n = getDigit(tab[i]); + + // multiplication par 1 ou 2 en fonction de l'index et de l'offset + n *= (i + offset) % 2 + 1; + + // si une fois multiplie il est superieur a 9, il faut additionner + // toutes ces constituante, mais comme il ne peut pas etre superieur + // a 18, cela revient a retrancher 9 + if (n > 9) { + n -= 9; + } + + // on peut directement faire la somme + sum += n; + } + + // 3eme phase on verifie que c'est bien un multiple de 10 + boolean result = sum % 10 == 0; + + return result; + } + + + /** + * Converti un char en un entier '0' => 0 et '9' => 9, et 'A' => 1 a 'Z' => 36, + * les autres caractere sont aussi convertis pour que + * A|B|C|D|E|F|G|H|I|J + * K|L|M|N|O|P|Q|R|S|T + * U|V|W|X|Y|Z| | | | + * -+-+-+-+-+-+-+-+-+ + * 1|2|3|4|5|6|7|8|9|0. + * Pour les autres c'est un indedermine + * + * @param c le caractere qui doit etre converti + * @return le chiffre + */ + public static int getDigit(char c) { + int result = 0; + if (c >= '0' && c <= '9') { + result = c - '0'; + } else if (c >= 'A' && c <= 'Z') { + result = (c - 'A' + 1) % 10; + } else { + result = (c - 'a' + 1) % 10; + } + return result; + } +} Modified: trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidator.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidator.java 2013-07-23 15:54:55 UTC (rev 2598) +++ trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidator.java 2013-08-08 13:12:30 UTC (rev 2599) @@ -37,9 +37,9 @@ */ public class FrenchFinessFieldValidator extends NuitonFieldValidatorSupport { - protected static final String SIRET_REGEXP = "([0-9]{2}|2A|2B)0([0-9]{6})"; + protected static final String FINESS_REGEXP = "(0[1-9]|[1-9][0-9]|2A|2B)0([0-9]{6})"; - protected static final Pattern p = Pattern.compile(SIRET_REGEXP); + protected static final Pattern p = Pattern.compile(FINESS_REGEXP); @Override protected void validateWhenNotSkip(Object object) throws ValidationException { @@ -80,7 +80,7 @@ finess = finess.replaceAll(" ", ""); Matcher m = p.matcher(finess); - if (!m.matches()) { + if (!m.matches() || ! FieldValidatorUtil.luhnChecksum(finess)) { addFieldError(fieldName, object); } } Added: trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchSirenFieldValidator.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchSirenFieldValidator.java (rev 0) +++ trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchSirenFieldValidator.java 2013-08-08 13:12:30 UTC (rev 2599) @@ -0,0 +1,80 @@ +package org.nuiton.validator.xwork2.field; + +import com.opensymphony.xwork2.validator.ValidationException; +import org.apache.commons.lang3.StringUtils; + +import java.lang.reflect.Array; +import java.util.Collection; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Validator for French SIREN numbers + * + * Siret can be in: + * <li>String format: "442116703" + * <li>long, int: 442116703 + * <li>Array or Collection of something: [4,4,2,1,1,6,7,0,,3] or ["442","116","70", "3"] + * + * @author ylvain Bavencoff <bavencoff(a)codelutin.com> + * @since 3.0 + * Validation do the Luhn checksum too + */ + +public class FrenchSirenFieldValidator extends NuitonFieldValidatorSupport { + + protected static final String SIREN_REGEXP = "[0-9]{9}"; + + protected static final Pattern p = Pattern.compile(SIREN_REGEXP); + + @Override + public void validateWhenNotSkip(Object object) throws ValidationException { + + String fieldName = getFieldName(); + Object value = getFieldValue(fieldName, object); + + if (value == null) { + // no value defined + return; + } + String siren; + + if (value.getClass().isArray()) { + // le siren est stocker dans un tableau, par exemple un byte[] + siren = ""; + for (int i = 0; i < Array.getLength(value); i++) { + siren += String.valueOf(Array.get(value, i)); + } + } else if (value instanceof Collection<?>) { + // le siren est stocker dans une collection, + // ca doit pas arriver souvent :D, mais autant le gerer + siren = ""; + for (Object o : (Collection<?>) value) { + siren += String.valueOf(o); + } + } else { + // sinon dans tous les autres cas (String, int, long, BigInteger ...) + // on prend le toString + siren = String.valueOf(value); + } + + if (StringUtils.isEmpty(siren)) { + // no value defined + return; + } + + // Remove any space + siren = siren.replaceAll(" ", ""); + + Matcher m = p.matcher(siren); + if (!m.matches() || ! FieldValidatorUtil.luhnChecksum(siren)) { + addFieldError(fieldName, object); + } + } + + @Override + public String getValidatorType() { + return "frenchSiret"; + } + +} Modified: trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java =================================================================== --- trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java 2013-07-23 15:54:55 UTC (rev 2598) +++ trunk/src/main/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidator.java 2013-08-08 13:12:30 UTC (rev 2599) @@ -89,7 +89,7 @@ siret = siret.replaceAll(" ", ""); Matcher m = p.matcher(siret); - if (!m.matches() || !luhnChecksum(siret)) { + if (!m.matches() || ! FieldValidatorUtil.luhnChecksum(siret)) { addFieldError(fieldName, object); } } @@ -99,78 +99,4 @@ return "frenchSiret"; } - /** - * Verifie la validite d'un numero en suivant l'algorithme Luhn tel que d'ecrit - * dans <a href="http://fr.wikipedia.org/wiki/Luhn">wikipedia</a> - * - * Algo: - * en fonction de la position du numero dans la sequence, - * on multiplie pas 1 (pour les impaires) ou par 2 pour les paires - * (1 etant le numero le plus a droite) - * On fait la somme de tous les chiffres qui resulte de ces multiplications - * (si un resultat etait 14, on ne fait pas +14 mais +1+4) - * - * Si le résultat de cette somme donne un reste de 0 une fois divisé par 10 - * le numero est valide. - * - * @param siret une chaine composer que de chiffre - * @return vrai si on a reussi a valider le numero - */ - public static boolean luhnChecksum(String siret) { - - char[] tab = siret.toCharArray(); - int sum = 0; - for (int i = tab.length - 1; i >= 0; i--) { - // recuperation de la valeur - int n = getDigit(tab[i]); - - // 1ere phase il faut faire la multiplication par 1 ou 2 - - // il faut faire x1 pour les paires et x2 sur les impaires. - // en prenant en compte que le numero siret le plus a droite est le - // 1 et le plus a gauche le 14. - // mais comme en informatique on commence a 0 :D - // il faut faire +1 sur l'indice puis un simple module 2 + 1 - // nous convient - n *= (i + 1) % 2 + 1; - - // 2eme phase il faut faire l'addition - - // si une fois multiplie il est superieur a 9, il faut additionner - // toutes ces constituante, mais comme il ne peut pas etre superieur - // a 18, cela revient a retrancher 9 - if (n > 9) { - n -= 9; - } - - // on peut directement faire la somme - sum += n; - } - - // 3eme phase on verifie que c'est bien un multiple de 10 - boolean result = sum % 10 == 0; - - return result; - } - - - /** - * Converti un char en un entier '0' => 0 et '9' => 9, et 'A' => 10 a 'Z' => 36, - * les autres caractere sont aussi convertis pour que 'a' = 10 et 'z' = 36. - * Pour les autres c'est un indedermine - * - * @param c le caractere qui doit etre converti - * @return le chiffre - */ - public static int getDigit(char c) { - int result = 0; - if (c >= '0' && c <= '9') { - result = c - '0'; - } else if (c >= 'A' && c <= 'Z') { - result = c - 'A' + 10; - } else { - result = c - 'a' + 10; - } - return result; - } } Modified: trunk/src/test/java/org/nuiton/validator/model/Company.java =================================================================== --- trunk/src/test/java/org/nuiton/validator/model/Company.java 2013-07-23 15:54:55 UTC (rev 2598) +++ trunk/src/test/java/org/nuiton/validator/model/Company.java 2013-08-08 13:12:30 UTC (rev 2599) @@ -33,10 +33,14 @@ public static final String PROPERTY_SIRET = "siret"; + public static final String PROPERTY_SIREN = "siren"; + protected String vat; protected String siret; + protected String siren; + public String getVat() { return vat; } @@ -52,4 +56,12 @@ public void setSiret(String siret) { this.siret = siret; } + + public String getSiren() { + return siren; + } + + public void setSiren(String siren) { + this.siren = siren; + } } Added: trunk/src/test/java/org/nuiton/validator/xwork2/field/FieldValidatorUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/validator/xwork2/field/FieldValidatorUtilTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/validator/xwork2/field/FieldValidatorUtilTest.java 2013-08-08 13:12:30 UTC (rev 2599) @@ -0,0 +1,25 @@ +package org.nuiton.validator.xwork2.field; + +import org.junit.Assert; +import org.junit.Test; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class FieldValidatorUtilTest extends Assert { + + @Test + public void TestLuhnChecksum() throws Exception { + // verification sur de vrai numero siret (ca doit passer :) + assertTrue(FieldValidatorUtil.luhnChecksum("44211670300038")); + assertTrue(FieldValidatorUtil.luhnChecksum("73282932000074")); + assertTrue(FieldValidatorUtil.luhnChecksum("2A0002879")); + + // verification avec les memes, en ne modifiant que le dernier chiffre + // ca doit failer + assertFalse(FieldValidatorUtil.luhnChecksum("44211670300030")); + assertFalse(FieldValidatorUtil.luhnChecksum("73282932000070")); + assertFalse(FieldValidatorUtil.luhnChecksum("2A0002870")); + } + +} Modified: trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidatorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidatorTest.java 2013-07-23 15:54:55 UTC (rev 2598) +++ trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidatorTest.java 2013-08-08 13:12:30 UTC (rev 2599) @@ -42,13 +42,23 @@ assertNull(bean.getFiness()); // Valid Finess - bean.setFiness("440123456"); + bean.setFiness("440012664"); assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", false); // Valid Finess - bean.setFiness("2B0483714"); + bean.setFiness("310001177"); assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + false); + + // Valid Finess + bean.setFiness("2A0002879"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + false); + + // Valid Finess + bean.setFiness("2B0000236"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", false); // not Valid Finess @@ -67,7 +77,7 @@ true); // not Valid Finess - bean.setFiness("441123456"); + bean.setFiness("000123456"); assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", true); @@ -81,5 +91,10 @@ assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", true); + // not Valid Finess + bean.setFiness("440012666"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + true); + } } Added: trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchSirenFieldValidatorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchSirenFieldValidatorTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchSirenFieldValidatorTest.java 2013-08-08 13:12:30 UTC (rev 2599) @@ -0,0 +1,67 @@ +package org.nuiton.validator.xwork2.field; + +import org.junit.Test; +import org.nuiton.validator.model.Company; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class FrenchSirenFieldValidatorTest extends AbstractFieldValidatorTest<Company> { + + public FrenchSirenFieldValidatorTest() { + super(Company.class); + } + + @Test + @Override + public void testValidator() throws Exception { + + assertNull(bean.getSiren()); + + // Valid siren + bean.setSiren("751700782"); + assertFieldInError(Company.PROPERTY_SIREN, "company.siren.format", + false); + + // Valid siren + bean.setSiren("263903007"); + assertFieldInError(Company.PROPERTY_SIREN, "company.siren.format", + false); + + // Not Valid siren, because bad checksum + bean.setSiren("263903000"); + assertFieldInError(Company.PROPERTY_SIREN, "company.siren.format", + true); + + // Not valid siren + bean.setSiren("44211670"); + assertFieldInError(Company.PROPERTY_SIREN, "company.siren.format", + true); + + // Not valid siren + bean.setSiren("442116703000389"); + assertFieldInError(Company.PROPERTY_SIREN, "company.siren.format", + true); + + // Not valid siren + bean.setSiren("4421bf167"); + assertFieldInError(Company.PROPERTY_SIREN, "company.siren.format", + true); + + // Use requiredString for empty siren + bean.setSiren(""); + assertFieldInError(Company.PROPERTY_SIREN, "company.siren.format", + false); + + // Use required for null siren + bean.setSiren(null); + assertFieldInError(Company.PROPERTY_SIREN, "company.siren.format", + false); + + // Valid siren with spaces + bean.setSiren("535 198 188 "); + assertFieldInError(Company.PROPERTY_SIREN, "company.siren.format", + false); + + } +} \ No newline at end of file Modified: trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidatorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidatorTest.java 2013-07-23 15:54:55 UTC (rev 2598) +++ trunk/src/test/java/org/nuiton/validator/xwork2/field/FrenchSiretFieldValidatorTest.java 2013-08-08 13:12:30 UTC (rev 2599) @@ -37,18 +37,6 @@ } @Test - public void TestLuhnChecksum() throws Exception { - // verification sur de vrai numero siret (ca doit passer :) - assertTrue(FrenchSiretFieldValidator.luhnChecksum("44211670300038")); - assertTrue(FrenchSiretFieldValidator.luhnChecksum("73282932000074")); - - // verification avec les memes, en ne modifiant que le dernier chiffre - // ca doit failer - assertFalse(FrenchSiretFieldValidator.luhnChecksum("44211670300030")); - assertFalse(FrenchSiretFieldValidator.luhnChecksum("73282932000070")); - } - - @Test @Override public void testValidator() throws Exception { Modified: trunk/src/test/resources/org/nuiton/validator/model/Company-error-validation.xml =================================================================== --- trunk/src/test/resources/org/nuiton/validator/model/Company-error-validation.xml 2013-07-23 15:54:55 UTC (rev 2598) +++ trunk/src/test/resources/org/nuiton/validator/model/Company-error-validation.xml 2013-08-08 13:12:30 UTC (rev 2599) @@ -32,6 +32,12 @@ </field-validator> </field> + <field name="siren"> + <field-validator type="frenchSiren"> + <message>company.siren.format</message> + </field-validator> + </field> + <field name="vat"> <field-validator type="vatIdentificationNumber"> <message>company.vat.format</message> Modified: trunk/src/test/resources/validators.xml =================================================================== --- trunk/src/test/resources/validators.xml 2013-07-23 15:54:55 UTC (rev 2598) +++ trunk/src/test/resources/validators.xml 2013-08-08 13:12:30 UTC (rev 2599) @@ -67,6 +67,7 @@ <validator name="frenchLastName" class="org.nuiton.validator.xwork2.field.FrenchLastNameFieldValidator"/> <validator name="frenchPostCode" class="org.nuiton.validator.xwork2.field.FrenchPostCodeFieldValidator"/> <validator name="frenchSiret" class="org.nuiton.validator.xwork2.field.FrenchSiretFieldValidator"/> + <validator name="frenchSiren" class="org.nuiton.validator.xwork2.field.FrenchSirenFieldValidator"/> <validator name="frenchFiness" class="org.nuiton.validator.xwork2.field.FrenchFinessFieldValidator"/>

1 0

r2598 - trunk
by maven-release＠users.nuiton.org July 23, 2013

July 23, 2013

Author: maven-release Date: 2013-07-23 17:54:55 +0200 (Tue, 23 Jul 2013) New Revision: 2598 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2598 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:54:51 UTC (rev 2597) +++ trunk/pom.xml 2013-07-23 15:54:55 UTC (rev 2598) @@ -9,7 +9,7 @@ </parent> <artifactId>nuiton-validator</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-SNAPSHOT</version> <name>Nuiton Validator</name> <description>Simple Validator API</description> @@ -34,12 +34,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-validator/tags/nuiton-validator-3.… + scm:svn:http://svn.nuiton.org/svn/nuiton-validator/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-validator/tags/nuiton-validator-3.… + scm:svn:http://svn.nuiton.org/svn/nuiton-validator/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-validator/repository/show/tags/nuiton-val…</url> + <url>http://nuiton.org/projects/nuiton-validator/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r2597 - in tags: . nuiton-validator-3.0-alpha-1
by maven-release＠users.nuiton.org July 23, 2013

July 23, 2013

Author: maven-release Date: 2013-07-23 17:54:51 +0200 (Tue, 23 Jul 2013) New Revision: 2597 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2597 Log: [maven-release-plugin] copy for tag nuiton-validator-3.0-alpha-1 Added: tags/nuiton-validator-3.0-alpha-1/ Property changes on: tags/nuiton-validator-3.0-alpha-1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project testdir .idea Added: svn:mergeinfo +

1 0

r2596 - trunk
by maven-release＠users.nuiton.org July 23, 2013

July 23, 2013

Author: maven-release Date: 2013-07-23 17:54:49 +0200 (Tue, 23 Jul 2013) New Revision: 2596 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2596 Log: [maven-release-plugin] prepare release nuiton-validator-3.0-alpha-1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:44:55 UTC (rev 2595) +++ trunk/pom.xml 2013-07-23 15:54:49 UTC (rev 2596) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -11,7 +9,7 @@ </parent> <artifactId>nuiton-validator</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-1</version> <name>Nuiton Validator</name> <description>Simple Validator API</description> @@ -36,12 +34,12 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-validator/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-validator/tags/nuiton-validator-3.… </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-validator/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-validator/tags/nuiton-validator-3.… </developerConnection> - <url>http://nuiton.org/projects/nuiton-validator/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-validator/repository/show/tags/nuiton-val…</url> </scm> <distributionManagement> <site>

1 0

r2595 - trunk
by tchemit＠users.nuiton.org July 23, 2013

July 23, 2013

Author: tchemit Date: 2013-07-23 17:44:55 +0200 (Tue, 23 Jul 2013) New Revision: 2595 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2595 Log: use last stable of nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:43:16 UTC (rev 2594) +++ trunk/pom.xml 2013-07-23 15:44:55 UTC (rev 2595) @@ -72,7 +72,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.6.12</version> </dependency> <dependency>

1 0

r2594 - trunk
by tchemit＠users.nuiton.org July 23, 2013

July 23, 2013

Author: tchemit Date: 2013-07-23 17:43:16 +0200 (Tue, 23 Jul 2013) New Revision: 2594 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2594 Log: fix release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:22:24 UTC (rev 2593) +++ trunk/pom.xml 2013-07-23 15:43:16 UTC (rev 2594) @@ -62,6 +62,9 @@  <siteSourcesType>apt</siteSourcesType> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> <dependencies>

1 0

r2593 - trunk/src/site/apt
by tchemit＠users.nuiton.org July 23, 2013

July 23, 2013

Author: tchemit Date: 2013-07-23 17:22:24 +0200 (Tue, 23 Jul 2013) New Revision: 2593 Url: http://nuiton.org/projects/nuiton-validator/repository/revisions/2593 Log: fix typo Modified: trunk/src/site/apt/index.apt Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2013-07-23 15:14:24 UTC (rev 2592) +++ trunk/src/site/apt/index.apt 2013-07-23 15:22:24 UTC (rev 2593) @@ -41,9 +41,9 @@ Voici quelques liens sur le nouveau projet: - * {{{http://svn.nution.org/svn/nuiton-validator}svn}} + * {{{http://svn.nuiton.org/svn/nuiton-validator}svn}} - * {{{http://nution.org/projects/nuiton-validator}forge}} + * {{{http://nuiton.org/projects/nuiton-validator}forge}} * {{{http://maven-site.nuiton.org/nuiton-validator}site}}

1 0