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 77b135556f40c08356849e2222f8b4d94298af39 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 5 08:52:42 2016 +0100 Reapply fix for issue #8671 --- .../dto/reference/DataReferenceSetDefinitions.java | 23 ++++++++++++++++++++-- .../services/topia/binder/BinderSupport.java | 2 +- .../topia/binder/data/DataBinderSupport.java | 4 +++- .../FloatingObjectObservedSpeciesDtoBinder.java | 2 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 2 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 2 +- .../binder/data/seine/NonTargetLengthBinder.java | 2 +- .../data/seine/ObjectObservedSpeciesBinder.java | 8 +++++++- .../data/seine/ObjectSchoolEstimateBinder.java | 8 +++++++- .../binder/data/seine/TargetSampleBinder.java | 2 +- 10 files changed, 44 insertions(+), 11 deletions(-) diff --git a/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 153dafb..37f5c36 100644 --- a/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -40,13 +40,19 @@ 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.TargetCatchDto; 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; @@ -80,15 +86,28 @@ 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_CATCH(newDefinitionBuilder(NonTargetCatchDto.class) .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)), + .addProperty(String.class, NonTargetLengthDto.PROPERTY_SPECIES) + .addProperty(Float.class, NonTargetLengthDto.PROPERTY_LENGTH)), SCHOOL_ESTIMATE(newDefinitionBuilder(SchoolEstimateDto.class) .addProperty(String.class, SchoolEstimateDto.PROPERTY_SPECIES) @@ -96,7 +115,7 @@ public enum DataReferenceSetDefinitions { .addProperty(String.class, SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT)), TARGET_CATCH(newDefinitionBuilder(TargetCatchDto.class) - .addProperty(String.class, TargetCatchDto.PROPERTY_SPECIES)), + .addProperty(String.class, TargetCatchDto.PROPERTY_SPECIES)), TARGET_LENGTH(newDefinitionBuilder(TargetLengthDto.class) .addProperty(String.class, TargetLengthDto.PROPERTY_SPECIES) diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java index f682d56..16d2d20 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java @@ -203,7 +203,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-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 3315b02..6ac8884 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 @@ -50,6 +50,7 @@ import java.util.Date; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.Set; /** @@ -112,7 +113,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D // -------------------------------------------------------------------------------------------------------------- // public DataReference<D> toDataReference(ReferentialLocale referentialLocale, E entity) { - throw new IllegalStateException("Not implemented for " + this); + return toDataReference(entity); } protected DataReference<D> toDataReference(E entity, Serializable... values) { @@ -123,6 +124,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D reference.setCreateDate(entity.getTopiaCreateDate()); reference.setVersion(entity.getTopiaVersion()); + Objects.requireNonNull(definition, "Pas de définition trouvée pour " + this); reference.init(definition.getType(), definition.getPropertyNames(), values); return reference; diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java index 634b611..2edcc81 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class FloatingObjectObservedSpeciesDtoBinder extends DataBinderSupport<FloatingObject, FloatingObjectObservedSpeciesDto> { public FloatingObjectObservedSpeciesDtoBinder() { - super(FloatingObject.class, FloatingObjectObservedSpeciesDto.class, false); + super(FloatingObject.class, FloatingObjectObservedSpeciesDto.class, true); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java index 4bb1388..b6bbc1e 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class FloatingObjectSchoolEstimateDtoBinder extends DataBinderSupport<FloatingObject, FloatingObjectSchoolEstimateDto> { public FloatingObjectSchoolEstimateDtoBinder() { - super(FloatingObject.class, FloatingObjectSchoolEstimateDto.class, false); + super(FloatingObject.class, FloatingObjectSchoolEstimateDto.class, true); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java index bee7e8f..bb6b701 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class FloatingObjectTransmittingBuoyDtoBinder extends DataBinderSupport<FloatingObject, FloatingObjectTransmittingBuoyDto> { public FloatingObjectTransmittingBuoyDtoBinder() { - super(FloatingObject.class, FloatingObjectTransmittingBuoyDto.class, false); + super(FloatingObject.class, FloatingObjectTransmittingBuoyDto.class, true); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java index 3da0b22..4e9868b 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java @@ -91,6 +91,6 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No @Override public DataReference<NonTargetLengthDto> toDataReference(ReferentialLocale referentialLocale, NonTargetLength entity) { - return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies())); + return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies()), entity.getLength()); } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java index ecc47ba..758e342 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data.seine; 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; @@ -39,7 +40,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class ObjectObservedSpeciesBinder extends DataBinderSupport<ObjectObservedSpecies, ObjectObservedSpeciesDto> { public ObjectObservedSpeciesBinder() { - super(ObjectObservedSpecies.class, ObjectObservedSpeciesDto.class, false); + super(ObjectObservedSpecies.class, ObjectObservedSpeciesDto.class, true); } @Override @@ -65,4 +66,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-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java index cf848f8..b25b80f 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.seine; 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; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class ObjectSchoolEstimateBinder extends DataBinderSupport<ObjectSchoolEstimate, ObjectSchoolEstimateDto> { public ObjectSchoolEstimateBinder() { - super(ObjectSchoolEstimate.class, ObjectSchoolEstimateDto.class, false); + super(ObjectSchoolEstimate.class, ObjectSchoolEstimateDto.class, true); } @Override @@ -59,4 +60,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-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java index 9499780..c368ff5 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; 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>.