[Observe-commits] 10/14: Ajout de binder

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 a7e75ebee5f1709ff297f8f52d357839674a8266 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:27:51 2016 +0100 Ajout de binder --- .../services/dto/reference/DataReferenceSetDefinitions.java | 12 +++++++++--- .../services/topia/binder/data/DataBinderSupport.java | 2 +- .../services/topia/binder/data/NonTargetLengthBinder.java | 8 +++++++- .../services/topia/binder/data/TargetCatchBinder.java | 6 ++++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 6bd788d..ca9a7bf 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -41,9 +41,11 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -85,18 +87,22 @@ public enum DataReferenceSetDefinitions { .addProperty(String.class, NonTargetCatchDto.PROPERTY_SPECIES) .addProperty(String.class, NonTargetCatchDto.PROPERTY_SPECIES_FATE)), + NON_TARGET_LENGTH(newDefinitionBuilder(NonTargetLengthDto.class) + .addProperty(String.class, NonTargetLengthDto.PROPERTY_SPECIES)), + SCHOOL_ESTIMATE(newDefinitionBuilder(SchoolEstimateDto.class) .addProperty(String.class, SchoolEstimateDto.PROPERTY_SPECIES) .addProperty(String.class, SchoolEstimateDto.PROPERTY_MEAN_WEIGHT) - .addProperty(String.class, SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT) - ), + .addProperty(String.class, SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT)), + + TARGET_CATCH(newDefinitionBuilder(TargetCatchDto.class) + .addProperty(String.class, TargetCatchDto.PROPERTY_SPECIES)), TARGET_LENGTH(newDefinitionBuilder(TargetLengthDto.class) .addProperty(String.class, TargetLengthDto.PROPERTY_SPECIES) .addProperty(String.class, TargetLengthDto.PROPERTY_LENGTH) .addProperty(String.class, TargetLengthDto.PROPERTY_COUNT) ), - ACTIVITY_SEINE(newDefinitionBuilder(ActivitySeineDto.class) .addProperty(Date.class, ActivitySeineDto.PROPERTY_TIME) .addProperty(String.class, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE + "Id") diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java index b10fbf2..78467f5 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java @@ -112,7 +112,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D // -------------------------------------------------------------------------------------------------------------- // public DataReference<D> toDataReference(ReferentialLocale referentialLocale, E entity) { - throw new IllegalStateException("Not implemented"); + throw new IllegalStateException("Not implemented for " + this); } protected DataReference<D> toDataReference(E entity, Serializable... values) { diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java index c18df64..1493be4 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.SpeciesFate; import fr.ird.observe.entities.seine.NonTargetLength; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -40,7 +41,7 @@ import fr.ird.observe.services.dto.seine.NonTargetLengthDto; public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, NonTargetLengthDto> { public NonTargetLengthBinder() { - super(NonTargetLength.class, NonTargetLengthDto.class, false); + super(NonTargetLength.class, NonTargetLengthDto.class, true); } @Override @@ -82,4 +83,9 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No dto.setTagNumber(entity.getTagNumber()); } + + @Override + public DataReference<NonTargetLengthDto> toDataReference(ReferentialLocale referentialLocale, NonTargetLength entity) { + return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies())); + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java index c66ee85..f3fcc84 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.seine.TargetCatch; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; @@ -72,4 +73,9 @@ public class TargetCatchBinder extends DataBinderSupport<TargetCatch, TargetCatc dto.setWeightCategory(toReferentialReference(referentialLocale, entity.getWeightCategory(), WeightCategoryDto.class)); } + + @Override + public DataReference<TargetCatchDto> toDataReference(ReferentialLocale referentialLocale, TargetCatch entity) { + return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies())); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.