This is an automated email from the git hooks/post-receive script. New commit to branch feature/7493_corrige_action_validation_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ddc292d8a5c3687f7c879a9e4eb27e7671a5188f Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Aug 19 16:02:16 2016 +0200 Ajoute une définition et un convertisseur vers DataReference pour le type Tdr Il y a de la validation sur l'élément refs #7493 --- .../services/dto/reference/DataReferenceSetDefinitions.java | 6 +++++- .../java/fr/ird/observe/services/binder/data/TdrBinder.java | 13 ++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index ff07bc4..5f3c306 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -155,7 +156,10 @@ public enum DataReferenceSetDefinitions { BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineDto.class) .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER) - .addProperty(String.class, BranchlineDto.PROPERTY_BASKET)),; + .addProperty(String.class, BranchlineDto.PROPERTY_BASKET)), + + TDR(newDefinitionBuilder(TdrDto.class) + .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)); public static final Map<String, ReferenceSetDefinition> MAPPING = new TreeMap<>(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java index e146de1..fd34392 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java @@ -30,6 +30,7 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition; import fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition; import fr.ird.observe.entities.referentiel.longline.SensorBrand; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -48,7 +49,7 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; public class TdrBinder extends DataBinderSupport<Tdr, TdrDto> { public TdrBinder() { - super(Tdr.class, TdrDto.class, false); + super(Tdr.class, TdrDto.class, true); } @Override @@ -129,4 +130,14 @@ public class TdrBinder extends DataBinderSupport<Tdr, TdrDto> { } + @Override + public DataReference<TdrDto> toDataReference(ReferentialLocale referentialLocale, Tdr entity) { + return toDataReference(entity, entity.getHomeId()); + } + + @Override + public DataReference<TdrDto> toDataReference(ReferentialLocale referentialLocale, TdrDto dto) { + return toDataReference(dto, dto.getHomeId()); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.