[Observe-commits] 08/11: Ajout de requetes manquantes + aussi de définition l'ensemble de références

This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 887b0905b397e152fd722ea5d0ec28b1215c1d5d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 21 08:22:13 2015 +0100 Ajout de requetes manquantes + aussi de définition l'ensemble de références --- .../definition/ObserveReferenceSetDefinitions.java | 23 ++- .../ObserveReferenceSetRequestDefinitions.java | 214 ++++++++++++++++++--- 2 files changed, 213 insertions(+), 24 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinitions.java index e959ad7..2bba077 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinitions.java @@ -1,6 +1,10 @@ package fr.ird.observe.services.dto.reference.definition; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.GearType; +import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -72,6 +76,18 @@ import fr.ird.observe.services.dto.referential.seine.WindDto; */ public enum ObserveReferenceSetDefinitions { + SECTION(newDataDefinitionBuilder(SectionDto.class) + .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)), + + BASKET(newDataDefinitionBuilder(BasketDto.class) + .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)), + + BRANCHLINE(newDataDefinitionBuilder(BranchlineDto.class) + .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER) + .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)), + COUNTRY(newDefaultDefinitionBuilder(CountryDto.class)), FPA_ZONE(newDefaultDefinitionBuilder(FpaZoneDto.class)), @@ -210,7 +226,7 @@ public enum ObserveReferenceSetDefinitions { SURROUNDING_ACTIVITY(newDefaultDefinitionBuilder(SurroundingActivityDto.class)), - TRANSMITTING_BUOYO_PERATION(newDefaultDefinitionBuilder(TransmittingBuoyOperationDto.class)), + TRANSMITTING_BUOY_OPERATION(newDefaultDefinitionBuilder(TransmittingBuoyOperationDto.class)), TRANSMITTING_BUOY_TYPE(newDefaultDefinitionBuilder(TransmittingBuoyTypeDto.class)), @@ -245,6 +261,11 @@ public enum ObserveReferenceSetDefinitions { return builder; } + protected static <R extends IdDto> ObserveReferenceSetDefinition.Builder newDataDefinitionBuilder(Class<R> type) { + ObserveReferenceSetDefinition.Builder<R> builder = ObserveReferenceSetDefinition.builder(type); + return builder; + } + ObserveReferenceSetDefinitions(ObserveReferenceSetDefinition.Builder definition) { this.definition = definition.build(); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java index 26a11fe..3bcb184 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java @@ -2,10 +2,28 @@ package fr.ird.observe.services.dto.reference.definition; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.BranchlineDto; +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.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.SetLonglineTdrDto; +import fr.ird.observe.services.dto.longline.SizeMeasureDto; +import fr.ird.observe.services.dto.longline.TdrDto; 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.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.HarbourDto; @@ -20,23 +38,50 @@ import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; +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.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 static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.BAIT_HAULING_STATUS; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.BAIT_SETTING_STATUS; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.BAIT_TYPE; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.BASKET; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.BRANCHLINE; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.CATCH_FATE_LONGLINE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.COUNTRY; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.DETECTION_MODE; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.ENCOUNTER_TYPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.FPA_ZONE; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.GEAR; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.GEAR_CARACTERISTIC; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.GEAR_CARACTERISTIC_TYPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.HARBOUR; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.HEALTHNESS; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.HOOK_POSITION; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.HOOK_SIZE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.HOOK_TYPE; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.ITEM_HORIZONTAL_POSITION; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.ITEM_VERTICAL_POSITION; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.LIGHTSTICKS_COLOR; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.LIGHTSTICKS_TYPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.LINE_TYPE; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.MATURITY_STATUS; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.MITIGATION_TYPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.OBJECT_FATE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.OBJECT_OPERATION; @@ -46,19 +91,32 @@ import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceS import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.ORGANISM; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.PERSON; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.PROGRAM; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.REASON_FOR_DISCARD; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.REASON_FOR_NO_FISHING; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.REASON_FOR_NULL_SET; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SECTION; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SENSOR_BRAND; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SENSOR_DATA_FORMAT; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SENSOR_TYPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SETTING_SHAPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SEX; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SIZE_MEASURE_TYPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SPECIES; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SPECIES_FATE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SPECIES_GROUP; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SPECIES_STATUS; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.STOMAC_FULLNESS; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.SURROUNDING_ACTIVITY; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.TRANSMITTING_BUOY_OPERATION; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.TRANSMITTING_BUOY_TYPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.TRIP_TYPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.VESSEL; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.VESSEL_ACTIVITY_LONGLINE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.VESSEL_ACTIVITY_SEINE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.VESSEL_SIZE_CATEGORY; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.VESSEL_TYPE; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.WEIGHT_CATEGORY; +import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.WEIGHT_MEASURE_TYPE; import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinitions.WIND; /** @@ -70,11 +128,41 @@ import static fr.ird.observe.services.dto.reference.definition.ObserveReferenceS */ public enum ObserveReferenceSetRequestDefinitions { + // LONGLINE DATA + + TRIP_LONGLINE_FORM(newBuilder(TripLonglineDto.class) + .addKey(TripLonglineDto.PROPERTY_TRIP_TYPE, TRIP_TYPE) + .addKey(TripLonglineDto.PROPERTY_OBSERVER, PERSON) + .addKey(TripLonglineDto.PROPERTY_VESSEL, VESSEL) + .addKey(TripLonglineDto.PROPERTY_CAPTAIN, PERSON) + .addKey(TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, PERSON) + .addKey(TripLonglineDto.PROPERTY_PROGRAM, PROGRAM) + .addKey(TripLonglineDto.PROPERTY_OCEAN, OCEAN) + .addKey(TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, HARBOUR) + .addKey(TripLonglineDto.PROPERTY_LANDING_HARBOUR, HARBOUR) + ), + + TRIP_LONGLINE_GEAR_USE_FORM(newBuilder(TripLonglineGearUseDto.class) + .addKey(GearUseFeaturesLonglineDto.PROPERTY_GEAR, GEAR) + .addKey(GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC, GEAR_CARACTERISTIC) + ), + ACTIVITY_LONGLINE_FORM(newBuilder(ActivityLonglineDto.class) .addKey(ActivityLonglineDto.PROPERTY_FPA_ZONE, FPA_ZONE) .addKey(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, VESSEL_ACTIVITY_LONGLINE) ), + ACTIVITY_LONGLINE_SENSOR_USED_FORM(newBuilder(ActivityLonglineSensorUsedDto.class) + .addKey(SensorUsedDto.PROPERTY_SENSOR_TYPE, SENSOR_TYPE) + .addKey(SensorUsedDto.PROPERTY_SENSOR_BRAND, SENSOR_BRAND) + .addKey(SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT, SENSOR_DATA_FORMAT) + ), + + ACTIVITY_LONGLINE_ENCOUTER_FORM(newBuilder(ActivityLonglineEncouterDto.class) + .addKey(EncounterDto.PROPERTY_ENCOUNTER_TYPE, ENCOUNTER_TYPE) + .addKey(EncounterDto.PROPERTY_SPECIES, SPECIES) + ), + BRANCHLINE_FORM(newBuilder(BranchlineDto.class) .addKey(BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, BAIT_SETTING_STATUS) .addKey(BranchlineDto.PROPERTY_HOOK_SIZE, HOOK_SIZE) @@ -87,6 +175,23 @@ public enum ObserveReferenceSetRequestDefinitions { SET_LONGLINE_GLOBAL_COMPOSITION_FORM(newBuilder(SetLonglineGlobalCompositionDto.class) .addKey(SetLonglineGlobalCompositionDto.PROPERTY_MITIGATION_TYPE, MITIGATION_TYPE) + .addKey(FloatlinesCompositionDto.PROPERTY_LINE_TYPE, LINE_TYPE) + .addKey(BranchlinesCompositionDto.PROPERTY_TOP_TYPE, LINE_TYPE) + .addKey(BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE, LINE_TYPE) + .addKey(HooksCompositionDto.PROPERTY_HOOK_TYPE, HOOK_TYPE) + .addKey(HooksCompositionDto.PROPERTY_HOOK_SIZE, HOOK_SIZE) + .addKey(BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, BAIT_SETTING_STATUS) + .addKey(BaitsCompositionDto.PROPERTY_BAIT_TYPE, BAIT_TYPE) + ), + + SET_LONGLINE_DETAIL_COMPOSITION_FORM(newBuilder(SetLonglineDetailCompositionDto.class) + .addKey(BranchlineDto.PROPERTY_TOP_TYPE, LINE_TYPE) + .addKey(BranchlineDto.PROPERTY_TRACELINE_TYPE, LINE_TYPE) + .addKey(BranchlineDto.PROPERTY_HOOK_TYPE, HOOK_TYPE) + .addKey(BranchlineDto.PROPERTY_HOOK_SIZE, HOOK_SIZE) + .addKey(BranchlineDto.PROPERTY_BAIT_TYPE, BAIT_TYPE) + .addKey(BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, BAIT_SETTING_STATUS) + .addKey(BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, BAIT_HAULING_STATUS) ), SET_LONGLINE_FORM(newBuilder(SetLonglineDto.class) @@ -96,20 +201,50 @@ public enum ObserveReferenceSetRequestDefinitions { .addKey(SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, LIGHTSTICKS_COLOR) ), - TRIP_LONGLINE_FORM(newBuilder(TripLonglineDto.class) - .addKey(TripLonglineDto.PROPERTY_TRIP_TYPE, TRIP_TYPE) - .addKey(TripLonglineDto.PROPERTY_OBSERVER, PERSON) - .addKey(TripLonglineDto.PROPERTY_VESSEL, VESSEL) - .addKey(TripLonglineDto.PROPERTY_CAPTAIN, PERSON) - .addKey(TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, PERSON) - .addKey(TripLonglineDto.PROPERTY_PROGRAM, PROGRAM) - .addKey(TripLonglineDto.PROPERTY_OCEAN, OCEAN) - .addKey(TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, HARBOUR) - .addKey(TripLonglineDto.PROPERTY_LANDING_HARBOUR, HARBOUR) + SET_LONGLINE_CATCH_FORM(newBuilder(SetLonglineCatchDto.class) + .addKey(CatchLonglineDto.PROPERTY_SPECIES_CATCH, SPECIES) + .addKey(CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS, HEALTHNESS) + .addKey(CatchLonglineDto.PROPERTY_HOOK_POSITION, HOOK_POSITION) + .addKey(CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, CATCH_FATE_LONGLINE) + .addKey(CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS, HEALTHNESS) + .addKey(CatchLonglineDto.PROPERTY_PREDATOR, SPECIES) + .addKey(CatchLonglineDto.PROPERTY_STOMAC_FULLNESS, STOMAC_FULLNESS) + .addKey(CatchLonglineDto.PROPERTY_SEX, SEX) + .addKey(CatchLonglineDto.PROPERTY_MATURITY_STATUS, MATURITY_STATUS) + .addKey(SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE, SIZE_MEASURE_TYPE) + .addKey(WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE, WEIGHT_MEASURE_TYPE) + .addKey(CatchLonglineDto.PROPERTY_SECTION, SECTION) + .addKey(CatchLonglineDto.PROPERTY_BASKET, BASKET) + .addKey(CatchLonglineDto.PROPERTY_BRANCHLINE, BRANCHLINE) + .addKey(BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, BAIT_HAULING_STATUS) ), - ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM(newBuilder(ActivitySeineObservedSystemDto.class) - .addKey(ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, OBSERVED_SYSTEM) + SET_LONGLINE_TDR_FORM(newBuilder(SetLonglineTdrDto.class) + .addKey(TdrDto.PROPERTY_SENSOR_BRAND, SENSOR_BRAND) + .addKey(TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION, ITEM_HORIZONTAL_POSITION) + .addKey(TdrDto.PROPERTY_ITEM_VERTICAL_POSITION, ITEM_VERTICAL_POSITION) + .addKey(TdrDto.PROPERTY_SPECIES, SPECIES) + .addKey(TdrDto.PROPERTY_SECTION, SECTION) + .addKey(TdrDto.PROPERTY_BASKET, BASKET) + .addKey(TdrDto.PROPERTY_BRANCHLINE, BRANCHLINE) + ), + + // SEINE DATA + + TRIP_SEINE_FORM(newBuilder(TripSeineDto.class) + .addKey(TripSeineDto.PROPERTY_OBSERVER, PERSON) + .addKey(TripSeineDto.PROPERTY_CAPTAIN, PERSON) + .addKey(TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR, PERSON) + .addKey(TripSeineDto.PROPERTY_VESSEL, VESSEL) + .addKey(TripSeineDto.PROPERTY_OCEAN, OCEAN) + .addKey(TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, HARBOUR) + .addKey(TripSeineDto.PROPERTY_LANDING_HARBOUR, HARBOUR) + .addKey(TripSeineDto.PROPERTY_PROGRAM, PROGRAM) + ), + + TRIP_SEINE_GEAR_USE_FORM(newBuilder(TripSeineGearUseDto.class) + .addKey(GearUseFeaturesSeineDto.PROPERTY_GEAR, GEAR) + .addKey(GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC, GEAR_CARACTERISTIC) ), ACTIVITY_SEINE_FORM(newBuilder(ActivitySeineDto.class) @@ -123,25 +258,58 @@ public enum ObserveReferenceSetRequestDefinitions { .addKey(ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, FPA_ZONE) ), + ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM(newBuilder(ActivitySeineObservedSystemDto.class) + .addKey(ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, OBSERVED_SYSTEM) + ), + + SET_SEINE_FORM(newBuilder(SetSeineDto.class) + .addKey(SetSeineDto.PROPERTY_REASON_FOR_NULL_SET, REASON_FOR_NULL_SET) + ), + + SET_SEINE_SCHOOL_ESTIMATE_FORM(newBuilder(SetSeineSchoolEstimateDto.class) + .addKey(SchoolEstimateDto.PROPERTY_SPECIES, SPECIES) + ), + + SET_SEINE_TARGET_CATCH_FORM(newBuilder(SetSeineTargetCatchDto.class) + .addKey(TargetCatchDto.PROPERTY_SPECIES, SPECIES) + .addKey(TargetCatchDto.PROPERTY_REASON_FOR_DISCARD, REASON_FOR_DISCARD) + .addKey(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, WEIGHT_CATEGORY) + ), + + SET_SEINE_NON_TARGET_CATCH_FORM(newBuilder(SetSeineNonTargetCatchDto.class) + .addKey(NonTargetCatchDto.PROPERTY_SPECIES, SPECIES) + .addKey(NonTargetCatchDto.PROPERTY_SPECIES_FATE, SPECIES_FATE) + .addKey(NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, REASON_FOR_DISCARD) + ), + + TARGET_SAMPLE_FORM(newBuilder(TargetSampleDto.class) + .addKey(TargetLengthDto.PROPERTY_SPECIES, SPECIES) + ), + + NON_TARGET_SAMPLE_FORM(newBuilder(NonTargetSampleDto.class) + .addKey(NonTargetLengthDto.PROPERTY_SPECIES, SPECIES) + .addKey(NonTargetLengthDto.PROPERTY_SEX, SEX) + ), + FLOATING_OBJECT_FORM(newBuilder(FloatingObjectDto.class) .addKey(FloatingObjectDto.PROPERTY_OBJECT_TYPE, OBJECT_TYPE) .addKey(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, OBJECT_OPERATION) .addKey(FloatingObjectDto.PROPERTY_OBJECT_FATE, OBJECT_FATE) ), - SET_SEINE_FORM(newBuilder(SetSeineDto.class) - .addKey(SetSeineDto.PROPERTY_REASON_FOR_NULL_SET, REASON_FOR_NULL_SET) + FLOATING_OBJECT_OBSERVED_SPECIES_FORM(newBuilder(FloatingObjectObservedSpeciesDto.class) + .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, SPECIES) + .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, SPECIES_STATUS) ), - TRIP_SEINE_FORM(newBuilder(TripSeineDto.class) - .addKey(TripSeineDto.PROPERTY_OBSERVER, PERSON) - .addKey(TripSeineDto.PROPERTY_CAPTAIN, PERSON) - .addKey(TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR, PERSON) - .addKey(TripSeineDto.PROPERTY_VESSEL, VESSEL) - .addKey(TripSeineDto.PROPERTY_OCEAN, OCEAN) - .addKey(TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, HARBOUR) - .addKey(TripSeineDto.PROPERTY_LANDING_HARBOUR, HARBOUR) - .addKey(TripSeineDto.PROPERTY_PROGRAM, PROGRAM) + FLOATING_OBJECT_SCHOOL_ESTIMATE_FORM(newBuilder(SchoolEstimateDto.class) + .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, SPECIES) + ), + + FLOATING_OBJECT_TRANSMITTING_BUOY_FORM(newBuilder(FloatingObjectTransmittingBuoyDto.class) + .addKey(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION, TRANSMITTING_BUOY_OPERATION) + .addKey(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE, TRANSMITTING_BUOY_TYPE) + .addKey(TransmittingBuoyDto.PROPERTY_COUNTRY, COUNTRY) ), // REFERENTIAL -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.