[Observe-commits] 02/03: init dto and fix model (refs #7458).

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b6083fc98faedee6ae94c3ab76ff8149fc99cbad Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 20 15:20:18 2015 +0200 init dto and fix model (refs #7458). --- .../main/xmi/observe-services-dto-longline.zargo | Bin 58140 -> 57827 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54397 -> 54397 bytes .../services/topia/ObserveDtosInitializer.java | 545 ++++++++++++++++++--- 3 files changed, 468 insertions(+), 77 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 2656e62..adc7a37 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index cafa62b..8e9c65e 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtosInitializer.java index 0e6deff..42d743e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/topia/ObserveDtosInitializer.java @@ -2,6 +2,24 @@ package fr.ird.observe.services.topia; import com.google.common.base.Function; import com.google.common.collect.ImmutableBiMap; +import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.entities.longline.BaitsComposition; +import fr.ird.observe.entities.longline.Basket; +import fr.ird.observe.entities.longline.Branchline; +import fr.ird.observe.entities.longline.BranchlinesComposition; +import fr.ird.observe.entities.longline.CatchLongline; +import fr.ird.observe.entities.longline.Encounter; +import fr.ird.observe.entities.longline.FloatlinesComposition; +import fr.ird.observe.entities.longline.GearUseFeaturesLongline; +import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; +import fr.ird.observe.entities.longline.HooksComposition; +import fr.ird.observe.entities.longline.Section; +import fr.ird.observe.entities.longline.SensorUsed; +import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.entities.longline.SizeMeasure; +import fr.ird.observe.entities.longline.Tdr; +import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.longline.WeightMeasure; import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.referentiel.Gear; @@ -63,8 +81,48 @@ import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.entities.seine.ActivitySeine; +import fr.ird.observe.entities.seine.FloatingObject; +import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; +import fr.ird.observe.entities.seine.GearUseFeaturesSeine; +import fr.ird.observe.entities.seine.NonTargetCatch; +import fr.ird.observe.entities.seine.NonTargetLength; +import fr.ird.observe.entities.seine.NonTargetSample; +import fr.ird.observe.entities.seine.ObjectObservedSpecies; +import fr.ird.observe.entities.seine.ObjectSchoolEstimate; +import fr.ird.observe.entities.seine.Route; +import fr.ird.observe.entities.seine.SchoolEstimate; +import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.entities.seine.TargetCatch; +import fr.ird.observe.entities.seine.TargetLength; +import fr.ird.observe.entities.seine.TargetSample; +import fr.ird.observe.entities.seine.TransmittingBuoy; +import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveModelInitializer; +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.BasketDto; +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.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.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.WeightMeasureDto; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -128,6 +186,28 @@ import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; 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.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.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 org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.beans.BinderModelBuilder; @@ -240,122 +320,312 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { @Override public void initActivityLonglineDto() { - + registerDto(ActivityLonglineDto.class, ActivityLongline.class, + ActivityLonglineDto.PROPERTY_COMMENT, + ActivityLonglineDto.PROPERTY_OPEN, + ActivityLonglineDto.PROPERTY_TIME_STAMP, + ActivityLonglineDto.PROPERTY_LATITUDE, + ActivityLonglineDto.PROPERTY_LONGITUDE, + ActivityLonglineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + ActivityLonglineDto.PROPERTY_FPA_ZONE); } @Override public void initActivityLonglineEncouterDto() { - + registerDto(ActivityLonglineEncouterDto.class, ActivityLongline.class, + ActivityLonglineEncouterDto.PROPERTY_COMMENT, + ActivityLonglineEncouterDto.PROPERTY_ENCOUNTER); } @Override public void initActivityLonglineSensorUsedDto() { - + registerDto(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, + ActivityLonglineSensorUsedDto.PROPERTY_COMMENT, + ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED); } @Override public void initBaitsCompositionDto() { - + registerDto(BaitsCompositionDto.class, BaitsComposition.class, + BaitsCompositionDto.PROPERTY_PROPORTION, + BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE, + BaitsCompositionDto.PROPERTY_INDIVIDUAL_WEIGHT, + BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, + BaitsCompositionDto.PROPERTY_BAIT_TYPE); } @Override public void initBasketDto() { - + registerDto(BasketDto.class, Basket.class, + BasketDto.PROPERTY_SETTING_IDENTIFIER, + BasketDto.PROPERTY_HAULING_IDENTIFIER, + BasketDto.PROPERTY_FLOATLINE1_LENGTH, + BasketDto.PROPERTY_FLOATLINE2_LENGTH, + BasketDto.PROPERTY_BRANCHLINE); } @Override public void initBranchlineDto() { - + registerDto(BranchlineDto.class, Branchline.class, + BranchlineDto.PROPERTY_COMMENT, + BranchlineDto.PROPERTY_SETTING_IDENTIFIER, + BranchlineDto.PROPERTY_HAULING_IDENTIFIER, + BranchlineDto.PROPERTY_DEPTH_RECORDER, + BranchlineDto.PROPERTY_TIMER, + BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, + BranchlineDto.PROPERTY_HOOK_OFFSET, + BranchlineDto.PROPERTY_BRANCHLINE_LENGTH, + BranchlineDto.PROPERTY_WEIGHTED_SWIVEL, + BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD, + BranchlineDto.PROPERTY_WEIGHTED_SNAP, + BranchlineDto.PROPERTY_SWIVEL_WEIGHT, + BranchlineDto.PROPERTY_SNAP_WEIGHT, + BranchlineDto.PROPERTY_TRACELINE_LENGTH, + BranchlineDto.PROPERTY_HOOK_LOST, + BranchlineDto.PROPERTY_TRACE_CUT_OFF, + BranchlineDto.PROPERTY_TOP_TYPE, + BranchlineDto.PROPERTY_TRACELINE_TYPE, + BranchlineDto.PROPERTY_HOOK_TYPE, + BranchlineDto.PROPERTY_HOOK_SIZE, + BranchlineDto.PROPERTY_BAIT_TYPE, + BranchlineDto.PROPERTY_BAIT_SETTING_STATUS, + BranchlineDto.PROPERTY_BAIT_HAULING_STATUS); } @Override public void initBranchlinesCompositionDto() { - + registerDto(BranchlinesCompositionDto.class, BranchlinesComposition.class, + BranchlinesCompositionDto.PROPERTY_LENGTH, + BranchlinesCompositionDto.PROPERTY_PROPORTION, + BranchlinesCompositionDto.PROPERTY_TOP_TYPE, + BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE); } @Override public void initCatchLonglineDto() { - + registerDto(CatchLonglineDto.class, CatchLongline.class, + CatchLonglineDto.PROPERTY_COMMENT, + CatchLonglineDto.PROPERTY_HOME_ID, + CatchLonglineDto.PROPERTY_COUNT, + CatchLonglineDto.PROPERTY_TOTAL_WEIGHT, + CatchLonglineDto.PROPERTY_HOOK_WHEN_DISCARDED, + CatchLonglineDto.PROPERTY_DEPREDATED, + CatchLonglineDto.PROPERTY_BEAT_DIAMETER, + CatchLonglineDto.PROPERTY_GONADE_WEIGHT, + CatchLonglineDto.PROPERTY_PHOTO_REFERENCES, + CatchLonglineDto.PROPERTY_NUMBER, + CatchLonglineDto.PROPERTY_ACQUISITION_MODE, + CatchLonglineDto.PROPERTY_SPECIES_CATCH, + CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS, + CatchLonglineDto.PROPERTY_HOOK_POSITION, + CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE, + CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS, + CatchLonglineDto.PROPERTY_PREDATOR, + CatchLonglineDto.PROPERTY_STOMAC_FULLNESS, + CatchLonglineDto.PROPERTY_SEX, + CatchLonglineDto.PROPERTY_MATURITY_STATUS, + CatchLonglineDto.PROPERTY_SIZE_MEASURE, + CatchLonglineDto.PROPERTY_WEIGHT_MEASURE, + CatchLonglineDto.PROPERTY_SECTION, + CatchLonglineDto.PROPERTY_BASKET, + CatchLonglineDto.PROPERTY_BRANCHLINE); } @Override public void initEncounterDto() { - + registerDto(EncounterDto.class, Encounter.class, + EncounterDto.PROPERTY_DISTANCE, + EncounterDto.PROPERTY_COUNT, + EncounterDto.PROPERTY_ENCOUNTER_TYPE, + EncounterDto.PROPERTY_SPECIES); } @Override public void initFloatlinesCompositionDto() { - + registerDto(FloatlinesCompositionDto.class, FloatlinesComposition.class, + FloatlinesCompositionDto.PROPERTY_LENGTH, + FloatlinesCompositionDto.PROPERTY_PROPORTION, + FloatlinesCompositionDto.PROPERTY_LINE_TYPE); } @Override public void initGearUseFeaturesLonglineDto() { - + registerDto(GearUseFeaturesLonglineDto.class, GearUseFeaturesLongline.class, + GearUseFeaturesLonglineDto.PROPERTY_NUMBER, + GearUseFeaturesLonglineDto.PROPERTY_USED_IN_TRIP, + GearUseFeaturesLonglineDto.PROPERTY_GEAR, + GearUseFeaturesLonglineDto.PROPERTY_GEAR_USE_FEATURES_MEASUREMENT); } @Override public void initGearUseFeaturesMeasurementLonglineDto() { - + registerDto(GearUseFeaturesMeasurementLonglineDto.class, GearUseFeaturesMeasurementLongline.class, + GearUseFeaturesMeasurementLonglineDto.PROPERTY_MEASUREMENT_VALUE, + GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC); } @Override public void initHooksCompositionDto() { - + registerDto(HooksCompositionDto.class, HooksComposition.class, + HooksCompositionDto.PROPERTY_PROPORTION, + HooksCompositionDto.PROPERTY_HOOK_OFFSET, + HooksCompositionDto.PROPERTY_HOOK_TYPE, + HooksCompositionDto.PROPERTY_HOOK_SIZE); } @Override public void initSectionDto() { - + registerDto(SectionDto.class, Section.class, + SectionDto.PROPERTY_SETTING_IDENTIFIER, + SectionDto.PROPERTY_HAULING_IDENTIFIER, + SectionDto.PROPERTY_BASKET); } @Override public void initSensorUsedDto() { - + registerDto(SensorUsedDto.class, SensorUsed.class, + SensorUsedDto.PROPERTY_DATA, + SensorUsedDto.PROPERTY_DATA_FILENAME, + SensorUsedDto.PROPERTY_DATA_LOCATION, + SensorUsedDto.PROPERTY_SENSOR_SERIAL_NO, + SensorUsedDto.PROPERTY_SENSOR_TYPE, + SensorUsedDto.PROPERTY_SENSOR_BRAND, + SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT); } @Override public void initSetLonglineDto() { - + registerDto(SetLonglineDto.class, SetLongline.class, + SetLonglineDto.PROPERTY_COMMENT, + SetLonglineDto.PROPERTY_HOME_ID, + SetLonglineDto.PROPERTY_NUMBER, + SetLonglineDto.PROPERTY_BASKETS_PER_SECTION_COUNT, + SetLonglineDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_TOTAL_SECTIONS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_BASKETS_COUNT, + SetLonglineDto.PROPERTY_TOTAL_HOOKS_COUNT, + SetLonglineDto.PROPERTY_WEIGHTED_SNAP, + SetLonglineDto.PROPERTY_SNAP_WEIGHT, + SetLonglineDto.PROPERTY_WEIGHTED_SWIVEL, + SetLonglineDto.PROPERTY_SWIVEL_WEIGHT, + SetLonglineDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT, + SetLonglineDto.PROPERTY_TIME_BETWEEN_HOOKS, + SetLonglineDto.PROPERTY_SHOOTER_USED, + SetLonglineDto.PROPERTY_SHOOTER_SPEED, + SetLonglineDto.PROPERTY_MAX_DEPTH_TARGETED, + SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_START_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_START_LONGITUDE, + SetLonglineDto.PROPERTY_SETTING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_SETTING_END_LATITUDE, + SetLonglineDto.PROPERTY_SETTING_END_LONGITUDE, + SetLonglineDto.PROPERTY_SETTING_VESSEL_SPEED, + SetLonglineDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING, + SetLonglineDto.PROPERTY_HAULING_START_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_START_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_START_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_END_TIME_STAMP, + SetLonglineDto.PROPERTY_HAULING_END_LATITUDE, + SetLonglineDto.PROPERTY_HAULING_END_LONGITUDE, + SetLonglineDto.PROPERTY_HAULING_BREAKS, + SetLonglineDto.PROPERTY_MONITORED, + SetLonglineDto.PROPERTY_LINE_TYPE, + SetLonglineDto.PROPERTY_LIGHTSTICKS_COLOR, + SetLonglineDto.PROPERTY_LIGHTSTICKS_TYPE, + SetLonglineDto.PROPERTY_SETTING_SHAPE); } @Override public void initSetLonglineCatchDto() { - + registerDto(SetLonglineCatchDto.class, SetLongline.class, + SetLonglineCatchDto.PROPERTY_CATCH_LONGLINE); } @Override public void initSetLonglineDetailCompositionDto() { - + registerDto(SetLonglineDetailCompositionDto.class, SetLongline.class, + SetLonglineDetailCompositionDto.PROPERTY_SECTION); } @Override public void initSetLonglineGlobalCompositionDto() { - + registerDto(SetLonglineGlobalCompositionDto.class, SetLongline.class, + SetLonglineGlobalCompositionDto.PROPERTY_FLOATLINES_COMPOSITION, + SetLonglineGlobalCompositionDto.PROPERTY_BRANCHLINES_COMPOSITION, + SetLonglineGlobalCompositionDto.PROPERTY_HOOKS_COMPOSITION, + SetLonglineGlobalCompositionDto.PROPERTY_BAITS_COMPOSITION, + SetLonglineGlobalCompositionDto.PROPERTY_MITIGATION_TYPE); } @Override public void initSetLonglineTdrDto() { - + registerDto(SetLonglineTdrDto.class, SetLongline.class, + SetLonglineTdrDto.PROPERTY_TDR); } @Override public void initSizeMeasureDto() { - + registerDto(SizeMeasureDto.class, SizeMeasure.class, + SizeMeasureDto.PROPERTY_SIZE, + SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE); } @Override public void initTdrDto() { - + registerDto(TdrDto.class, Tdr.class, + TdrDto.PROPERTY_HOME_ID, + TdrDto.PROPERTY_FLOATLINE1_LENGTH, + TdrDto.PROPERTY_FLOATLINE2_LENGTH, + TdrDto.PROPERTY_SERIAL_NO, + TdrDto.PROPERTY_DATA, + TdrDto.PROPERTY_DATA_FILENAME, + TdrDto.PROPERTY_DATA_LOCATION, + TdrDto.PROPERTY_DEPLOYEMENT_START, + TdrDto.PROPERTY_DEPLOYEMENT_END, + TdrDto.PROPERTY_FISHING_START, + TdrDto.PROPERTY_FISHING_END, + TdrDto.PROPERTY_FISHING_START_DEPTH, + TdrDto.PROPERTY_FISHING_END_DEPTH, + TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MIN_FISHING_DEPTH, + TdrDto.PROPERTY_MAX_FISHING_DEPTH, + TdrDto.PROPERTY_MEAN_FISHING_DEPTH, + TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH, + TdrDto.PROPERTY_SENSOR_BRAND, + TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION, + TdrDto.PROPERTY_ITEM_VERTICAL_POSITION, + TdrDto.PROPERTY_SPECIES, + TdrDto.PROPERTY_BASKET, + TdrDto.PROPERTY_SECTION, + TdrDto.PROPERTY_BRANCHLINE); } @Override public void initTripLonglineDto() { - + registerDto(TripLonglineDto.class, TripLongline.class, + TripLonglineDto.PROPERTY_COMMENT, + TripLonglineDto.PROPERTY_OPEN, + TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_TOTAL_FISHING_OPERATIONS_NUMBER, + TripLonglineDto.PROPERTY_HOME_ID, + TripLonglineDto.PROPERTY_TRIP_TYPE, + TripLonglineDto.PROPERTY_CAPTAIN, + TripLonglineDto.PROPERTY_OBSERVER, + TripLonglineDto.PROPERTY_DATA_ENTRY_OPERATOR, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OCEAN, + TripLonglineDto.PROPERTY_DEPARTURE_HARBOUR, + TripLonglineDto.PROPERTY_LANDING_HARBOUR); } @Override public void initWeightMeasureDto() { - + registerDto(WeightMeasureDto.class, WeightMeasure.class, + WeightMeasureDto.PROPERTY_WEIGHT, + WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE); } // -------------------------------------------------------------------------------------------------------------- // @@ -932,158 +1202,279 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { @Override public void initActivitySeineDto() { - registerDtoType(ActivitySeineDto.class, ActivitySeine.class); - - BinderModelBuilder<ActivitySeineDto, ActivitySeine> dtoToEntityBuilder = - newBinderBuilder(ActivitySeineDto.class, ActivitySeine.class, - ActivitySeineDto.PROPERTY_COMMENT, - ActivitySeineDto.PROPERTY_OPEN, - ActivitySeineDto.PROPERTY_TIME, - ActivitySeineDto.PROPERTY_LATITUDE, - ActivitySeineDto.PROPERTY_LONGITUDE, - ActivitySeineDto.PROPERTY_VESSEL_SPEED, - ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, - ActivitySeineDto.PROPERTY_ERS_ID, - ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, - ActivitySeineDto.PROPERTY_DETECTION_MODE, - ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, - ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, - ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, - ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, - ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE); - registerDtoBinder(dtoToEntityBuilder); + registerDto(ActivitySeineDto.class, ActivitySeine.class, + ActivitySeineDto.PROPERTY_COMMENT, + ActivitySeineDto.PROPERTY_OPEN, + ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_LATITUDE, + ActivitySeineDto.PROPERTY_LONGITUDE, + ActivitySeineDto.PROPERTY_VESSEL_SPEED, + ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, + ActivitySeineDto.PROPERTY_ERS_ID, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ActivitySeineDto.PROPERTY_SURROUNDING_ACTIVITY, + ActivitySeineDto.PROPERTY_DETECTION_MODE, + ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, + ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, + ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, + ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, + ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE); } @Override public void initActivitySeineObservedSystemDto() { - - - BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeine> dtoToEntityBuilder = - newBinderBuilder(ActivitySeineObservedSystemDto.class, ActivitySeine.class, - ActivitySeineObservedSystemDto.PROPERTY_COMMENT, - ActivitySeineObservedSystemDto.PROPERTY_OPEN, - ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE, - ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM); - registerDtoBinder(dtoToEntityBuilder); - + registerDto(ActivitySeineObservedSystemDto.class, ActivitySeine.class, + ActivitySeineObservedSystemDto.PROPERTY_COMMENT, + ActivitySeineObservedSystemDto.PROPERTY_OPEN, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM); } @Override public void initFloatingObjectDto() { - + registerDto(FloatingObjectDto.class, FloatingObject.class, + FloatingObjectDto.PROPERTY_COMMENT, + FloatingObjectDto.PROPERTY_DAYS_AT_SEA_COUNT, + FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME, + FloatingObjectDto.PROPERTY_OBJECT_FATE, + FloatingObjectDto.PROPERTY_OBJECT_OPERATION, + FloatingObjectDto.PROPERTY_OBJECT_TYPE + ); } @Override public void initFloatingObjectObservedSpeciesDto() { - + registerDto(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, + FloatingObjectObservedSpeciesDto.PROPERTY_COMMENT, + FloatingObjectObservedSpeciesDto.PROPERTY_OBJECT_OBSERVED_SPECIES); } @Override public void initFloatingObjectSchoolEstimateDto() { - + registerDto(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, + FloatingObjectSchoolEstimateDto.PROPERTY_COMMENT, + FloatingObjectSchoolEstimateDto.PROPERTY_OBJECT_SCHOOL_ESTIMATE); } @Override public void initFloatingObjectTransmittingBuoyDto() { - + registerDto(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, + FloatingObjectTransmittingBuoyDto.PROPERTY_COMMENT, + FloatingObjectTransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY); } @Override public void initGearUseFeaturesMeasurementSeineDto() { - + registerDto(GearUseFeaturesMeasurementSeineDto.class, GearUseFeaturesMeasurementSeine.class, + GearUseFeaturesMeasurementSeineDto.PROPERTY_MEASUREMENT_VALUE, + GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC); } @Override public void initGearUseFeaturesSeineDto() { - + registerDto(GearUseFeaturesSeineDto.class, GearUseFeaturesSeine.class, + GearUseFeaturesSeineDto.PROPERTY_COMMENT, + GearUseFeaturesSeineDto.PROPERTY_NUMBER, + GearUseFeaturesSeineDto.PROPERTY_USED_IN_TRIP, + GearUseFeaturesSeineDto.PROPERTY_GEAR_USE_FEATURES_MEASUREMENT); } @Override public void initNonTargetCatchDto() { - + registerDto(NonTargetCatchDto.class, NonTargetCatch.class, + NonTargetCatchDto.PROPERTY_COMMENT, + NonTargetCatchDto.PROPERTY_CATCH_WEIGHT, + NonTargetCatchDto.PROPERTY_CATCH_WEIGHT_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_MEAN_WEIGHT, + NonTargetCatchDto.PROPERTY_MEAN_WEIGHT_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_MEAN_LENGTH, + NonTargetCatchDto.PROPERTY_MEAN_LENGTH_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_TOTAL_COUNT, + NonTargetCatchDto.PROPERTY_TOTAL_COUNT_COMPUTED_SOURCE, + NonTargetCatchDto.PROPERTY_SPECIES_FATE, + NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD); } @Override public void initNonTargetLengthDto() { - + registerDto(NonTargetLengthDto.class, NonTargetLength.class, + NonTargetLengthDto.PROPERTY_LENGTH, + NonTargetLengthDto.PROPERTY_LENGTH, + NonTargetLengthDto.PROPERTY_LENGTH_SOURCE, + NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES, + NonTargetLengthDto.PROPERTY_WEIGHT, + NonTargetLengthDto.PROPERTY_WEIGHT_SOURCE, + NonTargetLengthDto.PROPERTY_COUNT, + NonTargetLengthDto.PROPERTY_ACQUISITION_MODE, + NonTargetLengthDto.PROPERTY_SPECIES); } @Override public void initNonTargetSampleDto() { - + registerDto(NonTargetSampleDto.class, NonTargetSample.class, + NonTargetSampleDto.PROPERTY_COMMENT, + NonTargetSampleDto.PROPERTY_NON_TARGET_LENGTH); } @Override public void initObjectObservedSpeciesDto() { - + registerDto(ObjectObservedSpeciesDto.class, ObjectObservedSpecies.class, + ObjectObservedSpeciesDto.PROPERTY_COUNT, + ObjectObservedSpeciesDto.PROPERTY_STATUT, + ObjectObservedSpeciesDto.PROPERTY_SPECIES, + ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS); } @Override public void initObjectSchoolEstimateDto() { - + registerDto(ObjectSchoolEstimateDto.class, ObjectSchoolEstimate.class, + ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT, + ObjectSchoolEstimateDto.PROPERTY_SPECIES); } @Override public void initRouteDto() { - + registerDto(RouteDto.class, Route.class, + RouteDto.PROPERTY_COMMENT, + RouteDto.PROPERTY_OPEN, + RouteDto.PROPERTY_DATE, + RouteDto.PROPERTY_START_LOG_VALUE, + RouteDto.PROPERTY_END_LOG_VALUE, + RouteDto.PROPERTY_CHECK_LEVEL + ); } @Override public void initSchoolEstimateDto() { - + registerDto(SchoolEstimateDto.class, SchoolEstimate.class, + SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT, + SchoolEstimateDto.PROPERTY_MEAN_WEIGHT, + SchoolEstimateDto.PROPERTY_SPECIES); } @Override public void initSetSeineDto() { - + registerDto(SetSeineDto.class, SetSeine.class, + SetSeineDto.PROPERTY_COMMENT, + SetSeineDto.PROPERTY_START_TIME, + SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP, + SetSeineDto.PROPERTY_END_SET_TIME_STAMP, + SetSeineDto.PROPERTY_MAX_GEAR_DEPTH, + SetSeineDto.PROPERTY_CURRENT_SPEED, + SetSeineDto.PROPERTY_CURRENT_DIRECTION, + SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH, + SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH, + SetSeineDto.PROPERTY_SCHOOL_THICKNESS, + SetSeineDto.PROPERTY_SONAR_USED, + SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME, + SetSeineDto.PROPERTY_NON_TARGET_DISCARDED, + SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH, + SetSeineDto.PROPERTY_SCHOOL_TYPE, + SetSeineDto.PROPERTY_REASON_FOR_NULL_SET); } @Override public void initSetSeineNonTargetCatchDto() { - + registerDto(SetSeineNonTargetCatchDto.class, SetSeine.class, + SetSeineNonTargetCatchDto.PROPERTY_NON_TARGET_CATCH); } @Override public void initSetSeineSchoolEstimateDto() { - + registerDto(SetSeineSchoolEstimateDto.class, SetSeine.class, + SetSeineSchoolEstimateDto.PROPERTY_COMMENT, + SetSeineSchoolEstimateDto.PROPERTY_SCHOOL_ESTIMATE); } @Override public void initSetSeineTargetCatchDto() { - + registerDto(SetSeineTargetCatchDto.class, SetSeine.class, + SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH); } @Override public void initTargetCatchDto() { - + registerDto(TargetCatchDto.class, TargetCatch.class, + TargetCatchDto.PROPERTY_COMMENT, + TargetCatchDto.PROPERTY_CATCH_WEIGHT, + TargetCatchDto.PROPERTY_WELL, + TargetCatchDto.PROPERTY_BROUGHT_ON_DECK, + TargetCatchDto.PROPERTY_DISCARDED, + TargetCatchDto.PROPERTY_SPECIES, + TargetCatchDto.PROPERTY_REASON_FOR_DISCARD, + TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); } @Override public void initTargetLengthDto() { - + registerDto(TargetLengthDto.class, TargetLength.class, + TargetLengthDto.PROPERTY_MEASURE_TYPE, + TargetLengthDto.PROPERTY_LENGTH, + TargetLengthDto.PROPERTY_LENGTH_SOURCE, + TargetLengthDto.PROPERTY_COUNT, + TargetLengthDto.PROPERTY_WEIGHT, + TargetLengthDto.PROPERTY_WEIGHT_SOURCE, + TargetLengthDto.PROPERTY_ACQUISITION_MODE, + TargetLengthDto.PROPERTY_SPECIES); } @Override public void initTargetSampleDto() { - + registerDto(TargetSampleDto.class, TargetSample.class, + TargetSampleDto.PROPERTY_COMMENT, + TargetSampleDto.PROPERTY_NATURE, + TargetSampleDto.PROPERTY_DISCARDED, + TargetSampleDto.PROPERTY_TARGET_LENGTH); } @Override public void initTransmittingBuoyDto() { - + registerDto(TransmittingBuoyDto.class, TransmittingBuoy.class, + TransmittingBuoyDto.PROPERTY_CODE, + TransmittingBuoyDto.PROPERTY_BRAND, + TransmittingBuoyDto.PROPERTY_OWNERSHIP, + TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION, + TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE); } @Override public void initTripSeineDto() { - + registerDto(TripSeineDto.class, TripSeine.class, + TripSeineDto.PROPERTY_COMMENT, + TripSeineDto.PROPERTY_OPEN, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_DATE_ARRIVEE_PORT, + TripSeineDto.PROPERTY_CHECK_LEVEL, + TripSeineDto.PROPERTY_FORMS_URL, + TripSeineDto.PROPERTY_REPORTS_URL, + TripSeineDto.PROPERTY_HISTORICAL_DATA, + TripSeineDto.PROPERTY_ERS_ID, + TripSeineDto.PROPERTY_OBSERVER, + TripSeineDto.PROPERTY_CAPTAIN, + TripSeineDto.PROPERTY_DATA_ENTRY_OPERATOR, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OCEAN, + TripSeineDto.PROPERTY_DEPARTURE_HARBOUR, + TripSeineDto.PROPERTY_LANDING_HARBOUR); } protected <R extends IdDto, E extends TopiaEntity> void registerDtoType(Class<R> dtoType, Class<E> entityType) { DTO_TO_ENTITY_TYPE_BUILDER.put(dtoType, entityType); } + protected <D extends IdDto, E extends TopiaEntity> void registerDto(Class<D> dtoType, Class<E> entityType, String... properties) { + + registerDtoType(dtoType, entityType); + + BinderModelBuilder<D, E> dtoToEntityBuilder = + newBinderBuilder(dtoType, entityType, properties); + + registerDtoBinder(dtoToEntityBuilder); + + } + protected <R extends ReferentialDto, E extends TopiaEntity> void registerReferentialDtoBinder(Class<R> dtoType, Class<E> entityType, String... extraProperties) { BinderModelBuilder<R, E> dtoToEntityBuilder = newBinderBuilder(dtoType, entityType, DEFAULT_REFERENTIAL_PROPERTIES); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.