branch develop-5.x updated (42daadf -> adb5e62)
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 42daadf L'écran A propos ne fonctionne pas (Fixes #8892) new adb5e62 Il existe encore des validations qui ne passent pas (Fixes #8898) 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 adb5e62540e52cde46b849f115906849ceffa998 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 17 13:51:07 2016 +0100 Il existe encore des validations qui ne passent pas (Fixes #8898) Summary of changes: .../dto/reference/DataReferenceSetDefinitions.java | 79 ++++++++++++++++++++++ .../data/ActivityLonglineEncouterDtoBinder.java | 16 +---- .../data/ActivityLonglineSensorUsedDtoBinder.java | 2 +- .../binder/data/ActivityLonglineStubDtoBinder.java | 2 +- .../binder/data/ActivitySeineStubDtoBinder.java | 2 +- .../topia/binder/data/BaitsCompositionBinder.java | 23 ++++++- .../binder/data/BranchlinesCompositionBinder.java | 20 +++++- .../topia/binder/data/DataBinderSupport.java | 8 +-- .../FloatingObjectObservedSpeciesDtoBinder.java | 2 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 2 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 2 +- .../binder/data/FloatlinesCompositionBinder.java | 18 ++++- .../binder/data/GearUseFeaturesLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementSeineBinder.java | 2 +- .../binder/data/GearUseFeaturesSeineBinder.java | 2 +- .../topia/binder/data/HooksCompositionBinder.java | 20 +++++- .../topia/binder/data/NonTargetLengthBinder.java | 7 +- .../topia/binder/data/NonTargetSampleBinder.java | 2 +- .../binder/data/ObjectObservedSpeciesBinder.java | 7 +- .../binder/data/ObjectSchoolEstimateBinder.java | 7 +- .../topia/binder/data/RouteStubDtoBinder.java | 2 +- .../binder/data/SetLonglineCatchDtoBinder.java | 2 +- .../SetLonglineDetailCompositionDtoBinder.java | 2 +- .../SetLonglineGlobalCompositionDtoBinder.java | 2 +- .../binder/data/SetLonglineStubDtoBinder.java | 2 +- .../topia/binder/data/SetLonglineTdrDtoBinder.java | 2 +- .../data/SetSeineNonTargetCatchDtoBinder.java | 2 +- .../data/SetSeineSchoolEstimateDtoBinder.java | 2 +- .../binder/data/SetSeineTargetCatchDtoBinder.java | 2 +- .../topia/binder/data/SizeMeasureBinder.java | 17 ++++- .../topia/binder/data/TargetCatchBinder.java | 15 +++- .../topia/binder/data/TargetSampleBinder.java | 2 +- .../services/topia/binder/data/TdrBinder.java | 2 +- .../binder/data/TripLonglineActivityDtoBinder.java | 2 +- .../binder/data/TripLonglineGearUseDtoBinder.java | 2 +- .../binder/data/TripSeineGearUseDtoBinder.java | 2 +- .../topia/binder/data/WeightMeasureBinder.java | 17 ++++- 38 files changed, 248 insertions(+), 56 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 adb5e62540e52cde46b849f115906849ceffa998 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 17 13:51:07 2016 +0100 Il existe encore des validations qui ne passent pas (Fixes #8898) --- .../dto/reference/DataReferenceSetDefinitions.java | 79 ++++++++++++++++++++++ .../data/ActivityLonglineEncouterDtoBinder.java | 16 +---- .../data/ActivityLonglineSensorUsedDtoBinder.java | 2 +- .../binder/data/ActivityLonglineStubDtoBinder.java | 2 +- .../binder/data/ActivitySeineStubDtoBinder.java | 2 +- .../topia/binder/data/BaitsCompositionBinder.java | 23 ++++++- .../binder/data/BranchlinesCompositionBinder.java | 20 +++++- .../topia/binder/data/DataBinderSupport.java | 8 +-- .../FloatingObjectObservedSpeciesDtoBinder.java | 2 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 2 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 2 +- .../binder/data/FloatlinesCompositionBinder.java | 18 ++++- .../binder/data/GearUseFeaturesLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementSeineBinder.java | 2 +- .../binder/data/GearUseFeaturesSeineBinder.java | 2 +- .../topia/binder/data/HooksCompositionBinder.java | 20 +++++- .../topia/binder/data/NonTargetLengthBinder.java | 7 +- .../topia/binder/data/NonTargetSampleBinder.java | 2 +- .../binder/data/ObjectObservedSpeciesBinder.java | 7 +- .../binder/data/ObjectSchoolEstimateBinder.java | 7 +- .../topia/binder/data/RouteStubDtoBinder.java | 2 +- .../binder/data/SetLonglineCatchDtoBinder.java | 2 +- .../SetLonglineDetailCompositionDtoBinder.java | 2 +- .../SetLonglineGlobalCompositionDtoBinder.java | 2 +- .../binder/data/SetLonglineStubDtoBinder.java | 2 +- .../topia/binder/data/SetLonglineTdrDtoBinder.java | 2 +- .../data/SetSeineNonTargetCatchDtoBinder.java | 2 +- .../data/SetSeineSchoolEstimateDtoBinder.java | 2 +- .../binder/data/SetSeineTargetCatchDtoBinder.java | 2 +- .../topia/binder/data/SizeMeasureBinder.java | 17 ++++- .../topia/binder/data/TargetCatchBinder.java | 15 +++- .../topia/binder/data/TargetSampleBinder.java | 2 +- .../services/topia/binder/data/TdrBinder.java | 2 +- .../binder/data/TripLonglineActivityDtoBinder.java | 2 +- .../binder/data/TripLonglineGearUseDtoBinder.java | 2 +- .../binder/data/TripSeineGearUseDtoBinder.java | 2 +- .../topia/binder/data/WeightMeasureBinder.java | 17 ++++- 38 files changed, 248 insertions(+), 56 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 e5dcfb2..4435ad9 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 @@ -26,34 +26,62 @@ import com.google.common.base.Preconditions; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; +import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BasketWithSectionIdDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.BranchlineWithBasketIdDto; +import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; +import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; +import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineStubDto; +import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; +import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.dto.longline.TripLonglineActivityDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; +import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; 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.GearUseFeaturesMeasurementSeineDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDto; 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.RouteStubDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; +import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; +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; +import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import java.util.Date; import java.util.Map; @@ -114,6 +142,9 @@ public enum DataReferenceSetDefinitions { .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) @@ -190,6 +221,54 @@ public enum DataReferenceSetDefinitions { .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), + FLOATLINES_COMPOSITION(newDefinitionBuilder(FloatlinesCompositionDto.class) + .addProperty(String.class, FloatlinesCompositionDto.PROPERTY_LINE_TYPE) + .addProperty(Float.class, FloatlinesCompositionDto.PROPERTY_LENGTH) + .addProperty(Float.class, FloatlinesCompositionDto.PROPERTY_PROPORTION)), + BRANCHLINES_COMPOSITION(newDefinitionBuilder(BranchlinesCompositionDto.class) + .addProperty(String.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE) + .addProperty(String.class, BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE) + .addProperty(Float.class, BranchlinesCompositionDto.PROPERTY_LENGTH) + .addProperty(Float.class, BranchlinesCompositionDto.PROPERTY_PROPORTION)), + HOOKS_COMPOSITION(newDefinitionBuilder(HooksCompositionDto.class) + .addProperty(String.class, HooksCompositionDto.PROPERTY_HOOK_TYPE) + .addProperty(String.class, HooksCompositionDto.PROPERTY_HOOK_SIZE) + .addProperty(Float.class, HooksCompositionDto.PROPERTY_HOOK_OFFSET) + .addProperty(Float.class, HooksCompositionDto.PROPERTY_PROPORTION)), + BAITS_COMPOSITION(newDefinitionBuilder(BaitsCompositionDto.class) + .addProperty(String.class, BaitsCompositionDto.PROPERTY_BAIT_TYPE) + .addProperty(String.class, BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS) + .addProperty(Float.class, BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE) + .addProperty(Float.class, BaitsCompositionDto.PROPERTY_INDIVIDUAL_WEIGHT) + .addProperty(Float.class, BaitsCompositionDto.PROPERTY_PROPORTION)), + WEIGHT_MEASURE(newDefinitionBuilder(WeightMeasureDto.class) + .addProperty(String.class, WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE) + .addProperty(Float.class, WeightMeasureDto.PROPERTY_WEIGHT)), + SIZE_MEASURE(newDefinitionBuilder(SizeMeasureDto.class) + .addProperty(String.class, SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE) + .addProperty(Float.class, SizeMeasureDto.PROPERTY_SIZE)), + ACTIVITY_LONGLINE_ENCOUNTER(newDefinitionBuilder(ActivityLonglineEncounterDto.class)), + ACTIVITY_LONGLINE_SENSOR_USED(newDefinitionBuilder(ActivityLonglineSensorUsedDto.class)), + ACTIVITY_LONGLINE_STUB(newDefinitionBuilder(ActivityLonglineStubDto.class)), + ACTIVITY_SEINE_STUB(newDefinitionBuilder(ActivitySeineStubDto.class)), + GEAR_USE_FEATURES_LONGLINE(newDefinitionBuilder(GearUseFeaturesLonglineDto.class)), + GEAR_USE_FEATURES_MEASUREMENTS_LONGLINE(newDefinitionBuilder(GearUseFeaturesMeasurementLonglineDto.class)), + GEAR_USE_FEATURES_SEINE(newDefinitionBuilder(GearUseFeaturesSeineDto.class)), + GEAR_USE_FEATURES_MEASUREMENTS_SEINE(newDefinitionBuilder(GearUseFeaturesMeasurementSeineDto.class)), + SET_LONGLINE_STUB(newDefinitionBuilder(SetLonglineStubDto.class)), + SET_LONGLINE_CATCH(newDefinitionBuilder(SetLonglineCatchDto.class)), + SET_LONGLINE_TDR(newDefinitionBuilder(SetLonglineTdrDto.class)), + SET_LONGLINE_DETAIL_COMPOSITION(newDefinitionBuilder(SetLonglineDetailCompositionDto.class)), + SET_LONGLINE_GLOBAL_COMPOSITION(newDefinitionBuilder(SetLonglineGlobalCompositionDto.class)), + TRIP_LONGLINE_ACTIVITY(newDefinitionBuilder(TripLonglineActivityDto.class)), + TRIP_LONGLINE_GEAR_USE(newDefinitionBuilder(TripLonglineGearUseDto.class)), + TRIP_SEINE_GEAR_USE(newDefinitionBuilder(TripSeineGearUseDto.class)), + NON_TARGET_SAMPLE(newDefinitionBuilder(NonTargetSampleDto.class)), + SET_SEINE_TARGET_CATCH(newDefinitionBuilder(SetSeineTargetCatchDto.class)), + SET_SEINE_NON_TARGET_CATCH(newDefinitionBuilder(SetSeineNonTargetCatchDto.class)), + SET_SEINE_SCHOOL_ESTIMATE(newDefinitionBuilder(SetSeineSchoolEstimateDto.class)), + ROUTE_STUB(newDefinitionBuilder(RouteStubDto.class)), + TDR(newDefinitionBuilder(TdrDto.class) .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)), diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java index e37be2c..cdd5a72 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java @@ -24,7 +24,6 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.Encounter; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.EncounterDto; @@ -37,7 +36,7 @@ import fr.ird.observe.services.dto.longline.EncounterDto; public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<ActivityLongline, ActivityLonglineEncounterDto> { public ActivityLonglineEncouterDtoBinder() { - super(ActivityLongline.class, ActivityLonglineEncounterDto.class, false); + super(ActivityLongline.class, ActivityLonglineEncounterDto.class); } @Override @@ -58,17 +57,4 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit } - @Override - public DataReference<ActivityLonglineEncounterDto> toDataReference(ReferentialLocale referentialLocale, ActivityLongline entity) { - - return toDataReference(entity); - - } - - @Override - public DataReference<ActivityLonglineEncounterDto> toDataReference(ReferentialLocale referentialLocale, ActivityLonglineEncounterDto dto) { - - return toDataReference(dto); - - } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java index 7cc9a07..43d150c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.longline.SensorUsedDto; public class ActivityLonglineSensorUsedDtoBinder extends DataBinderSupport<ActivityLongline, ActivityLonglineSensorUsedDto> { public ActivityLonglineSensorUsedDtoBinder() { - super(ActivityLongline.class, ActivityLonglineSensorUsedDto.class, false); + super(ActivityLongline.class, ActivityLonglineSensorUsedDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java index add3b66..04085ef 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java @@ -34,7 +34,7 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; public class ActivityLonglineStubDtoBinder extends DataBinderSupport<ActivityLongline, ActivityLonglineStubDto> { public ActivityLonglineStubDtoBinder() { - super(ActivityLongline.class, ActivityLonglineStubDto.class, false); + super(ActivityLongline.class, ActivityLonglineStubDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java index 99addd1..c8ed14e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java @@ -35,7 +35,7 @@ import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; public class ActivitySeineStubDtoBinder extends DataBinderSupport<ActivitySeine, ActivitySeineStubDto> { public ActivitySeineStubDtoBinder() { - super(ActivitySeine.class, ActivitySeineStubDto.class, false); + super(ActivitySeine.class, ActivitySeineStubDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java index 041a035..2e7011b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.longline.BaitsComposition; import fr.ird.observe.entities.referentiel.longline.BaitSettingStatus; import fr.ird.observe.entities.referentiel.longline.BaitType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; @@ -38,7 +39,7 @@ import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; public class BaitsCompositionBinder extends DataBinderSupport<BaitsComposition, BaitsCompositionDto> { public BaitsCompositionBinder() { - super(BaitsComposition.class, BaitsCompositionDto.class, false); + super(BaitsComposition.class, BaitsCompositionDto.class); } @Override @@ -67,4 +68,24 @@ public class BaitsCompositionBinder extends DataBinderSupport<BaitsComposition, } + @Override + public DataReference<BaitsCompositionDto> toDataReference(ReferentialLocale referentialLocale, BaitsComposition entity) { + return toDataReference(entity, + getLabel(referentialLocale, entity.getBaitType()), + getLabel(referentialLocale, entity.getBaitSettingStatus()), + entity.getIndividualSize(), + entity.getIndividualWeight(), + entity.getProportion()); + } + + @Override + public DataReference<BaitsCompositionDto> toDataReference(ReferentialLocale referentialLocale, BaitsCompositionDto dto) { + return toDataReference(dto, + getLabel(referentialLocale, dto.getBaitType()), + getLabel(referentialLocale, dto.getBaitSettingStatus()), + dto.getIndividualSize(), + dto.getIndividualWeight(), + dto.getProportion()); + } + } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java index 3dd9dfb..9e18168 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.longline.BranchlinesComposition; import fr.ird.observe.entities.referentiel.longline.LineType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; @@ -36,7 +37,7 @@ import fr.ird.observe.services.dto.referential.longline.LineTypeDto; public class BranchlinesCompositionBinder extends DataBinderSupport<BranchlinesComposition, BranchlinesCompositionDto> { public BranchlinesCompositionBinder() { - super(BranchlinesComposition.class, BranchlinesCompositionDto.class, false); + super(BranchlinesComposition.class, BranchlinesCompositionDto.class); } @Override @@ -63,4 +64,21 @@ public class BranchlinesCompositionBinder extends DataBinderSupport<BranchlinesC } + @Override + public DataReference<BranchlinesCompositionDto> toDataReference(ReferentialLocale referentialLocale, BranchlinesComposition entity) { + return toDataReference(entity, + getLabel(referentialLocale, entity.getTopType()), + getLabel(referentialLocale, entity.getTracelineType()), + entity.getLength(), + entity.getProportion()); + } + + @Override + public DataReference<BranchlinesCompositionDto> toDataReference(ReferentialLocale referentialLocale, BranchlinesCompositionDto dto) { + return toDataReference(dto, + getLabel(referentialLocale, dto.getTopType()), + getLabel(referentialLocale, dto.getTracelineType()), + dto.getLength(), + dto.getProportion()); + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java index 256694c..ce06176 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java @@ -63,12 +63,8 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D protected final ReferenceSetDefinition<D> definition; protected DataBinderSupport(Class<E> entityType, Class<D> dtoType) { - this(entityType, dtoType, true); - } - - protected DataBinderSupport(Class<E> entityType, Class<D> dtoType, boolean useDefinition) { super(entityType, dtoType); - this.definition = useDefinition ? DataReferenceSetDefinitions.getDefinition(dtoType) : null; + this.definition = DataReferenceSetDefinitions.getDefinition(dtoType); } // -------------------------------------------------------------------------------------------------------------- // @@ -166,7 +162,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D // -------------------------------------------------------------------------------------------------------------- // public DataReference<D> toDataReference(ReferentialLocale referentialLocale, D dto) { - throw new IllegalStateException("Not implemented"); + return toDataReference(dto); } protected DataReference<D> toDataReference(D dto, Serializable... values) { 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 d2a5bbc..1c16f3d 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, true); + super(FloatingObject.class, FloatingObjectObservedSpeciesDto.class); } @Override 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 7cca83c..4a433be 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, true); + super(FloatingObject.class, FloatingObjectSchoolEstimateDto.class); } @Override 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 1760204..975ad24 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, true); + super(FloatingObject.class, FloatingObjectTransmittingBuoyDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java index b952408..03a0cd1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.longline.FloatlinesComposition; import fr.ird.observe.entities.referentiel.longline.LineType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; @@ -36,7 +37,7 @@ import fr.ird.observe.services.dto.referential.longline.LineTypeDto; public class FloatlinesCompositionBinder extends DataBinderSupport<FloatlinesComposition, FloatlinesCompositionDto> { public FloatlinesCompositionBinder() { - super(FloatlinesComposition.class, FloatlinesCompositionDto.class, false); + super(FloatlinesComposition.class, FloatlinesCompositionDto.class); } @Override @@ -61,4 +62,19 @@ public class FloatlinesCompositionBinder extends DataBinderSupport<FloatlinesCom } + @Override + public DataReference<FloatlinesCompositionDto> toDataReference(ReferentialLocale referentialLocale, FloatlinesComposition entity) { + return toDataReference(entity, + getLabel(referentialLocale, entity.getLineType()), + entity.getLength(), + entity.getProportion()); + } + + @Override + public DataReference<FloatlinesCompositionDto> toDataReference(ReferentialLocale referentialLocale, FloatlinesCompositionDto dto) { + return toDataReference(dto, + getLabel(referentialLocale, dto.getLineType()), + dto.getLength(), + dto.getProportion()); + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java index b93c7cf..e7bd674 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java @@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.referential.GearDto; public class GearUseFeaturesLonglineBinder extends DataBinderSupport<GearUseFeaturesLongline, GearUseFeaturesLonglineDto> { public GearUseFeaturesLonglineBinder() { - super(GearUseFeaturesLongline.class, GearUseFeaturesLonglineDto.class, false); + super(GearUseFeaturesLongline.class, GearUseFeaturesLonglineDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java index d115df4..0d713d0 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.referential.GearCaracteristicDto; public class GearUseFeaturesMeasurementLonglineBinder extends DataBinderSupport<GearUseFeaturesMeasurementLongline, GearUseFeaturesMeasurementLonglineDto> { public GearUseFeaturesMeasurementLonglineBinder() { - super(GearUseFeaturesMeasurementLongline.class, GearUseFeaturesMeasurementLonglineDto.class, false); + super(GearUseFeaturesMeasurementLongline.class, GearUseFeaturesMeasurementLonglineDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java index 68dfd3c..6ee2835 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; public class GearUseFeaturesMeasurementSeineBinder extends DataBinderSupport<GearUseFeaturesMeasurementSeine, GearUseFeaturesMeasurementSeineDto> { public GearUseFeaturesMeasurementSeineBinder() { - super(GearUseFeaturesMeasurementSeine.class, GearUseFeaturesMeasurementSeineDto.class, false); + super(GearUseFeaturesMeasurementSeine.class, GearUseFeaturesMeasurementSeineDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java index 18d5fd8..dde9e56 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java @@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; public class GearUseFeaturesSeineBinder extends DataBinderSupport<GearUseFeaturesSeine, GearUseFeaturesSeineDto> { public GearUseFeaturesSeineBinder() { - super(GearUseFeaturesSeine.class, GearUseFeaturesSeineDto.class, false); + super(GearUseFeaturesSeine.class, GearUseFeaturesSeineDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java index bea9a20..c78e756 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.longline.HooksComposition; import fr.ird.observe.entities.referentiel.longline.HookSize; import fr.ird.observe.entities.referentiel.longline.HookType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; @@ -38,7 +39,7 @@ import fr.ird.observe.services.dto.referential.longline.HookTypeDto; public class HooksCompositionBinder extends DataBinderSupport<HooksComposition, HooksCompositionDto> { public HooksCompositionBinder() { - super(HooksComposition.class, HooksCompositionDto.class, false); + super(HooksComposition.class, HooksCompositionDto.class); } @Override @@ -65,4 +66,21 @@ public class HooksCompositionBinder extends DataBinderSupport<HooksComposition, } + @Override + public DataReference<HooksCompositionDto> toDataReference(ReferentialLocale referentialLocale, HooksComposition entity) { + return toDataReference(entity, + getLabel(referentialLocale, entity.getHookType()), + getLabel(referentialLocale, entity.getHookSize()), + entity.getHookOffset(), + entity.getProportion()); + } + + @Override + public DataReference<HooksCompositionDto> toDataReference(ReferentialLocale referentialLocale, HooksCompositionDto dto) { + return toDataReference(dto, + getLabel(referentialLocale, dto.getHookType()), + getLabel(referentialLocale, dto.getHookType()), + dto.getHookOffset(), + dto.getProportion()); + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java index 29768b1..c96e706 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java @@ -39,7 +39,7 @@ import fr.ird.observe.services.dto.seine.NonTargetLengthDto; public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, NonTargetLengthDto> { public NonTargetLengthBinder() { - super(NonTargetLength.class, NonTargetLengthDto.class, true); + super(NonTargetLength.class, NonTargetLengthDto.class); } @Override @@ -82,4 +82,9 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No public DataReference<NonTargetLengthDto> toDataReference(ReferentialLocale referentialLocale, NonTargetLength entity) { return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies()), entity.getLength()); } + + @Override + public DataReference<NonTargetLengthDto> toDataReference(ReferentialLocale referentialLocale, NonTargetLengthDto dto) { + return toDataReference(dto, getLabel(referentialLocale, dto.getSpecies()), dto.getLength()); + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java index 82d352e..2cbc58e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.NonTargetSampleDto; public class NonTargetSampleBinder extends DataBinderSupport<NonTargetSample, NonTargetSampleDto> { public NonTargetSampleBinder() { - super(NonTargetSample.class, NonTargetSampleDto.class, false); + super(NonTargetSample.class, NonTargetSampleDto.class); } @Override 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 c64d149..628b463 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 @@ -39,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, true); + super(ObjectObservedSpecies.class, ObjectObservedSpeciesDto.class); } @Override @@ -70,4 +70,9 @@ public class ObjectObservedSpeciesBinder extends DataBinderSupport<ObjectObserve public DataReference<ObjectObservedSpeciesDto> toDataReference(ReferentialLocale referentialLocale, ObjectObservedSpecies entity) { return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies()), getLabel(referentialLocale, entity.getSpeciesStatus())); } + + @Override + public DataReference<ObjectObservedSpeciesDto> toDataReference(ReferentialLocale referentialLocale, ObjectObservedSpeciesDto dto) { + return toDataReference( dto, getLabel(referentialLocale, dto.getSpecies()), getLabel(referentialLocale, dto.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 04f8b4e..c3da99f 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 @@ -37,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, true); + super(ObjectSchoolEstimate.class, ObjectSchoolEstimateDto.class); } @Override @@ -64,4 +64,9 @@ public class ObjectSchoolEstimateBinder extends DataBinderSupport<ObjectSchoolEs public DataReference<ObjectSchoolEstimateDto> toDataReference(ReferentialLocale referentialLocale, ObjectSchoolEstimate entity) { return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies()), entity.getTotalWeight()); } + + @Override + public DataReference<ObjectSchoolEstimateDto> toDataReference(ReferentialLocale referentialLocale, ObjectSchoolEstimateDto dto) { + return super.toDataReference(dto, getLabel(referentialLocale, dto.getSpecies()), dto.getTotalWeight()); + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java index 9f499d7..4dfff99 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java @@ -34,7 +34,7 @@ import fr.ird.observe.services.dto.seine.RouteStubDto; public class RouteStubDtoBinder extends DataBinderSupport<Route, RouteStubDto> { public RouteStubDtoBinder() { - super(Route.class, RouteStubDto.class, false); + super(Route.class, RouteStubDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java index 96f68c4..0aea2c0 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; public class SetLonglineCatchDtoBinder extends DataBinderSupport<SetLongline, SetLonglineCatchDto> { public SetLonglineCatchDtoBinder() { - super(SetLongline.class, SetLonglineCatchDto.class, false); + super(SetLongline.class, SetLonglineCatchDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java index c74e0e9..6cbcdc4 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; public class SetLonglineDetailCompositionDtoBinder extends DataBinderSupport<SetLongline, SetLonglineDetailCompositionDto> { public SetLonglineDetailCompositionDtoBinder() { - super(SetLongline.class, SetLonglineDetailCompositionDto.class, false); + super(SetLongline.class, SetLonglineDetailCompositionDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java index e12de90..4219a8c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java @@ -44,7 +44,7 @@ import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; public class SetLonglineGlobalCompositionDtoBinder extends DataBinderSupport<SetLongline, SetLonglineGlobalCompositionDto> { public SetLonglineGlobalCompositionDtoBinder() { - super(SetLongline.class, SetLonglineGlobalCompositionDto.class, false); + super(SetLongline.class, SetLonglineGlobalCompositionDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java index ed7f239..c18407a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java @@ -35,7 +35,7 @@ import fr.ird.observe.services.dto.longline.SetLonglineStubDto; public class SetLonglineStubDtoBinder extends DataBinderSupport<SetLongline, SetLonglineStubDto> { public SetLonglineStubDtoBinder() { - super(SetLongline.class, SetLonglineStubDto.class, false); + super(SetLongline.class, SetLonglineStubDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java index d4f689a..2b0ce9f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.longline.TdrDto; public class SetLonglineTdrDtoBinder extends DataBinderSupport<SetLongline, SetLonglineTdrDto> { public SetLonglineTdrDtoBinder() { - super(SetLongline.class, SetLonglineTdrDto.class, false); + super(SetLongline.class, SetLonglineTdrDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java index 8a91d23..af2ff9b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; public class SetSeineNonTargetCatchDtoBinder extends DataBinderSupport<SetSeine, SetSeineNonTargetCatchDto> { public SetSeineNonTargetCatchDtoBinder() { - super(SetSeine.class, SetSeineNonTargetCatchDto.class, false); + super(SetSeine.class, SetSeineNonTargetCatchDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java index 1d87fd0..954cd03 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; public class SetSeineSchoolEstimateDtoBinder extends DataBinderSupport<SetSeine, SetSeineSchoolEstimateDto> { public SetSeineSchoolEstimateDtoBinder() { - super(SetSeine.class, SetSeineSchoolEstimateDto.class, false); + super(SetSeine.class, SetSeineSchoolEstimateDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java index 1547ee9..0bf6ed6 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.TargetCatchDto; public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, SetSeineTargetCatchDto> { public SetSeineTargetCatchDtoBinder() { - super(SetSeine.class, SetSeineTargetCatchDto.class, false); + super(SetSeine.class, SetSeineTargetCatchDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java index 6b184af..3e13398 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.longline.SizeMeasure; import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; @@ -36,7 +37,7 @@ import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; public class SizeMeasureBinder extends DataBinderSupport<SizeMeasure, SizeMeasureDto> { public SizeMeasureBinder() { - super(SizeMeasure.class, SizeMeasureDto.class, false); + super(SizeMeasure.class, SizeMeasureDto.class); } @Override @@ -59,4 +60,18 @@ public class SizeMeasureBinder extends DataBinderSupport<SizeMeasure, SizeMeasur dto.setSizeMeasureType(toReferentialReference(referentialLocale, entity.getSizeMeasureType(), SizeMeasureTypeDto.class)); } + + @Override + public DataReference<SizeMeasureDto> toDataReference(ReferentialLocale referentialLocale, SizeMeasure entity) { + return toDataReference(entity, + getLabel(referentialLocale, entity.getSizeMeasureType()), + entity.getSize()); + } + + @Override + public DataReference<SizeMeasureDto> toDataReference(ReferentialLocale referentialLocale, SizeMeasureDto dto) { + return toDataReference(dto, + getLabel(referentialLocale, dto.getSizeMeasureType()), + dto.getSize()); + } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java index c66ee85..0d4fc27 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java @@ -22,10 +22,13 @@ package fr.ird.observe.services.topia.binder.data; * #L% */ +import fr.ird.observe.entities.ObserveDataEntity; 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.DataDto; +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; @@ -40,7 +43,7 @@ import fr.ird.observe.services.dto.seine.TargetCatchDto; public class TargetCatchBinder extends DataBinderSupport<TargetCatch, TargetCatchDto> { public TargetCatchBinder() { - super(TargetCatch.class, TargetCatchDto.class, false); + super(TargetCatch.class, TargetCatchDto.class); } @Override @@ -72,4 +75,14 @@ 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())); + } + + @Override + public DataReference<TargetCatchDto> toDataReference(ReferentialLocale referentialLocale, TargetCatchDto dto) { + return toDataReference(dto, getLabel(referentialLocale, dto.getSpecies())); + } } 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 8b86aac..500a05a 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, true); + super(TargetSample.class, TargetSampleDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java index 28f829f..8857d86 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java @@ -49,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, true); + super(Tdr.class, TdrDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java index 70c2071..8d82101 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java @@ -34,7 +34,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineActivityDto; public class TripLonglineActivityDtoBinder extends DataBinderSupport<ActivityLongline, TripLonglineActivityDto> { public TripLonglineActivityDtoBinder() { - super(ActivityLongline.class, TripLonglineActivityDto.class, false); + super(ActivityLongline.class, TripLonglineActivityDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java index e4312cf..c5af1f8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; public class TripLonglineGearUseDtoBinder extends DataBinderSupport<TripLongline, TripLonglineGearUseDto> { public TripLonglineGearUseDtoBinder() { - super(TripLongline.class, TripLonglineGearUseDto.class, false); + super(TripLongline.class, TripLonglineGearUseDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java index 3f44f0e..92bad6b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; public class TripSeineGearUseDtoBinder extends DataBinderSupport<TripSeine, TripSeineGearUseDto> { public TripSeineGearUseDtoBinder() { - super(TripSeine.class, TripSeineGearUseDto.class, false); + super(TripSeine.class, TripSeineGearUseDto.class); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java index 27d1c0c..8880ca1 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.longline.WeightMeasure; import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; @@ -36,7 +37,7 @@ import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; public class WeightMeasureBinder extends DataBinderSupport<WeightMeasure, WeightMeasureDto> { public WeightMeasureBinder() { - super(WeightMeasure.class, WeightMeasureDto.class, false); + super(WeightMeasure.class, WeightMeasureDto.class); } @Override @@ -58,4 +59,18 @@ public class WeightMeasureBinder extends DataBinderSupport<WeightMeasure, Weight dto.setWeightMeasureType(toReferentialReference(referentialLocale, entity.getWeightMeasureType(), WeightMeasureTypeDto.class)); } + + @Override + public DataReference<WeightMeasureDto> toDataReference(ReferentialLocale referentialLocale, WeightMeasure entity) { + return toDataReference(entity, + getLabel(referentialLocale, entity.getWeightMeasureType()), + entity.getWeight()); + } + + @Override + public DataReference<WeightMeasureDto> toDataReference(ReferentialLocale referentialLocale, WeightMeasureDto dto) { + return toDataReference(dto, + getLabel(referentialLocale, dto.getWeightMeasureType()), + dto.getWeight()); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm