This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3b9e046579fcbffe042908cdb8d45b64d788a621 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 15:46:01 2016 +0100 mise à jour validation --- .../validation/BeanValidatorDetectorTest.java | 10 ++- ...gthLengthParameter-service-error-validation.xml | 87 ++++++++++++++++++++++ ...hLengthParameter-service-warning-validation.xml | 46 ++++++++++++ ...gthWeightParameter-service-error-validation.xml | 10 +-- .../services-topia-validation_en_GB.properties | 7 ++ .../services-topia-validation_es_ES.properties | 7 ++ .../services-topia-validation_fr_FR.properties | 7 ++ .../validation/BeanValidatorDetectorTest.java | 4 +- 8 files changed, 168 insertions(+), 10 deletions(-) diff --git a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java index e9dbb8f..a1661af 100644 --- a/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java +++ b/application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java @@ -47,12 +47,14 @@ import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.HarbourDto; +import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.ShipOwnerDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; @@ -196,6 +198,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { HookTypeDto.class, ItemHorizontalPositionDto.class, ItemVerticalPositionDto.class, + LengthLengthParameterDto.class, LengthWeightParameterDto.class, LightsticksColorDto.class, LightsticksTypeDto.class, @@ -233,6 +236,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SetSeineTargetCatchDto.class, SettingShapeDto.class, SexDto.class, + ShipOwnerDto.class, SizeMeasureTypeDto.class, SpeciesDto.class, SpeciesFateDto.class, @@ -274,7 +278,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SortedSet<NuitonValidator<?>> validators = detectValidators(ALL_TYPES); assertFalse(validators.isEmpty()); - assertEquals(175, validators.size()); + assertEquals(179, validators.size()); } @@ -306,6 +310,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { HookTypeDto.class, ItemHorizontalPositionDto.class, ItemVerticalPositionDto.class, + LengthLengthParameterDto.class, LengthWeightParameterDto.class, LightsticksColorDto.class, LightsticksTypeDto.class, @@ -331,6 +336,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SetSeineDto.class, SettingShapeDto.class, SexDto.class, + ShipOwnerDto.class, SizeMeasureTypeDto.class, SpeciesDto.class, SpeciesFateDto.class, @@ -410,6 +416,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { HooksCompositionDto.class, ItemHorizontalPositionDto.class, ItemVerticalPositionDto.class, + LengthLengthParameterDto.class, LengthWeightParameterDto.class, LightsticksColorDto.class, LightsticksTypeDto.class, @@ -444,6 +451,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SetSeineSchoolEstimateDto.class, SettingShapeDto.class, SexDto.class, + ShipOwnerDto.class, SizeMeasureTypeDto.class, SpeciesDto.class, SpeciesFateDto.class, diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthLengthParameter-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthLengthParameter-service-error-validation.xml new file mode 100644 index 0000000..82e4b13 --- /dev/null +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthLengthParameter-service-error-validation.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Services ToPIA validation + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!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="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.service.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="inputOutputFormula"> + <!-- pas de relation weight renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.service.lengthLengthParameter.required.inputOutputFormula + </message> + </field-validator> + + <!-- relation weight invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ formulaOneValid ]]> + </param> + <message>validator.service.lengthLengthParameter.invalid.inputOutputFormula + </message> + </field-validator> + + </field> + + <field name="outputInputFormula"> + <!-- pas de relation taille renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.service.lengthLengthParameter.required.outputInputFormula + </message> + </field-validator> + + <!-- relation taille invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ formulaTwoValid ]]> + </param> + <message>validator.service.lengthLengthParameter.invalid.outputInputFormula + </message> + </field-validator> + + </field> + + <field name="coefficients"> + <!-- pas de coefficients renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.service.lengthLengthParameter.required.coefficients + </message> + </field-validator> + + </field> + +</validators> diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthLengthParameter-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthLengthParameter-service-warning-validation.xml new file mode 100644 index 0000000..0f6299c --- /dev/null +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthLengthParameter-service-warning-validation.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Services ToPIA validation + %% + Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + +<!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="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.service.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.service.referentiel.null.uri</message> + </field-validator> + </field> + +</validators> diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-error-validation.xml index e9ceb68..6ad004e 100644 --- a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-error-validation.xml +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-service-error-validation.xml @@ -94,7 +94,7 @@ <!-- relation weight invalide --> <field-validator type="fieldexpression"> <param name="expression"> - <![CDATA[ lengthWeightFormulaValid ]]> + <![CDATA[ formulaOneValid ]]> </param> <message>validator.service.lengthWeightParameter.invalid.lengthWeightFormula </message> @@ -112,7 +112,7 @@ <!-- relation taille invalide --> <field-validator type="fieldexpression"> <param name="expression"> - <![CDATA[ weightLengthFormulaValid ]]> + <![CDATA[ formulaTwoValid ]]> </param> <message>validator.service.lengthWeightParameter.invalid.weightLengthFormula </message> @@ -127,12 +127,6 @@ </message> </field-validator> - <!-- syntaxe coefficients invalide FIXME chemit 2010_08-21 Il faut autoriser les ecritures scientifique E[+-][0-9]+--> - <!--field-validator type="regex"> - <param name="expression">\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*(:\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*)*</param> - <message>validator.service.lengthWeightParameter.invalid.coefficients</message> - </field-validator--> - </field> </validators> diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties index 8638a44..7305465 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties @@ -79,6 +79,7 @@ observe.common.hooksComposition=hooks composition observe.common.hooksCompositionProportionSum=hooks composition proportion sum observe.common.individualSize=Individual size observe.common.individualWeight=Individual weight +observe.common.inputOutputFormula=Input to Ouput formula observe.common.iso2Code=Iso 2 code observe.common.iso3Code=Iso 3 code observe.common.itemHorizontalPosition=Item horizontal position @@ -115,6 +116,7 @@ observe.common.observedSystemDistance=Observed system distance observe.common.observer=Observed observe.common.ocean=Ocean observe.common.organism=Organism +observe.common.outputInputFormula=Ouput to Input formula observe.common.power=Power observe.common.proportion=Proportion observe.common.quadrant=Quadrant @@ -320,6 +322,11 @@ validator.service.hooksComposition.desactivated.hookType=Selected hook type is d validator.service.hooksComposition.required.hookSize=Hook size must be filled. validator.service.hooksComposition.required.hookType=Hook type must be filled. validator.service.hooksComposition.required.proportion=Proportion must be filled. +validator.service.lengthLengthParameter.invalid.inputOutputFormula=Formula is invalid. +validator.service.lengthLengthParameter.invalid.outputInputFormula=Formula is invalid. +validator.service.lengthLengthParameter.required.coefficients=Coefficients are mandatory. +validator.service.lengthLengthParameter.required.inputOutputFormula=Formula is mandatory. +validator.service.lengthLengthParameter.required.outputInputFormula=Formula is mandatory. validator.service.lengthWeightParameter.invalid.lengthWeightFormula=Formula is not valid. validator.service.lengthWeightParameter.invalid.uniqueKey=Tuple (gender/ocean/species/startDate) must be unique. validator.service.lengthWeightParameter.invalid.weightLengthFormula=Formula is not valid. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties index 1e73e96..e637828 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_es_ES.properties @@ -79,6 +79,7 @@ observe.common.hooksComposition=Anzuelos observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) observe.common.individualSize=Tamaño (cm) observe.common.individualWeight=Peso (kg) +observe.common.inputOutputFormula=Formule Entrée vers Sortie \#TODO observe.common.iso2Code=Código ISO-2 observe.common.iso3Code=Código ISO-3 observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal @@ -115,6 +116,7 @@ observe.common.observedSystemDistance=Distancia al sistema observado (millas con observe.common.observer=Observador observe.common.ocean=Oceano observe.common.organism=Organismo +observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO observe.common.power=Potencia del motor principal observe.common.proportion=Proporción (%) observe.common.quadrant=Quadrant @@ -320,6 +322,11 @@ validator.service.hooksComposition.desactivated.hookType=El tipo de avanzuelo se validator.service.hooksComposition.required.hookSize=La selección de un tamaño de avanzuelo es mandatoria. validator.service.hooksComposition.required.hookType=La selección de un tipo de avanzuelo es mandatoria. validator.service.hooksComposition.required.proportion=La proporción está vacía. +validator.service.lengthLengthParameter.invalid.inputOutputFormula=La formule n'est pas valide. \#TODO +validator.service.lengthLengthParameter.invalid.outputInputFormula=La formule n'est pas valide. \#TODO +validator.service.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO +validator.service.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO +validator.service.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. \#TODO validator.service.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no es coherente. validator.service.lengthWeightParameter.invalid.uniqueKey=Tupla (sexo/océano/especie) debe ser única, la tupla ya se ha usado. validator.service.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no es coherente. diff --git a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties index 6546d85..a7f1759 100644 --- a/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties +++ b/services-topia-validation/src/main/resources/i18n/services-topia-validation_fr_FR.properties @@ -79,6 +79,7 @@ observe.common.hooksComposition=Hameçons observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) observe.common.individualSize=Taille (cm) observe.common.individualWeight=Poids (kg) +observe.common.inputOutputFormula=Formule Entrée vers Sortie observe.common.iso2Code=code ISO-2 observe.common.iso3Code=Code ISO-3 observe.common.itemHorizontalPosition=Position sur la ligne @@ -115,6 +116,7 @@ observe.common.observedSystemDistance=Distance système observé (en milles avec observe.common.observer=Observateur observe.common.ocean=Océan observe.common.organism=Organisme +observe.common.outputInputFormula=Formule Sortie vers Entrée observe.common.power=Puissance moteur principal observe.common.proportion=Proportion (%) observe.common.quadrant=Quadrant @@ -320,6 +322,11 @@ validator.service.hooksComposition.desactivated.hookType=Le type d'hameçon sél validator.service.hooksComposition.required.hookSize=La sélection d'une taille d'hameçon est obligatoire. validator.service.hooksComposition.required.hookType=La sélection d'un type d'hameçon est obligatoire. validator.service.hooksComposition.required.proportion=Proportion non renseignée. +validator.service.lengthLengthParameter.invalid.inputOutputFormula=La formule n'est pas valide. +validator.service.lengthLengthParameter.invalid.outputInputFormula=La formule n'est pas valide. +validator.service.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. +validator.service.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. +validator.service.lengthLengthParameter.required.outputInputFormula=La formule est obligatoire. validator.service.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. validator.service.lengthWeightParameter.invalid.uniqueKey=Le tuple (sexe/ocean/espèce/date de début) doit être unique, le tuple est déjà utilisé. validator.service.lengthWeightParameter.invalid.weightLengthFormula=La relation taille saisie n'est pas cohérente. diff --git a/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java index 1166079..8316fdb 100644 --- a/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java +++ b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java @@ -43,6 +43,7 @@ import fr.ird.observe.entities.referentiel.Gear; import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.GearCaracteristicType; import fr.ird.observe.entities.referentiel.Harbour; +import fr.ird.observe.entities.referentiel.LengthLengthParameter; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.Organism; @@ -154,7 +155,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SortedSet<NuitonValidator<?>> validators = detectValidators(ALL_TYPES); assertFalse(validators.isEmpty()); - assertEquals(109, validators.size()); + assertEquals(110, validators.size()); } @@ -196,6 +197,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { HooksComposition.class, ItemHorizontalPosition.class, ItemVerticalPosition.class, + LengthLengthParameter.class, LengthWeightParameter.class, LightsticksColor.class, LightsticksType.class, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.