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

r2582 - in trunk/nuiton-validator/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 July 16, 2013

July 16, 2013

Author: Bavencoff Date: 2013-07-16 15:00:38 +0200 (Tue, 16 Jul 2013) New Revision: 2582 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2582 Log: refs #2761 : add Finess validator Added: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidator.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/HealthEstablishment.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidatorTest.java trunk/nuiton-validator/src/test/resources/org/nuiton/validator/model/HealthEstablishment-error-validation.xml Modified: trunk/nuiton-validator/src/test/resources/validators.xml Added: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidator.java (rev 0) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidator.java 2013-07-16 13:00:38 UTC (rev 2582) @@ -0,0 +1,68 @@ +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; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class FrenchFinessFieldValidator extends NuitonFieldValidatorSupport { + + protected static final String SIRET_REGEXP = "([0-9]{2}|2A|2B)0([0-9]{6})"; + + protected static final Pattern p = Pattern.compile(SIRET_REGEXP); + + @Override + protected void validateWhenNotSkip(Object object) throws ValidationException { + String fieldName = getFieldName(); + Object value = getFieldValue(fieldName, object); + + if (value == null) { + // no value defined + return; + } + String finess; + + if (value.getClass().isArray()) { + // le finess est stocker dans un tableau, par exemple un byte[] + finess = ""; + for (int i = 0; i < Array.getLength(value); i++) { + finess += String.valueOf(Array.get(value, i)); + } + } else if (value instanceof Collection<?>) { + // le finess est stocker dans une collection, + // ca doit pas arriver souvent :D, mais autant le gerer + finess = ""; + for (Object o : (Collection<?>) value) { + finess += String.valueOf(o); + } + } else { + // sinon dans tous les autres cas (String, int, long, BigInteger ...) + // on prend le toString + finess = String.valueOf(value); + } + + if (StringUtils.isEmpty(finess)) { + // no value defined + return; + } + + // Remove any space + finess = finess.replaceAll(" ", ""); + + Matcher m = p.matcher(finess); + if (!m.matches()) { + addFieldError(fieldName, object); + } + } + + @Override + public String getValidatorType() { + return "frenchFiness"; + } +} Added: trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/HealthEstablishment.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/HealthEstablishment.java (rev 0) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/model/HealthEstablishment.java 2013-07-16 13:00:38 UTC (rev 2582) @@ -0,0 +1,20 @@ +package org.nuiton.validator.model; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class HealthEstablishment { + + public static final String PROPERTY_FINESS = "finess"; + + protected String finess; + + public String getFiness() { + return finess; + } + + public void setFiness(String finess) { + this.finess = finess; + } + +} Added: trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidatorTest.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidatorTest.java (rev 0) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/field/FrenchFinessFieldValidatorTest.java 2013-07-16 13:00:38 UTC (rev 2582) @@ -0,0 +1,61 @@ +package org.nuiton.validator.xwork2.field; + +import org.junit.Test; +import org.nuiton.validator.model.HealthEstablishment; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class FrenchFinessFieldValidatorTest extends AbstractFieldValidatorTest<HealthEstablishment> { + + public FrenchFinessFieldValidatorTest() { + super(HealthEstablishment.class); + } + + @Test + @Override + public void testValidator() throws Exception { + assertNull(bean.getFiness()); + + // Valid Finess + bean.setFiness("440123456"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + false); + + // Valid Finess + bean.setFiness("2B0483714"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + false); + + // not Valid Finess + bean.setFiness("2B01"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + true); + + // not Valid Finess + bean.setFiness("4402345636"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + true); + + // not Valid Finess + bean.setFiness("CC0123456"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + true); + + // not Valid Finess + bean.setFiness("441123456"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + true); + + // not Valid Finess + bean.setFiness("441B23456"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + true); + + // not Valid Finess + bean.setFiness("4402345F6"); + assertFieldInError(HealthEstablishment.PROPERTY_FINESS, "healthEstablishment.finess.format", + true); + + } +} Added: trunk/nuiton-validator/src/test/resources/org/nuiton/validator/model/HealthEstablishment-error-validation.xml =================================================================== --- trunk/nuiton-validator/src/test/resources/org/nuiton/validator/model/HealthEstablishment-error-validation.xml (rev 0) +++ trunk/nuiton-validator/src/test/resources/org/nuiton/validator/model/HealthEstablishment-error-validation.xml 2013-07-16 13:00:38 UTC (rev 2582) @@ -0,0 +1,36 @@ + +<!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="finess"> + <field-validator type="frenchFiness"> + <message>healthEstablishment.finess.format</message> + </field-validator> + </field> + +</validators> \ No newline at end of file Modified: trunk/nuiton-validator/src/test/resources/validators.xml =================================================================== --- trunk/nuiton-validator/src/test/resources/validators.xml 2013-07-11 17:09:35 UTC (rev 2581) +++ trunk/nuiton-validator/src/test/resources/validators.xml 2013-07-16 13:00:38 UTC (rev 2582) @@ -68,6 +68,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="frenchFiness" class="org.nuiton.validator.xwork2.field.FrenchFinessFieldValidator"/>  <validator name="vatIdentificationNumber" class="org.nuiton.validator.xwork2.field.VATIdentificationNumberFieldValidator"/>

