branch develop-5.x updated (cc6a18a -> 059d7e8)
This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from cc6a18a Correction des validateurs manquants (fixes #8671) new 059d7e8 Correction des validateurs manquants (fixes #8671) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 059d7e849a591c1491381e73c2053d44f0389726 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 4 15:50:42 2016 +0100 Correction des validateurs manquants (fixes #8671) Summary of changes: .../dto/reference/DataReferenceSetDefinitions.java | 22 ++++++++++++++++++++-- .../services/topia/binder/BinderSupport.java | 6 +++--- .../FloatingObjectObservedSpeciesDtoBinder.java | 3 ++- .../FloatingObjectSchoolEstimateDtoBinder.java | 3 ++- .../FloatingObjectTransmittingBuoyDtoBinder.java | 3 ++- .../binder/data/ObjectObservedSpeciesBinder.java | 8 +++++++- .../binder/data/ObjectSchoolEstimateBinder.java | 8 +++++++- .../topia/binder/data/TargetSampleBinder.java | 2 +- 8 files changed, 44 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 059d7e849a591c1491381e73c2053d44f0389726 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 4 15:50:42 2016 +0100 Correction des validateurs manquants (fixes #8671) --- .../dto/reference/DataReferenceSetDefinitions.java | 22 ++++++++++++++++++++-- .../services/topia/binder/BinderSupport.java | 6 +++--- .../FloatingObjectObservedSpeciesDtoBinder.java | 3 ++- .../FloatingObjectSchoolEstimateDtoBinder.java | 3 ++- .../FloatingObjectTransmittingBuoyDtoBinder.java | 3 ++- .../binder/data/ObjectObservedSpeciesBinder.java | 8 +++++++- .../binder/data/ObjectSchoolEstimateBinder.java | 8 +++++++- .../topia/binder/data/TargetSampleBinder.java | 2 +- 8 files changed, 44 insertions(+), 11 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 3cb3571..e5dcfb2 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 @@ -40,12 +40,18 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto; 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.FloatingObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; 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.TargetLengthDto; +import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -79,12 +85,24 @@ public enum DataReferenceSetDefinitions { .addProperty(Date.class, RouteDto.PROPERTY_DATE) .addProperty(String.class, RouteDto.PROPERTY_COMMENT)), + TARGET_SAMPLE(newDefinitionBuilder(TargetSampleDto.class)), + FLOATING_OBJECT(newDefinitionBuilder(FloatingObjectDto.class) .addProperty(String.class, FloatingObjectDto.PROPERTY_OBJECT_TYPE)), + FLOATING_OBJECT_SCHOOL_ESTIMATE(newDefinitionBuilder(FloatingObjectSchoolEstimateDto.class)), + FLOATING_OBJECT_OBSERVED_SPECIES(newDefinitionBuilder(FloatingObjectObservedSpeciesDto.class)), + OBJECT_OBSERVED_SPECIES(newDefinitionBuilder(ObjectObservedSpeciesDto.class) + .addProperty(String.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES) + .addProperty(String.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS)), + OBJECT_SCHOOL_ESTIMATE(newDefinitionBuilder(ObjectSchoolEstimateDto.class) + .addProperty(String.class, ObjectSchoolEstimateDto.PROPERTY_SPECIES) + .addProperty(Float.class, ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT)), + + FLOATING_OBJECT_TRANSMITTING_BUOY(newDefinitionBuilder(FloatingObjectTransmittingBuoyDto.class)), NON_TARGET_LENGTH(newDefinitionBuilder(NonTargetLengthDto.class) - .addProperty(String.class, NonTargetLengthDto.PROPERTY_SPECIES) - .addProperty(Float.class, NonTargetLengthDto.PROPERTY_LENGTH)), + .addProperty(String.class, NonTargetLengthDto.PROPERTY_SPECIES) + .addProperty(Float.class, NonTargetLengthDto.PROPERTY_LENGTH)), NON_TARGET_CATCH(newDefinitionBuilder(NonTargetCatchDto.class) .addProperty(String.class, NonTargetCatchDto.PROPERTY_SPECIES) diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java index 9988e9b..db80bf5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java @@ -34,8 +34,6 @@ import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPers import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.I18nReferentialEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.dto.referential.I18nReferentialHelper; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.constants.ReferenceStatus; @@ -46,8 +44,10 @@ import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.SchoolType; import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.referential.I18nReferentialDto; +import fr.ird.observe.services.dto.referential.I18nReferentialHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; import org.apache.commons.collections4.CollectionUtils; import org.nuiton.topia.persistence.TopiaEntity; @@ -201,7 +201,7 @@ public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> { // -------------------------------------------------------------------------------------------------------------- // protected String getLabel(ReferentialLocale locale, I18nReferentialEntity entity) { - return I18nReferenceEntities.getLabel(locale.ordinal(), entity); + return entity == null ? "Non trouvé" : I18nReferenceEntities.getLabel(locale.ordinal(), entity); } protected String getLabel(ReferentialLocale locale, I18nReferentialDto dto) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java index be0da4b..d2a5bbc 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; public class FloatingObjectObservedSpeciesDtoBinder extends DataBinderSupport<FloatingObject, FloatingObjectObservedSpeciesDto> { public FloatingObjectObservedSpeciesDtoBinder() { - super(FloatingObject.class, FloatingObjectObservedSpeciesDto.class, false); + super(FloatingObject.class, FloatingObjectObservedSpeciesDto.class, true); } @Override @@ -56,4 +56,5 @@ public class FloatingObjectObservedSpeciesDtoBinder extends DataBinderSupport<Fl dto.setObjectObservedSpecies(toLinkedHashSetData(referentialLocale, entity.getObjectObservedSpecies(), ObjectObservedSpeciesDto.class)); } + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java index 3245920..7cca83c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; public class FloatingObjectSchoolEstimateDtoBinder extends DataBinderSupport<FloatingObject, FloatingObjectSchoolEstimateDto> { public FloatingObjectSchoolEstimateDtoBinder() { - super(FloatingObject.class, FloatingObjectSchoolEstimateDto.class, false); + super(FloatingObject.class, FloatingObjectSchoolEstimateDto.class, true); } @Override @@ -56,4 +56,5 @@ public class FloatingObjectSchoolEstimateDtoBinder extends DataBinderSupport<Flo dto.setObjectSchoolEstimate(toLinkedHashSetData(referentialLocale, entity.getObjectSchoolEstimate(), ObjectSchoolEstimateDto.class)); } + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java index db3d00d..1760204 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; public class FloatingObjectTransmittingBuoyDtoBinder extends DataBinderSupport<FloatingObject, FloatingObjectTransmittingBuoyDto> { public FloatingObjectTransmittingBuoyDtoBinder() { - super(FloatingObject.class, FloatingObjectTransmittingBuoyDto.class, false); + super(FloatingObject.class, FloatingObjectTransmittingBuoyDto.class, true); } @Override @@ -56,4 +56,5 @@ public class FloatingObjectTransmittingBuoyDtoBinder extends DataBinderSupport<F dto.setTransmittingBuoy(toLinkedHashSetData(referentialLocale, entity.getTransmittingBuoy(), TransmittingBuoyDto.class)); } + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java index 640f38d..c64d149 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.SpeciesStatus; import fr.ird.observe.entities.seine.ObjectObservedSpecies; +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.SpeciesStatusDto; @@ -38,7 +39,7 @@ import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; public class ObjectObservedSpeciesBinder extends DataBinderSupport<ObjectObservedSpecies, ObjectObservedSpeciesDto> { public ObjectObservedSpeciesBinder() { - super(ObjectObservedSpecies.class, ObjectObservedSpeciesDto.class, false); + super(ObjectObservedSpecies.class, ObjectObservedSpeciesDto.class, true); } @Override @@ -64,4 +65,9 @@ public class ObjectObservedSpeciesBinder extends DataBinderSupport<ObjectObserve dto.setSpeciesStatus(toReferentialReference(referentialLocale, entity.getSpeciesStatus(), SpeciesStatusDto.class)); } + + @Override + public DataReference<ObjectObservedSpeciesDto> toDataReference(ReferentialLocale referentialLocale, ObjectObservedSpecies entity) { + return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies()), getLabel(referentialLocale, entity.getSpeciesStatus())); + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java index c59f854..04f8b4e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.ObjectSchoolEstimate; +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.seine.ObjectSchoolEstimateDto; @@ -36,7 +37,7 @@ import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; public class ObjectSchoolEstimateBinder extends DataBinderSupport<ObjectSchoolEstimate, ObjectSchoolEstimateDto> { public ObjectSchoolEstimateBinder() { - super(ObjectSchoolEstimate.class, ObjectSchoolEstimateDto.class, false); + super(ObjectSchoolEstimate.class, ObjectSchoolEstimateDto.class, true); } @Override @@ -58,4 +59,9 @@ public class ObjectSchoolEstimateBinder extends DataBinderSupport<ObjectSchoolEs dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); } + + @Override + public DataReference<ObjectSchoolEstimateDto> toDataReference(ReferentialLocale referentialLocale, ObjectSchoolEstimate entity) { + return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies()), entity.getTotalWeight()); + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java index 3010cca..8b86aac 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.TargetSampleDto; public class TargetSampleBinder extends DataBinderSupport<TargetSample, TargetSampleDto> { public TargetSampleBinder() { - super(TargetSample.class, TargetSampleDto.class, false); + super(TargetSample.class, TargetSampleDto.class, true); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm