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 de512a9596fc0e9d0759a77153afff94c679c7a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 21:13:32 2016 +0100 Ajout du référentiel Armateur (service) --- .../request/ReferenceSetRequestDefinitions.java | 6 ++ .../dto/referential/ReferentialHelper.java | 1 + .../ShipOwner-service-error-validation.xml | 79 ++++++++++++++++++++++ .../ShipOwner-service-warning-validation.xml | 46 +++++++++++++ .../services-topia-validation_en_GB.properties | 4 ++ .../services-topia-validation_es_ES.properties | 4 ++ .../services-topia-validation_fr_FR.properties | 4 ++ .../validation/BeanValidatorDetectorTest.java | 4 +- 8 files changed, 147 insertions(+), 1 deletion(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java index 0b3c4c4..af2a2b7 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java @@ -55,6 +55,7 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.ShipOwnerDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; @@ -156,6 +157,7 @@ import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefin import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SENSOR_TYPE; import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SETTING_SHAPE; import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SEX; +import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SHIP_OWNER; import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SIZE_MEASURE_TYPE; import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SPECIES; import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SPECIES_FATE; @@ -379,6 +381,10 @@ public enum ReferenceSetRequestDefinitions { newReferentialBuilder(HarbourDto.class, HARBOUR) .addKey(HarbourDto.PROPERTY_COUNTRY, COUNTRY)), + SHIP_OWNER_FORM( + newReferentialBuilder(ShipOwnerDto.class, SHIP_OWNER) + .addKey(HarbourDto.PROPERTY_COUNTRY, COUNTRY)), + LENGTH_WEIGHT_PARAMETER_FORM( newReferentialBuilder(LengthWeightParameterDto.class, LENGTH_WEIGHT_PARAMETER) .addKey(LengthWeightParameterDto.PROPERTY_SPECIES, SPECIES) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java index 66c5482..13984fa 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialHelper.java @@ -69,6 +69,7 @@ public class ReferentialHelper extends GeneratedReferentialHelper { VesselSizeCategoryDto.class, CountryDto.class, HarbourDto.class, + ShipOwnerDto.class, VesselTypeDto.class, VesselDto.class, SpeciesGroupDto.class, diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/ShipOwner-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/ShipOwner-service-error-validation.xml new file mode 100644 index 0000000..3576d74 --- /dev/null +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/ShipOwner-service-error-validation.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Services ToPIA validation + %% + Copyright (C) 2008 - 2016 IRD, Codelutin, 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"> + + <!-- pas de organism renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.service.shipOwner.required.code</message> + </field-validator> + + <!-- 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="label"> + + <!-- pas de label renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.service.shipOwner.required.label</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.service.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="country"> + + <!-- country desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ country == null || country.enabled ]]> + </param> + <message>validator.service.shipOwner.desactivated.country</message> + </field-validator> + </field> + +</validators> diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/ShipOwner-service-warning-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/ShipOwner-service-warning-validation.xml new file mode 100644 index 0000000..04e875c --- /dev/null +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/ShipOwner-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, Codelutin, 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/i18n/services-topia-validation_en_GB.properties b/services-topia-validation/src/main/resources/i18n/services-topia-validation_en_GB.properties index c191b8f..faf7cfb 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 @@ -84,6 +84,7 @@ observe.common.iso3Code=Iso 3 code observe.common.itemHorizontalPosition=Item horizontal position observe.common.itemVerticalPosition=Item vertical position observe.common.keelCode=Keel code +observe.common.label=Label observe.common.label1=English label observe.common.label2=French label observe.common.label3=Spanish label @@ -486,6 +487,9 @@ validator.service.setLongline.required.settingStartTimeStamp=Timestamp must be f validator.service.setLongline.required.totalSectionsCount=Total sections count must be filled. validator.service.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=Setting end time must be before hauling start time. validator.service.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=Setting start time must be before setting end time. +validator.service.shipOwner.desactivated.country=Selected country is disabled. +validator.service.shipOwner.required.code=Code is mandatory. +validator.service.shipOwner.required.label=Label is mandatory. validator.service.species.desactivated.sizeMeasureType=Selected size measure type is disabled. validator.service.species.desactivated.speciesGroup=Selected species group is disabled. validator.service.species.invalid.faoCode.uniqueKey=Fao code must be unique, value %s is already used. 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 fcd8ed5..8f58f86 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 @@ -84,6 +84,7 @@ observe.common.iso3Code=Código ISO-3 observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo observe.common.keelCode=Código de Quilla +observe.common.label=Texto observe.common.label1=Texto en inglés observe.common.label2=Texto en francés observe.common.label3=Nombre @@ -486,6 +487,9 @@ validator.service.setLongline.required.settingStartTimeStamp=Timestamp de inicio validator.service.setLongline.required.totalSectionsCount=Número de secciones vacío. validator.service.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=La hora de inicio de arrastre debe ser superior o igual a la hora de fin de calada. validator.service.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=L'heure de fin de calada debe ser superior o igual a la hora de inicio de calada. +validator.service.shipOwner.desactivated.country=Le pays sélectionné est désactivé. \#TODO +validator.service.shipOwner.required.code=Le code est obligatoire. \#TODO +validator.service.shipOwner.required.label=Le label est obligatoire. \#TODO validator.service.species.desactivated.sizeMeasureType=Le type de mensuration sélectionné est désactivé. \#TODO validator.service.species.desactivated.speciesGroup=El grupo de especies seleccionado está desactivado. validator.service.species.invalid.faoCode.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. 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 a6b5374..90e91f4 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 @@ -84,6 +84,7 @@ observe.common.iso3Code=Code ISO-3 observe.common.itemHorizontalPosition=Position sur la ligne observe.common.itemVerticalPosition=Position verticale observe.common.keelCode=Code quille +observe.common.label=Libellé observe.common.label1=Libellé anglais observe.common.label2=Libellé français observe.common.label3=Libellé espagnol @@ -486,6 +487,9 @@ validator.service.setLongline.required.settingStartTimeStamp=Horodatage de débu validator.service.setLongline.required.totalSectionsCount=Nombre de sections non renseigné. validator.service.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=L'heure de début de virage doit être supérieure ou égal à l'heure de fin de filage. validator.service.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=L'heure de fin de filage doit être supérieure ou égal à l'heure de début de filage. +validator.service.shipOwner.desactivated.country=Le pays sélectionné est désactivé +validator.service.shipOwner.required.code=Le code est obligatoire. +validator.service.shipOwner.required.label=Le label est obligatoire. validator.service.species.desactivated.sizeMeasureType=Le type de mensuration sélectionné est désactivé. validator.service.species.desactivated.speciesGroup=Le groupe d'espèce sélectionnée est désactivé. validator.service.species.invalid.faoCode.uniqueKey=Le codeFAO doit être unique, la valeur %1$s est déjà utilisée. 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 a8adba7..4060c11 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 @@ -49,6 +49,7 @@ import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.Sex; +import fr.ird.observe.entities.referentiel.ShipOwner; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesGroup; import fr.ird.observe.entities.referentiel.SpeciesList; @@ -153,7 +154,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SortedSet<NuitonValidator<?>> validators = detectValidators(ALL_TYPES); assertFalse(validators.isEmpty()); - assertEquals(108, validators.size()); + assertEquals(109, validators.size()); } @@ -227,6 +228,7 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { SetSeine.class, SettingShape.class, Sex.class, + ShipOwner.class, SizeMeasureType.class, Species.class, SpeciesFate.class, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.