1 0

r2581 - trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/config
by tchemit＠users.nuiton.org July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 19:09:35 +0200 (Thu, 11 Jul 2013) New Revision: 2581 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2581 Log: fixes #2750: Fix typo in new config report Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/config/ApplicationConfigReportRenderer.java Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/config/ApplicationConfigReportRenderer.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/config/ApplicationConfigReportRenderer.java 2013-06-07 16:52:20 UTC (rev 2580) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/config/ApplicationConfigReportRenderer.java 2013-07-11 17:09:35 UTC (rev 2581) @@ -119,7 +119,7 @@ sink.paragraph_(); sink.paragraph(); - sink.link("http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/ApplicationConfig.ht…"); + sink.link("http://maven-site.nuiton.org/nuiton-utils/nuiton-config/index.html"); sink.text(getText("report.overview.more.information")); sink.link_(); sink.paragraph_();

1 0

r2580 - trunk/nuiton-utils/src/main/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org June 7, 2013

June 7, 2013

Author: tchemit Date: 2013-06-07 18:52:20 +0200 (Fri, 07 Jun 2013) New Revision: 2580 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2580 Log: fixes #2718: [Binder] Open some api in BinderModel 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 2013-05-26 06:52:15 UTC (rev 2579) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/Binder.java 2013-06-07 16:52:20 UTC (rev 2580) @@ -767,19 +767,19 @@ binders.put(propertyName, binder); } - protected boolean containsSourceProperty(String sourceProperty) { + public boolean containsSourceProperty(String sourceProperty) { return propertiesMapping.containsKey(sourceProperty); } - protected boolean containsTargetProperty(String targetProperty) { + public boolean containsTargetProperty(String targetProperty) { return propertiesMapping.containsValue(targetProperty); } - protected boolean containsCollectionProperty(String propertyName) { + public boolean containsCollectionProperty(String propertyName) { return collectionStrategies.containsKey(propertyName); } - protected boolean containsBinderProperty(String propertyName) { + public boolean containsBinderProperty(String propertyName) { return binders.containsKey(propertyName); }

1 0

r2579 - trunk
by tchemit＠users.nuiton.org May 26, 2013

May 26, 2013

Author: tchemit Date: 2013-05-26 08:52:15 +0200 (Sun, 26 May 2013) New Revision: 2579 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2579 Log: updates mavenpom to 3.4.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 21:13:58 UTC (rev 2578) +++ trunk/pom.xml 2013-05-26 06:52:15 UTC (rev 2579) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.10</version> + <version>3.4.11</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

r2578 - trunk
by tchemit＠users.nuiton.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 23:13:58 +0200 (Sun, 28 Apr 2013) New Revision: 2578 Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2578 Log: updates mavenpom to 3.4.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-07 10:06:27 UTC (rev 2577) +++ trunk/pom.xml 2013-04-28 21:13:58 UTC (rev 2578) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.9</version> + <version>3.4.10</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

Jenkins build is back to normal : nuiton-utils » Nuiton Utils :: Nuiton Validator #790
by admin+hudson＠codelutin.com April 23, 2013

April 23, 2013

See <http://ci.nuiton.org/jenkins/job/nuiton-utils/org.nuiton$nuiton-validator/7…>

1 0

Jenkins build is back to normal : nuiton-utils » Nuiton Utils #790
by admin+hudson＠codelutin.com April 23, 2013

April 23, 2013

See <http://ci.nuiton.org/jenkins/job/nuiton-utils/org.nuiton$nuiton-utils-paren…>

1 0

Jenkins build is back to normal : nuiton-utils » Nuiton Utils :: Nuiton Config #790
by admin+hudson＠codelutin.com April 23, 2013

April 23, 2013

See <http://ci.nuiton.org/jenkins/job/nuiton-utils/org.nuiton$nuiton-config/790/>

1 0

Jenkins build is back to normal : nuiton-utils » Nuiton Utils :: Nuiton Utils #790
by admin+hudson＠codelutin.com April 23, 2013

April 23, 2013

See <http://ci.nuiton.org/jenkins/job/nuiton-utils/org.nuiton$nuiton-utils/790/>

1 0

Jenkins build is back to normal : nuiton-utils » Nuiton Utils :: Nuiton Updater #790
by admin+hudson＠codelutin.com April 23, 2013

April 23, 2013

See <http://ci.nuiton.org/jenkins/job/nuiton-utils/org.nuiton$nuiton-updater/790/>

1 0