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 fa0f031a56c5f32bfa9a3ba93b74228170500182 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 09:44:19 2016 +0200 Suppression champs supportVesselName (service) --- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 58859 -> 58766 bytes .../FloatingObject-service-error-validation.xml | 13 ------------- .../i18n/services-topia-validation_en_GB.properties | 1 - .../i18n/services-topia-validation_es_ES.properties | 1 - .../i18n/services-topia-validation_fr_FR.properties | 1 - .../topia/binder/data/FloatingObjectBinder.java | 2 -- 6 files changed, 18 deletions(-) diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index 375568b..8558431 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml index a73a7ec..69b1e78 100644 --- a/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml +++ b/services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-service-error-validation.xml @@ -60,19 +60,6 @@ </field> - <field name="supportVesselName"> - - <!-- supportVesselName de ${maxLength} caractères maximum --> - <field-validator type="fieldexpressionwithparams"> - <param name="intParams">maxLength:32</param> - <param name="expression"> - <![CDATA[ supportVesselName == null || supportVesselName.length() < ints.maxLength ]]> - </param> - <message>validator.service.floatingObject.size.supportVesselName##${ints.maxLength}</message> - </field-validator> - - </field> - <field name="daysAtSeaCount"> <!-- count de jours a la mer positif --> 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 f1287f6..7f81582 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 @@ -293,7 +293,6 @@ validator.service.floatingObject.required.comment.for.type=A comment is required validator.service.floatingObject.required.objectFate=Object fate must be filled. validator.service.floatingObject.required.objectOperation=Object operation must be filled. validator.service.floatingObject.required.type=Type must be filled. -validator.service.floatingObject.size.supportVesselName=Support vessel name length can't exceed %S characters. validator.service.floatlinesComposition.bound.length=Length must be between %1$s and %2$s. validator.service.floatlinesComposition.bound.proportion=Proportion must be between %1$s and %2$s. validator.service.floatlinesComposition.desactivated.lineType=Selected line type is disabled. 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 92ca65d..7337bc0 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 @@ -293,7 +293,6 @@ validator.service.floatingObject.required.comment.for.type=Se requiere un coment validator.service.floatingObject.required.objectFate=Se recomienda seleccionar un futuro (devenir). validator.service.floatingObject.required.objectOperation=Es obligatorio seleccionar un operación. validator.service.floatingObject.required.type=Es obligatorio seleccionar un tipo de objeto. -validator.service.floatingObject.size.supportVesselName=El número introducido debe tener una longitud inferior a %1$s caracteres. validator.service.floatlinesComposition.bound.length=La longitud debe ser entre %s y %s. validator.service.floatlinesComposition.bound.proportion=La proporción debe ser entre %s y %s. validator.service.floatlinesComposition.desactivated.lineType=El tipo seleccionado está desactivado. 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 601d730..aca144e 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 @@ -293,7 +293,6 @@ validator.service.floatingObject.required.comment.for.type=Un commentaire est re validator.service.floatingObject.required.objectFate=La sélection d'un devenir d'objet est conseillée. validator.service.floatingObject.required.objectOperation=La sélection d'une opération d'objet est obligatoire. validator.service.floatingObject.required.type=La sélection d'un type d'objet est obligatoire. -validator.service.floatingObject.size.supportVesselName=Le nom supply doit avoir une taille inférieure à %1$s caractères. validator.service.floatlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. validator.service.floatlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. validator.service.floatlinesComposition.desactivated.lineType=Le type sélectionnée est désactivée. diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java index 3c234bf..844cfe5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java @@ -50,7 +50,6 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa copyDtoDataFieldsToEntity(dto, entity); entity.setDaysAtSeaCount(dto.getDaysAtSeaCount()); - entity.setSupportVesselName(dto.getSupportVesselName()); entity.setObjectFate(toEntity(dto.getObjectFate(), ObjectFate.class)); entity.setObjectOperation(toEntity(dto.getObjectOperation(), ObjectOperation.class)); entity.setObjectType(toEntity(dto.getObjectType(), ObjectType.class)); @@ -63,7 +62,6 @@ public class FloatingObjectBinder extends DataBinderSupport<FloatingObject, Floa copyEntityDataFieldsToDto(entity, dto); dto.setDaysAtSeaCount(entity.getDaysAtSeaCount()); - dto.setSupportVesselName(entity.getSupportVesselName()); dto.setObjectFate(toReferentialReference(referentialLocale, entity.getObjectFate(), ObjectFateDto.class)); dto.setObjectOperation(toReferentialReference(referentialLocale, entity.getObjectOperation(), ObjectOperationDto.class)); dto.setObjectType(toReferentialReference(referentialLocale, entity.getObjectType(), ObjectTypeDto.class)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.