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 d9a9cf0cee55880fc47755151009ee1acdca3f1e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 19:34:23 2016 +0100 Ajout du référentiel ShipOwner (service) --- .../ReferentialReferenceSetDefinitions.java | 4 ++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 43074 -> 46091 bytes services-dto/src/main/xmi/observe-services-dto.ini | 4 ++ .../Vessel-service-error-validation.xml | 10 ++++ .../services-topia-validation_en_GB.properties | 2 + .../services-topia-validation_es_ES.properties | 2 + .../services-topia-validation_fr_FR.properties | 2 + .../topia/binder/BinderEngineInitializer.java | 9 ++++ .../topia/binder/referential/ShipOwnerBinder.java | 56 +++++++++++++++++++++ .../topia/binder/referential/VesselBinder.java | 4 ++ 10 files changed, 93 insertions(+) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index 09c1277..c3be1cb 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -37,6 +37,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; @@ -118,6 +119,9 @@ public enum ReferentialReferenceSetDefinitions { .addProperty(String.class, HarbourDto.PROPERTY_NAME) .addProperty(String.class, HarbourDto.PROPERTY_LOCODE)), + SHIP_OWNER(newDefaultDefinitionBuilder(ShipOwnerDto.class) + .addProperty(String.class, ShipOwnerDto.PROPERTY_LABEL)), + LENGTH_WEIGHT_PARAMETER(newDefinitionBuilder(LengthWeightParameterDto.class) .addProperty(String.class, LengthWeightParameterDto.PROPERTY_CODE) .addProperty(String.class, LengthWeightParameterDto.PROPERTY_OCEAN) diff --git a/services-dto/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo index 9c907f0..6d6c6eb 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-common.zargo and b/services-dto/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/services-dto/src/main/xmi/observe-services-dto.ini b/services-dto/src/main/xmi/observe-services-dto.ini index 1fdf7dd..6aaa9fe 100644 --- a/services-dto/src/main/xmi/observe-services-dto.ini +++ b/services-dto/src/main/xmi/observe-services-dto.ini @@ -163,6 +163,9 @@ country.attributeGeneric = fr.ird.observe.services.dto.referential.Country [class fr.ird.observe.services.dto.referential.Program] organism.attributeGeneric = fr.ird.observe.services.dto.referential.Organism +[class fr.ird.observe.services.dto.referential.ShipOwner] +country.attributeGeneric = fr.ird.observe.services.dto.referential.Country + [class fr.ird.observe.services.dto.referential.Species] ocean.attributeGeneric = fr.ird.observe.services.dto.referential.Ocean ocean.ordered = true @@ -177,6 +180,7 @@ species.ordered = true flagCountry.attributeGeneric = fr.ird.observe.services.dto.referential.Country vesselSizeCategory.attributeGeneric = fr.ird.observe.services.dto.referential.VesselSizeCategory vesselType.attributeGeneric = fr.ird.observe.services.dto.referential.VesselType +shipOwner.attributeGeneric = fr.ird.observe.services.dto.referential.ShipOwner [class fr.ird.observe.services.dto.referential.seine.WeightCategory] species.attributeGeneric = fr.ird.observe.services.dto.referential.Species diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-error-validation.xml index 02671d4..339898a 100644 --- a/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-error-validation.xml +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-service-error-validation.xml @@ -131,4 +131,14 @@ </field-validator> </field> + <field name="shipOwner"> + + <!-- shipOwner desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ shipOwner == null || shipOwner.enabled ]]> + </param> + <message>validator.service.vessel.desactivated.shipOwner</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 8e3de70..c191b8f 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 @@ -146,6 +146,7 @@ observe.common.settingStartQuadrant=Setting start quadrant observe.common.settingStartTimeStamp=Setting start timeStamp observe.common.settingVesselSpeed=Setting vessel speed observe.common.sex=Sex +observe.common.shipOwner=Ship owner observe.common.shooterSpeed=Shooter speed observe.common.sizeMeasureType=Size measure type observe.common.snapWeight=Snap weight @@ -573,6 +574,7 @@ validator.service.trip.required.startDate=start date must be filled. validator.service.trip.required.tripType=Trip type must be filled. validator.service.trip.required.vessel=Vessel must be filled. validator.service.vessel.desactivated.flagCountry=Selected flag country is disabled. +validator.service.vessel.desactivated.shipOwner=Selected ship owner is disabled. validator.service.vessel.desactivated.vesselSizeCategory=Selected vessel size category is disabled. validator.service.vessel.desactivated.vesselType=Selected vessel type is disabled. validator.service.vessel.invalid.capacity=Capacity is not filled. 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 03aca51..fcd8ed5 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 @@ -146,6 +146,7 @@ observe.common.settingStartQuadrant=Calada quadrant observe.common.settingStartTimeStamp=Timestamp de inicio observe.common.settingVesselSpeed=Velocidad del barco (nd) observe.common.sex=Sexo +observe.common.shipOwner=Armateur \#TODO observe.common.shooterSpeed=Velocidad shooter (nd) observe.common.sizeMeasureType=Type de mesure de taille \#TODO observe.common.snapWeight=Peso snap (kg) @@ -573,6 +574,7 @@ validator.service.trip.required.startDate=La fecha de inicio de marea es obligat validator.service.trip.required.tripType=El tipo de marea es mandatorio. validator.service.trip.required.vessel=Es obligatorio seleccionar un barco. validator.service.vessel.desactivated.flagCountry=la bandera seleccionada está desactivada. +validator.service.vessel.desactivated.shipOwner=L'armateur sélectionné est désactivé. \#TODO validator.service.vessel.desactivated.vesselSizeCategory=la capacidad seleccionada está desactivada. validator.service.vessel.desactivated.vesselType=La perquería seleccionada está desactivada. validator.service.vessel.invalid.capacity=No se ha especificado el año de servicio. 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 4fa8d22..a6b5374 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 @@ -146,6 +146,7 @@ observe.common.settingStartQuadrant=Quadrant de début de filage observe.common.settingStartTimeStamp=Horodatage début observe.common.settingVesselSpeed=Vitesse bateau (nd) observe.common.sex=Sexe +observe.common.shipOwner=Armateur observe.common.shooterSpeed=Vitesse shooter (nd) observe.common.sizeMeasureType=Type de mesure de taille observe.common.snapWeight=Poids snap (kg) @@ -573,6 +574,7 @@ validator.service.trip.required.startDate=La date de début est obligatoire. validator.service.trip.required.tripType=Le type de marée est obligatoire. validator.service.trip.required.vessel=La sélection d'un bateau est obligatoire. validator.service.vessel.desactivated.flagCountry=Le pavillon sélectionné est désactivée. +validator.service.vessel.desactivated.shipOwner=L'armateur sélectionné est désactivé. validator.service.vessel.desactivated.vesselSizeCategory=La jauge sélectionnée est désactivée. validator.service.vessel.desactivated.vesselType=La pêcherie sélectionnée est désactivée. validator.service.vessel.invalid.capacity=Capacité non renseignée. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java index 5a499e5..13ba225 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java @@ -56,6 +56,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; @@ -165,6 +166,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.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; @@ -332,6 +334,7 @@ import fr.ird.observe.services.topia.binder.referential.SensorDataFormatBinder; import fr.ird.observe.services.topia.binder.referential.SensorTypeBinder; import fr.ird.observe.services.topia.binder.referential.SettingShapeBinder; import fr.ird.observe.services.topia.binder.referential.SexBinder; +import fr.ird.observe.services.topia.binder.referential.ShipOwnerBinder; import fr.ird.observe.services.topia.binder.referential.SizeMeasureTypeBinder; import fr.ird.observe.services.topia.binder.referential.SpeciesBinder; import fr.ird.observe.services.topia.binder.referential.SpeciesFateBinder; @@ -1046,6 +1049,12 @@ class BinderEngineInitializer implements ObserveModelInitializer { } @Override + public void initShipOwnerDto() { + referentialDtoToEntityTypeBuilder.put(ShipOwnerDto.class, ShipOwner.class); + referentialBinderBuilder.put(ShipOwnerDto.class, new ShipOwnerBinder()); + } + + @Override public void initSizeMeasureTypeDto() { referentialDtoToEntityTypeBuilder.put(SizeMeasureTypeDto.class, SizeMeasureType.class); referentialBinderBuilder.put(SizeMeasureTypeDto.class, new SizeMeasureTypeBinder()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java new file mode 100644 index 0000000..549f9c4 --- /dev/null +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java @@ -0,0 +1,56 @@ +package fr.ird.observe.services.topia.binder.referential; + +import fr.ird.observe.entities.referentiel.Country; +import fr.ird.observe.entities.referentiel.ShipOwner; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.referential.CountryDto; +import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.ShipOwnerDto; + +/** + * Created on 02/11/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +public class ShipOwnerBinder extends ReferentialBinderSupport<ShipOwner, ShipOwnerDto> { + + public ShipOwnerBinder() { + super(ShipOwner.class, ShipOwnerDto.class); + } + + @Override + public void copyToEntity(ReferentialLocale referentialLocale, ShipOwnerDto dto, ShipOwner entity) { + + + copyDtoReferentialFieldsToEntity(dto, entity); + entity.setCountry(toEntity(dto.getCountry(), Country.class)); + entity.setLabel(dto.getLabel()); + + } + + @Override + public void copyToDto(ReferentialLocale referentialLocale, ShipOwner entity, ShipOwnerDto dto) { + + copyEntityReferentialFieldsToDto(entity, dto); + dto.setLabel(entity.getLabel()); + dto.setCountry(toReferentialReference(referentialLocale, entity.getCountry(), CountryDto.class)); + + } + + @Override + public ReferentialReference<ShipOwnerDto> toReferentialReference(ReferentialLocale referentialLocale, ShipOwner entity) { + + return toReferentialReference(entity, + entity.getCode(), entity.getLabel()); + + } + + @Override + public ReferentialReference<ShipOwnerDto> toReferentialReference(ReferentialLocale referentialLocale, ShipOwnerDto dto) { + + return toReferentialReference(dto, + dto.getCode(), dto.getLabel()); + + } +} diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java index e464b64..87ee8f9 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java @@ -23,12 +23,14 @@ package fr.ird.observe.services.topia.binder.referential; */ import fr.ird.observe.entities.referentiel.Country; +import fr.ird.observe.entities.referentiel.ShipOwner; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselSizeCategory; import fr.ird.observe.entities.referentiel.VesselType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.ShipOwnerDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.referential.VesselTypeDto; @@ -53,6 +55,7 @@ public class VesselBinder extends ReferentialBinderSupport<Vessel, VesselDto> { entity.setVesselSizeCategory(toEntity(dto.getVesselSizeCategory(), VesselSizeCategory.class)); entity.setVesselType(toEntity(dto.getVesselType(), VesselType.class)); entity.setFlagCountry(toEntity(dto.getFlagCountry(), Country.class)); + entity.setShipOwner(toEntity(dto.getShipOwner(), ShipOwner.class)); entity.setFleetCountry(dto.getFleetCountry()); entity.setKeelCode(dto.getKeelCode()); entity.setChangeDate(dto.getChangeDate()); @@ -81,6 +84,7 @@ public class VesselBinder extends ReferentialBinderSupport<Vessel, VesselDto> { dto.setVesselSizeCategory(toReferentialReference(referentialLocale, entity.getVesselSizeCategory(), VesselSizeCategoryDto.class)); dto.setVesselType(toReferentialReference(referentialLocale, entity.getVesselType(), VesselTypeDto.class)); dto.setFlagCountry(toReferentialReference(referentialLocale, entity.getFlagCountry(), CountryDto.class)); + dto.setShipOwner(toReferentialReference(referentialLocale, entity.getShipOwner(), ShipOwnerDto.class)); dto.setFleetCountry(entity.getFleetCountry()); dto.setKeelCode(entity.getKeelCode()); dto.setChangeDate(entity.getChangeDate()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.