[Observe-commits] 14/32: Amélioration paquetage de binders

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit ec6c26ced3320ffc19efdcb8771b6fd1bc9c940d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 18 21:59:33 2016 +0100 Amélioration paquetage de binders --- .../topia/binder/BinderEngineInitializer.java | 230 ++++++++++----------- .../{ => longline}/ActivityLonglineBinder.java | 3 +- .../ActivityLonglineEncouterDtoBinder.java | 3 +- .../ActivityLonglineSensorUsedDtoBinder.java | 3 +- .../ActivityLonglineStubDtoBinder.java | 3 +- .../{ => longline}/BaitsCompositionBinder.java | 3 +- .../binder/data/{ => longline}/BasketBinder.java | 3 +- .../data/{ => longline}/BranchlineBinder.java | 3 +- .../BranchlinesCompositionBinder.java | 3 +- .../data/{ => longline}/CatchLonglineBinder.java | 3 +- .../data/{ => longline}/EncounterBinder.java | 3 +- .../FloatlinesCompositionBinder.java | 3 +- .../GearUseFeaturesLonglineBinder.java | 3 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 3 +- .../{ => longline}/HooksCompositionBinder.java | 3 +- .../binder/data/{ => longline}/SectionBinder.java | 3 +- .../data/{ => longline}/SensorUsedBinder.java | 3 +- .../data/{ => longline}/SetLonglineBinder.java | 3 +- .../{ => longline}/SetLonglineCatchDtoBinder.java | 3 +- .../SetLonglineDetailCompositionDtoBinder.java | 3 +- .../SetLonglineGlobalCompositionDtoBinder.java | 3 +- .../{ => longline}/SetLonglineStubDtoBinder.java | 3 +- .../{ => longline}/SetLonglineTdrDtoBinder.java | 3 +- .../data/{ => longline}/SizeMeasureBinder.java | 3 +- .../binder/data/{ => longline}/TdrBinder.java | 3 +- .../TripLonglineActivityDtoBinder.java | 3 +- .../data/{ => longline}/TripLonglineBinder.java | 7 +- .../TripLonglineGearUseDtoBinder.java | 3 +- .../data/{ => longline}/WeightMeasureBinder.java | 3 +- .../data/{ => seine}/ActivitySeineBinder.java | 3 +- .../{ => seine}/ActivitySeineStubDtoBinder.java | 3 +- .../data/{ => seine}/FloatingObjectBinder.java | 3 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 3 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 3 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 3 +- .../GearUseFeaturesMeasurementSeineBinder.java | 3 +- .../{ => seine}/GearUseFeaturesSeineBinder.java | 3 +- .../data/{ => seine}/NonTargetCatchBinder.java | 3 +- .../data/{ => seine}/NonTargetLengthBinder.java | 3 +- .../data/{ => seine}/NonTargetSampleBinder.java | 3 +- .../{ => seine}/ObjectObservedSpeciesBinder.java | 3 +- .../{ => seine}/ObjectSchoolEstimateBinder.java | 3 +- .../topia/binder/data/{ => seine}/RouteBinder.java | 3 +- .../data/{ => seine}/RouteStubDtoBinder.java | 3 +- .../data/{ => seine}/SchoolEstimateBinder.java | 3 +- .../binder/data/{ => seine}/SetSeineBinder.java | 3 +- .../SetSeineNonTargetCatchDtoBinder.java | 3 +- .../SetSeineSchoolEstimateDtoBinder.java | 3 +- .../{ => seine}/SetSeineTargetCatchDtoBinder.java | 3 +- .../binder/data/{ => seine}/TargetCatchBinder.java | 3 +- .../data/{ => seine}/TargetLengthBinder.java | 3 +- .../data/{ => seine}/TargetSampleBinder.java | 3 +- .../data/{ => seine}/TransmittingBuoyBinder.java | 3 +- .../binder/data/{ => seine}/TripSeineBinder.java | 3 +- .../{ => seine}/TripSeineGearUseDtoBinder.java | 3 +- .../referential/{ => common}/CountryBinder.java | 3 +- .../referential/{ => common}/FpaZoneBinder.java | 3 +- .../referential/{ => common}/GearBinder.java | 3 +- .../{ => common}/GearCaracteristicBinder.java | 3 +- .../{ => common}/GearCaracteristicTypeBinder.java | 3 +- .../referential/{ => common}/HarbourBinder.java | 3 +- .../{ => common}/LengthLengthParameterBinder.java | 3 +- .../{ => common}/LengthWeightParameterBinder.java | 3 +- .../referential/{ => common}/OceanBinder.java | 3 +- .../referential/{ => common}/OrganismBinder.java | 3 +- .../referential/{ => common}/PersonBinder.java | 3 +- .../referential/{ => common}/ProgramBinder.java | 3 +- .../binder/referential/{ => common}/SexBinder.java | 3 +- .../referential/{ => common}/ShipOwnerBinder.java | 3 +- .../{ => common}/SizeMeasureTypeBinder.java | 3 +- .../referential/{ => common}/SpeciesBinder.java | 3 +- .../{ => common}/SpeciesGroupBinder.java | 3 +- .../{ => common}/SpeciesListBinder.java | 3 +- .../referential/{ => common}/VesselBinder.java | 3 +- .../{ => common}/VesselSizeCategoryBinder.java | 3 +- .../referential/{ => common}/VesselTypeBinder.java | 3 +- .../{ => common}/WeightMeasureTypeBinder.java | 3 +- .../{ => longline}/BaitHaulingStatusBinder.java | 3 +- .../{ => longline}/BaitSettingStatusBinder.java | 3 +- .../referential/{ => longline}/BaitTypeBinder.java | 3 +- .../{ => longline}/CatchFateLonglineBinder.java | 3 +- .../{ => longline}/EncounterTypeBinder.java | 3 +- .../{ => longline}/HealthnessBinder.java | 3 +- .../{ => longline}/HookPositionBinder.java | 3 +- .../referential/{ => longline}/HookSizeBinder.java | 3 +- .../referential/{ => longline}/HookTypeBinder.java | 3 +- .../ItemHorizontalPositionBinder.java | 3 +- .../{ => longline}/ItemVerticalPositionBinder.java | 3 +- .../{ => longline}/LightsticksColorBinder.java | 3 +- .../{ => longline}/LightsticksTypeBinder.java | 3 +- .../referential/{ => longline}/LineTypeBinder.java | 3 +- .../{ => longline}/MaturityStatusBinder.java | 3 +- .../{ => longline}/MitigationTypeBinder.java | 3 +- .../{ => longline}/SensorBrandBinder.java | 3 +- .../{ => longline}/SensorDataFormatBinder.java | 3 +- .../{ => longline}/SensorTypeBinder.java | 3 +- .../{ => longline}/SettingShapeBinder.java | 3 +- .../{ => longline}/StomacFullnessBinder.java | 3 +- .../referential/{ => longline}/TripTypeBinder.java | 3 +- .../VesselActivityLonglineBinder.java | 3 +- .../{ => seine}/DetectionModeBinder.java | 3 +- .../referential/{ => seine}/ObjectFateBinder.java | 3 +- .../{ => seine}/ObjectOperationBinder.java | 3 +- .../referential/{ => seine}/ObjectTypeBinder.java | 3 +- .../{ => seine}/ObservedSystemBinder.java | 3 +- .../{ => seine}/ReasonForDiscardBinder.java | 3 +- .../{ => seine}/ReasonForNoFishingBinder.java | 3 +- .../{ => seine}/ReasonForNullSetBinder.java | 3 +- .../referential/{ => seine}/SpeciesFateBinder.java | 3 +- .../{ => seine}/SpeciesStatusBinder.java | 3 +- .../{ => seine}/SurroundingActivityBinder.java | 3 +- .../TransmittingBuoyOperationBinder.java | 3 +- .../{ => seine}/TransmittingBuoyTypeBinder.java | 3 +- .../{ => seine}/VesselActivitySeineBinder.java | 3 +- .../{ => seine}/WeightCategoryBinder.java | 3 +- .../binder/referential/{ => seine}/WindBinder.java | 3 +- 116 files changed, 349 insertions(+), 230 deletions(-) diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java index c3cd0dd..6b490a8 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java @@ -242,121 +242,121 @@ 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 fr.ird.observe.services.topia.binder.data.ActivityLonglineBinder; -import fr.ird.observe.services.topia.binder.data.ActivityLonglineEncouterDtoBinder; -import fr.ird.observe.services.topia.binder.data.ActivityLonglineSensorUsedDtoBinder; -import fr.ird.observe.services.topia.binder.data.ActivityLonglineStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.ActivitySeineBinder; -import fr.ird.observe.services.topia.binder.data.ActivitySeineStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.BaitsCompositionBinder; -import fr.ird.observe.services.topia.binder.data.BasketBinder; -import fr.ird.observe.services.topia.binder.data.BranchlineBinder; -import fr.ird.observe.services.topia.binder.data.BranchlinesCompositionBinder; -import fr.ird.observe.services.topia.binder.data.CatchLonglineBinder; -import fr.ird.observe.services.topia.binder.data.EncounterBinder; -import fr.ird.observe.services.topia.binder.data.FloatingObjectBinder; -import fr.ird.observe.services.topia.binder.data.FloatingObjectObservedSpeciesDtoBinder; -import fr.ird.observe.services.topia.binder.data.FloatingObjectSchoolEstimateDtoBinder; -import fr.ird.observe.services.topia.binder.data.FloatingObjectTransmittingBuoyDtoBinder; -import fr.ird.observe.services.topia.binder.data.FloatlinesCompositionBinder; -import fr.ird.observe.services.topia.binder.data.GearUseFeaturesLonglineBinder; -import fr.ird.observe.services.topia.binder.data.GearUseFeaturesMeasurementLonglineBinder; -import fr.ird.observe.services.topia.binder.data.GearUseFeaturesMeasurementSeineBinder; -import fr.ird.observe.services.topia.binder.data.GearUseFeaturesSeineBinder; -import fr.ird.observe.services.topia.binder.data.HooksCompositionBinder; -import fr.ird.observe.services.topia.binder.data.NonTargetCatchBinder; -import fr.ird.observe.services.topia.binder.data.NonTargetLengthBinder; -import fr.ird.observe.services.topia.binder.data.NonTargetSampleBinder; -import fr.ird.observe.services.topia.binder.data.ObjectObservedSpeciesBinder; -import fr.ird.observe.services.topia.binder.data.ObjectSchoolEstimateBinder; -import fr.ird.observe.services.topia.binder.data.RouteBinder; -import fr.ird.observe.services.topia.binder.data.RouteStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.SchoolEstimateBinder; -import fr.ird.observe.services.topia.binder.data.SectionBinder; -import fr.ird.observe.services.topia.binder.data.SensorUsedBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineCatchDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineDetailCompositionDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineGlobalCompositionDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetLonglineTdrDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetSeineBinder; -import fr.ird.observe.services.topia.binder.data.SetSeineNonTargetCatchDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetSeineSchoolEstimateDtoBinder; -import fr.ird.observe.services.topia.binder.data.SetSeineTargetCatchDtoBinder; -import fr.ird.observe.services.topia.binder.data.SizeMeasureBinder; -import fr.ird.observe.services.topia.binder.data.TargetCatchBinder; -import fr.ird.observe.services.topia.binder.data.TargetLengthBinder; -import fr.ird.observe.services.topia.binder.data.TargetSampleBinder; -import fr.ird.observe.services.topia.binder.data.TdrBinder; -import fr.ird.observe.services.topia.binder.data.TransmittingBuoyBinder; -import fr.ird.observe.services.topia.binder.data.TripLonglineActivityDtoBinder; -import fr.ird.observe.services.topia.binder.data.TripLonglineBinder; -import fr.ird.observe.services.topia.binder.data.TripLonglineGearUseDtoBinder; -import fr.ird.observe.services.topia.binder.data.TripSeineBinder; -import fr.ird.observe.services.topia.binder.data.TripSeineGearUseDtoBinder; -import fr.ird.observe.services.topia.binder.data.WeightMeasureBinder; -import fr.ird.observe.services.topia.binder.referential.BaitHaulingStatusBinder; -import fr.ird.observe.services.topia.binder.referential.BaitSettingStatusBinder; -import fr.ird.observe.services.topia.binder.referential.BaitTypeBinder; -import fr.ird.observe.services.topia.binder.referential.CatchFateLonglineBinder; -import fr.ird.observe.services.topia.binder.referential.CountryBinder; -import fr.ird.observe.services.topia.binder.referential.DetectionModeBinder; -import fr.ird.observe.services.topia.binder.referential.EncounterTypeBinder; -import fr.ird.observe.services.topia.binder.referential.FpaZoneBinder; -import fr.ird.observe.services.topia.binder.referential.GearBinder; -import fr.ird.observe.services.topia.binder.referential.GearCaracteristicBinder; -import fr.ird.observe.services.topia.binder.referential.GearCaracteristicTypeBinder; -import fr.ird.observe.services.topia.binder.referential.HarbourBinder; -import fr.ird.observe.services.topia.binder.referential.HealthnessBinder; -import fr.ird.observe.services.topia.binder.referential.HookPositionBinder; -import fr.ird.observe.services.topia.binder.referential.HookSizeBinder; -import fr.ird.observe.services.topia.binder.referential.HookTypeBinder; -import fr.ird.observe.services.topia.binder.referential.ItemHorizontalPositionBinder; -import fr.ird.observe.services.topia.binder.referential.ItemVerticalPositionBinder; -import fr.ird.observe.services.topia.binder.referential.LengthLengthParameterBinder; -import fr.ird.observe.services.topia.binder.referential.LengthWeightParameterBinder; -import fr.ird.observe.services.topia.binder.referential.LightsticksColorBinder; -import fr.ird.observe.services.topia.binder.referential.LightsticksTypeBinder; -import fr.ird.observe.services.topia.binder.referential.LineTypeBinder; -import fr.ird.observe.services.topia.binder.referential.MaturityStatusBinder; -import fr.ird.observe.services.topia.binder.referential.MitigationTypeBinder; -import fr.ird.observe.services.topia.binder.referential.ObjectFateBinder; -import fr.ird.observe.services.topia.binder.referential.ObjectOperationBinder; -import fr.ird.observe.services.topia.binder.referential.ObjectTypeBinder; -import fr.ird.observe.services.topia.binder.referential.ObservedSystemBinder; -import fr.ird.observe.services.topia.binder.referential.OceanBinder; -import fr.ird.observe.services.topia.binder.referential.OrganismBinder; -import fr.ird.observe.services.topia.binder.referential.PersonBinder; -import fr.ird.observe.services.topia.binder.referential.ProgramBinder; -import fr.ird.observe.services.topia.binder.referential.ReasonForDiscardBinder; -import fr.ird.observe.services.topia.binder.referential.ReasonForNoFishingBinder; -import fr.ird.observe.services.topia.binder.referential.ReasonForNullSetBinder; -import fr.ird.observe.services.topia.binder.referential.SensorBrandBinder; -import fr.ird.observe.services.topia.binder.referential.SensorDataFormatBinder; -import fr.ird.observe.services.topia.binder.referential.SensorTypeBinder; -import fr.ird.observe.services.topia.binder.referential.SettingShapeBinder; -import fr.ird.observe.services.topia.binder.referential.SexBinder; -import fr.ird.observe.services.topia.binder.referential.ShipOwnerBinder; -import fr.ird.observe.services.topia.binder.referential.SizeMeasureTypeBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesFateBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesGroupBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesListBinder; -import fr.ird.observe.services.topia.binder.referential.SpeciesStatusBinder; -import fr.ird.observe.services.topia.binder.referential.StomacFullnessBinder; -import fr.ird.observe.services.topia.binder.referential.SurroundingActivityBinder; -import fr.ird.observe.services.topia.binder.referential.TransmittingBuoyOperationBinder; -import fr.ird.observe.services.topia.binder.referential.TransmittingBuoyTypeBinder; -import fr.ird.observe.services.topia.binder.referential.TripTypeBinder; -import fr.ird.observe.services.topia.binder.referential.VesselActivityLonglineBinder; -import fr.ird.observe.services.topia.binder.referential.VesselActivitySeineBinder; -import fr.ird.observe.services.topia.binder.referential.VesselBinder; -import fr.ird.observe.services.topia.binder.referential.VesselSizeCategoryBinder; -import fr.ird.observe.services.topia.binder.referential.VesselTypeBinder; -import fr.ird.observe.services.topia.binder.referential.WeightCategoryBinder; -import fr.ird.observe.services.topia.binder.referential.WeightMeasureTypeBinder; -import fr.ird.observe.services.topia.binder.referential.WindBinder; +import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineBinder; +import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineEncouterDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineSensorUsedDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.seine.ActivitySeineBinder; +import fr.ird.observe.services.topia.binder.data.seine.ActivitySeineStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.BaitsCompositionBinder; +import fr.ird.observe.services.topia.binder.data.longline.BasketBinder; +import fr.ird.observe.services.topia.binder.data.longline.BranchlineBinder; +import fr.ird.observe.services.topia.binder.data.longline.BranchlinesCompositionBinder; +import fr.ird.observe.services.topia.binder.data.longline.CatchLonglineBinder; +import fr.ird.observe.services.topia.binder.data.longline.EncounterBinder; +import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectBinder; +import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectObservedSpeciesDtoBinder; +import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectSchoolEstimateDtoBinder; +import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectTransmittingBuoyDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.FloatlinesCompositionBinder; +import fr.ird.observe.services.topia.binder.data.longline.GearUseFeaturesLonglineBinder; +import fr.ird.observe.services.topia.binder.data.longline.GearUseFeaturesMeasurementLonglineBinder; +import fr.ird.observe.services.topia.binder.data.seine.GearUseFeaturesMeasurementSeineBinder; +import fr.ird.observe.services.topia.binder.data.seine.GearUseFeaturesSeineBinder; +import fr.ird.observe.services.topia.binder.data.longline.HooksCompositionBinder; +import fr.ird.observe.services.topia.binder.data.seine.NonTargetCatchBinder; +import fr.ird.observe.services.topia.binder.data.seine.NonTargetLengthBinder; +import fr.ird.observe.services.topia.binder.data.seine.NonTargetSampleBinder; +import fr.ird.observe.services.topia.binder.data.seine.ObjectObservedSpeciesBinder; +import fr.ird.observe.services.topia.binder.data.seine.ObjectSchoolEstimateBinder; +import fr.ird.observe.services.topia.binder.data.seine.RouteBinder; +import fr.ird.observe.services.topia.binder.data.seine.RouteStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.seine.SchoolEstimateBinder; +import fr.ird.observe.services.topia.binder.data.longline.SectionBinder; +import fr.ird.observe.services.topia.binder.data.longline.SensorUsedBinder; +import fr.ird.observe.services.topia.binder.data.longline.SetLonglineBinder; +import fr.ird.observe.services.topia.binder.data.longline.SetLonglineCatchDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.SetLonglineDetailCompositionDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.SetLonglineGlobalCompositionDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.SetLonglineStubDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.SetLonglineTdrDtoBinder; +import fr.ird.observe.services.topia.binder.data.seine.SetSeineBinder; +import fr.ird.observe.services.topia.binder.data.seine.SetSeineNonTargetCatchDtoBinder; +import fr.ird.observe.services.topia.binder.data.seine.SetSeineSchoolEstimateDtoBinder; +import fr.ird.observe.services.topia.binder.data.seine.SetSeineTargetCatchDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.SizeMeasureBinder; +import fr.ird.observe.services.topia.binder.data.seine.TargetCatchBinder; +import fr.ird.observe.services.topia.binder.data.seine.TargetLengthBinder; +import fr.ird.observe.services.topia.binder.data.seine.TargetSampleBinder; +import fr.ird.observe.services.topia.binder.data.longline.TdrBinder; +import fr.ird.observe.services.topia.binder.data.seine.TransmittingBuoyBinder; +import fr.ird.observe.services.topia.binder.data.longline.TripLonglineActivityDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.TripLonglineBinder; +import fr.ird.observe.services.topia.binder.data.longline.TripLonglineGearUseDtoBinder; +import fr.ird.observe.services.topia.binder.data.seine.TripSeineBinder; +import fr.ird.observe.services.topia.binder.data.seine.TripSeineGearUseDtoBinder; +import fr.ird.observe.services.topia.binder.data.longline.WeightMeasureBinder; +import fr.ird.observe.services.topia.binder.referential.longline.BaitHaulingStatusBinder; +import fr.ird.observe.services.topia.binder.referential.longline.BaitSettingStatusBinder; +import fr.ird.observe.services.topia.binder.referential.longline.BaitTypeBinder; +import fr.ird.observe.services.topia.binder.referential.longline.CatchFateLonglineBinder; +import fr.ird.observe.services.topia.binder.referential.common.CountryBinder; +import fr.ird.observe.services.topia.binder.referential.seine.DetectionModeBinder; +import fr.ird.observe.services.topia.binder.referential.longline.EncounterTypeBinder; +import fr.ird.observe.services.topia.binder.referential.common.FpaZoneBinder; +import fr.ird.observe.services.topia.binder.referential.common.GearBinder; +import fr.ird.observe.services.topia.binder.referential.common.GearCaracteristicBinder; +import fr.ird.observe.services.topia.binder.referential.common.GearCaracteristicTypeBinder; +import fr.ird.observe.services.topia.binder.referential.common.HarbourBinder; +import fr.ird.observe.services.topia.binder.referential.longline.HealthnessBinder; +import fr.ird.observe.services.topia.binder.referential.longline.HookPositionBinder; +import fr.ird.observe.services.topia.binder.referential.longline.HookSizeBinder; +import fr.ird.observe.services.topia.binder.referential.longline.HookTypeBinder; +import fr.ird.observe.services.topia.binder.referential.longline.ItemHorizontalPositionBinder; +import fr.ird.observe.services.topia.binder.referential.longline.ItemVerticalPositionBinder; +import fr.ird.observe.services.topia.binder.referential.common.LengthLengthParameterBinder; +import fr.ird.observe.services.topia.binder.referential.common.LengthWeightParameterBinder; +import fr.ird.observe.services.topia.binder.referential.longline.LightsticksColorBinder; +import fr.ird.observe.services.topia.binder.referential.longline.LightsticksTypeBinder; +import fr.ird.observe.services.topia.binder.referential.longline.LineTypeBinder; +import fr.ird.observe.services.topia.binder.referential.longline.MaturityStatusBinder; +import fr.ird.observe.services.topia.binder.referential.longline.MitigationTypeBinder; +import fr.ird.observe.services.topia.binder.referential.seine.ObjectFateBinder; +import fr.ird.observe.services.topia.binder.referential.seine.ObjectOperationBinder; +import fr.ird.observe.services.topia.binder.referential.seine.ObjectTypeBinder; +import fr.ird.observe.services.topia.binder.referential.seine.ObservedSystemBinder; +import fr.ird.observe.services.topia.binder.referential.common.OceanBinder; +import fr.ird.observe.services.topia.binder.referential.common.OrganismBinder; +import fr.ird.observe.services.topia.binder.referential.common.PersonBinder; +import fr.ird.observe.services.topia.binder.referential.common.ProgramBinder; +import fr.ird.observe.services.topia.binder.referential.seine.ReasonForDiscardBinder; +import fr.ird.observe.services.topia.binder.referential.seine.ReasonForNoFishingBinder; +import fr.ird.observe.services.topia.binder.referential.seine.ReasonForNullSetBinder; +import fr.ird.observe.services.topia.binder.referential.longline.SensorBrandBinder; +import fr.ird.observe.services.topia.binder.referential.longline.SensorDataFormatBinder; +import fr.ird.observe.services.topia.binder.referential.longline.SensorTypeBinder; +import fr.ird.observe.services.topia.binder.referential.longline.SettingShapeBinder; +import fr.ird.observe.services.topia.binder.referential.common.SexBinder; +import fr.ird.observe.services.topia.binder.referential.common.ShipOwnerBinder; +import fr.ird.observe.services.topia.binder.referential.common.SizeMeasureTypeBinder; +import fr.ird.observe.services.topia.binder.referential.common.SpeciesBinder; +import fr.ird.observe.services.topia.binder.referential.seine.SpeciesFateBinder; +import fr.ird.observe.services.topia.binder.referential.common.SpeciesGroupBinder; +import fr.ird.observe.services.topia.binder.referential.common.SpeciesListBinder; +import fr.ird.observe.services.topia.binder.referential.seine.SpeciesStatusBinder; +import fr.ird.observe.services.topia.binder.referential.longline.StomacFullnessBinder; +import fr.ird.observe.services.topia.binder.referential.seine.SurroundingActivityBinder; +import fr.ird.observe.services.topia.binder.referential.seine.TransmittingBuoyOperationBinder; +import fr.ird.observe.services.topia.binder.referential.seine.TransmittingBuoyTypeBinder; +import fr.ird.observe.services.topia.binder.referential.longline.TripTypeBinder; +import fr.ird.observe.services.topia.binder.referential.longline.VesselActivityLonglineBinder; +import fr.ird.observe.services.topia.binder.referential.seine.VesselActivitySeineBinder; +import fr.ird.observe.services.topia.binder.referential.common.VesselBinder; +import fr.ird.observe.services.topia.binder.referential.common.VesselSizeCategoryBinder; +import fr.ird.observe.services.topia.binder.referential.common.VesselTypeBinder; +import fr.ird.observe.services.topia.binder.referential.seine.WeightCategoryBinder; +import fr.ird.observe.services.topia.binder.referential.common.WeightMeasureTypeBinder; +import fr.ird.observe.services.topia.binder.referential.seine.WindBinder; import java.util.Map; diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineBinder.java index 984f684..892fe1b 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -31,6 +31,7 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java index 714bb3c..e1ef81a 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineEncouterDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -28,6 +28,7 @@ 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; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java index f025200..42fd030 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineSensorUsedDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.longline.SensorUsed; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java similarity index 93% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java index 1d3d372..c27e9d3 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineStubDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java index 38a8268..93c7c8e 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BaitsCompositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -29,6 +29,7 @@ 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; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BasketBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BasketBinder.java index 29e040b..e2cd5de 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BasketBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlineBinder.java similarity index 97% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlineBinder.java index 4a15d1d..62aa69b 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -38,6 +38,7 @@ import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java index 0d09b7f..d9ba0a9 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlinesCompositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.referentiel.longline.LineType; 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; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/CatchLonglineBinder.java similarity index 98% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/CatchLonglineBinder.java index c04a6aa..1dda75c 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/CatchLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -50,6 +50,7 @@ import fr.ird.observe.services.dto.referential.longline.HealthnessDto; import fr.ird.observe.services.dto.referential.longline.HookPositionDto; import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/EncounterBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/EncounterBinder.java index 5ccc857..d7526c6 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/EncounterBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/EncounterBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -30,6 +30,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java index 8af80fd..afd9317 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatlinesCompositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.referentiel.longline.LineType; 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; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java index b3534d5..8413dc8 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java index bd4971e..9459bc5 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java index 6e59ba0..eb8aec9 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/HooksCompositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -29,6 +29,7 @@ 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; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SectionBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SectionBinder.java index 512952f..ae06e84 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SectionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.SectionDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SensorUsedBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SensorUsedBinder.java index f85f267..532a6f3 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SensorUsedBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SensorUsedBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineBinder.java similarity index 98% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineBinder.java index 836bd0b..7638be2 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto; import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java index 7d57323..3470ebb 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineCatchDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java index 948edad..3ce8e46 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineDetailCompositionDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java index f24ea20..72fd5f4 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineGlobalCompositionDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -35,6 +35,7 @@ import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java similarity index 93% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java index 6199cd8..cbe19bf 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineStubDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java index f72c16a..a3d153d 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetLonglineTdrDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.longline.Tdr; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java index ebe4223..45974e3 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SizeMeasureBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java similarity index 98% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java index 1fc1c7d..6457db6 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TdrBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -40,6 +40,7 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java similarity index 93% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java index b72648d..99e3618 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineActivityDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.TripLonglineActivityDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineBinder.java index 7ab3890..274589c 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -41,6 +41,7 @@ import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. @@ -62,6 +63,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong entity.setEndDate(dto.getEndDate()); entity.setTotalFishingOperationsNumber(dto.getTotalFishingOperationsNumber()); entity.setHomeId(dto.getHomeId()); + entity.setActivityCount(dto.getActivityCount()); entity.setTripType(toEntity(dto.getTripType(), TripType.class)); entity.setOcean(toEntity(dto.getOcean(), Ocean.class)); entity.setVessel(toEntity(dto.getVessel(), Vessel.class)); @@ -84,6 +86,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong dto.setEndDate(entity.getEndDate()); dto.setTotalFishingOperationsNumber(entity.getTotalFishingOperationsNumber()); dto.setHomeId(entity.getHomeId()); + dto.setActivityCount(entity.getActivityCount()); dto.setTripType(toReferentialReference(referentialLocale, entity.getTripType(), TripTypeDto.class)); dto.setOcean(toReferentialReference(referentialLocale, entity.getOcean(), OceanDto.class)); dto.setVessel(toReferentialReference(referentialLocale, entity.getVessel(), VesselDto.class)); @@ -105,6 +108,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong entity.getEndDate(), toEntityId(entity.getProgram()), toEntityId(entity.getTripType()), + entity.getActivityCount(), getLabel(referentialLocale, entity.getVessel()), entity.getObserverLabel()); @@ -118,6 +122,7 @@ public class TripLonglineBinder extends DataBinderSupport<TripLongline, TripLong dto.getEndDate(), toDtoId(dto.getProgram()), toDtoId(dto.getTripType()), + dto.getActivityCount(), getLabel(referentialLocale, dto.getVessel()), PersonHelper.getNames(dto.getObserver())); diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java index 511adca..9b635f4 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripLonglineGearUseDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java index 1a64575..522103c 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/WeightMeasureBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.longline; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineBinder.java similarity index 98% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineBinder.java index 9d8b2f7..357bd56 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -41,6 +41,7 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java index 1afe325..c65dbff 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineStubDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.ActivitySeineImpl; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectBinder.java index a8d98c2..0fa1c1e 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java index be3f538..634b611 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectObservedSpeciesDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.ObjectObservedSpecies; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java index c7c6785..4bb1388 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectSchoolEstimateDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.ObjectSchoolEstimate; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java index 9147734..bee7e8f 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.TransmittingBuoy; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java index 9771c96..903d343 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesMeasurementSeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java index 8d1ab15..a8dccc8 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/GearUseFeaturesSeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java similarity index 97% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java index c2680ae..bc1b6f9 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetCatchBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java similarity index 97% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java index 345dd31..3da0b22 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java index e79c7bd..b0a2711 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetSampleBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.NonTargetSample; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java index 8aebff8..ecc47ba 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectObservedSpeciesBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java index e7a55ab..cf848f8 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/ObjectSchoolEstimateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.ObjectSchoolEstimate; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteBinder.java index 1df4fbb..c61b57e 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java similarity index 93% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java index b728dbb..f0d8052 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/RouteStubDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.RouteStubDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SchoolEstimateBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SchoolEstimateBinder.java index e99d0e2..c745309 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SchoolEstimateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SchoolEstimateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java similarity index 97% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java index ee43a47..da1981a 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java index 4987be7..1ad9b2c 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineNonTargetCatchDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java index 1fd732d..4b3f996 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineSchoolEstimateDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java index 927dd66..e27a501 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/SetSeineTargetCatchDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.TargetCatch; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java index 05a4f04..0b5b5c3 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetLengthBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetLengthBinder.java index 53f6b04..45ac4c1 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetLengthBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java index dc76971..9499780 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetSampleBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java index 3585c0a..0e1bf94 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TransmittingBuoyBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineBinder.java similarity index 97% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineBinder.java index a4ce727..049ed3f 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -39,6 +39,7 @@ import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java index b6fe587..5aef0c4 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TripSeineGearUseDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.topia.binder.data.seine; /*- * #%L @@ -27,6 +27,7 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; +import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/CountryBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/CountryBinder.java index 6e64840..072fc0a 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CountryBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/CountryBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/FpaZoneBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/FpaZoneBinder.java index 3c23944..cecef3e 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/FpaZoneBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/FpaZoneBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearBinder.java index a11839b..4bbed34 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicBinder.java index a834761..390da52 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicTypeBinder.java index 649908b..a61133f 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/GearCaracteristicTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.GearCaracteristicType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/HarbourBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/HarbourBinder.java index df01bad..bd04214 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HarbourBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/HarbourBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthLengthParameterBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthLengthParameterBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthLengthParameterBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthLengthParameterBinder.java index 4e1ec7b..40eccd2 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthLengthParameterBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthLengthParameterBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthWeightParameterBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthWeightParameterBinder.java index c3b1201..00c0e57 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LengthWeightParameterBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthWeightParameterBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OceanBinder.java similarity index 93% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OceanBinder.java index 4268349..c707a27 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OceanBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OceanBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OrganismBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OrganismBinder.java index 65d48a2..4fcf30f 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/OrganismBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OrganismBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/PersonBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/PersonBinder.java index f6009e6..1213ed4 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/PersonBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/PersonBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java index f6b8293..a066813 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SexBinder.java similarity index 93% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SexBinder.java index 37dfc96..463e74d 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SexBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SexBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ShipOwnerBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ShipOwnerBinder.java index d67f7d2..8ad1302 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ShipOwnerBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ShipOwnerBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ShipOwnerDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 02/11/16. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SizeMeasureTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SizeMeasureTypeBinder.java index eaf8a1a..05ec508 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SizeMeasureTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SizeMeasureTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesBinder.java similarity index 96% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesBinder.java index b707f21..a5d55d1 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -32,6 +32,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesGroupBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesGroupBinder.java index c4aeb0e..3bf324f 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesGroupBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesGroupBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.SpeciesGroup; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesListBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesListBinder.java index 31db0e3..f7f8123 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesListBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesListBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselBinder.java similarity index 97% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselBinder.java index e5d22d2..d75f6f5 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.referential.ShipOwnerDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.referential.VesselTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselSizeCategoryBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselSizeCategoryBinder.java index d684297..38a1baf 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselSizeCategoryBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselSizeCategoryBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.VesselSizeCategory; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselTypeBinder.java index 8d33980..d266080 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.VesselType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/WeightMeasureTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/WeightMeasureTypeBinder.java index fabacb2..9e12cd7 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightMeasureTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/WeightMeasureTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.common; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitHaulingStatusBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitHaulingStatusBinder.java index 6fab729..ceb1218 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitHaulingStatusBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitHaulingStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitSettingStatusBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitSettingStatusBinder.java index 4f01526..4a98ea3 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitSettingStatusBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitSettingStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.BaitSettingStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitTypeBinder.java index e108f82..27b5397 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/BaitTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.BaitType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/CatchFateLonglineBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/CatchFateLonglineBinder.java index 4aadbc2..8d9e2cb 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/CatchFateLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/CatchFateLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.CatchFateLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/EncounterTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/EncounterTypeBinder.java index 585c54e..77d73b9 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/EncounterTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/EncounterTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.EncounterType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HealthnessBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HealthnessBinder.java index 4f2948d..b5d9c0d 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HealthnessBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HealthnessBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.Healthness; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.HealthnessDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookPositionBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookPositionBinder.java index 11fbaf1..1c3f3d1 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookPositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookPositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.HookPosition; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.HookPositionDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookSizeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookSizeBinder.java index ac5a620..18c36b8 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookSizeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookSizeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.HookSize; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookTypeBinder.java index 4257c61..d5222ca 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/HookTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.HookType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemHorizontalPositionBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemHorizontalPositionBinder.java index dd9ec3c..face512 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemHorizontalPositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemHorizontalPositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemVerticalPositionBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemVerticalPositionBinder.java index 199f0f2..90b0b57 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ItemVerticalPositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemVerticalPositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksColorBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksColorBinder.java index 8b6e6d4..6953ca4 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksColorBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksColorBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.LightsticksColor; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksTypeBinder.java index 82c56be..6a7adf8 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LightsticksTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.LightsticksType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LineTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LineTypeBinder.java index aa192fb..59f7ff4 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/LineTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LineTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.LineType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MaturityStatusBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MaturityStatusBinder.java index c3c4a66..e1adb31 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MaturityStatusBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MaturityStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.MaturityStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MitigationTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MitigationTypeBinder.java index 5998284..ca226a9 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/MitigationTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MitigationTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.MitigationType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorBrandBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorBrandBinder.java index c2fa82f..e532d98 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorBrandBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorBrandBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.SensorBrand; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorDataFormatBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorDataFormatBinder.java index f34f179..b069a82 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorDataFormatBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorDataFormatBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorTypeBinder.java index 14cd606..4c0415a 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SensorTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.SensorType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SettingShapeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SettingShapeBinder.java index b803697..5250f47 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SettingShapeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SettingShapeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.SettingShape; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/StomacFullnessBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/StomacFullnessBinder.java index 8ae873b..9ce8dc9 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/StomacFullnessBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/StomacFullnessBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.StomacFullness; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/TripTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/TripTypeBinder.java index 596b206..a3d76d8 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TripTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/TripTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.TripType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/VesselActivityLonglineBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/VesselActivityLonglineBinder.java index dac2cef..a475f3c 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivityLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/VesselActivityLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.longline; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/DetectionModeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/DetectionModeBinder.java index 02505a3..0d97d81 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/DetectionModeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/DetectionModeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.DetectionMode; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectFateBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectFateBinder.java index 6990f45..64047b8 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectFateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectFateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.ObjectFate; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectOperationBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectOperationBinder.java index ae6fe45..b312e70 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectOperationBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectOperationBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.ObjectOperation; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectTypeBinder.java index ae7e9f4..869c771 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObjectTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.ObjectType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java index 91e60dc..ead7519 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ObservedSystemBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.ObservedSystem; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForDiscardBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForDiscardBinder.java index bb87206..3468a2c 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForDiscardBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForDiscardBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNoFishingBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNoFishingBinder.java index a78af2e..ef828d7 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNoFishingBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNoFishingBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNullSetBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNullSetBinder.java index e4b0272..797d50f 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReasonForNullSetBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNullSetBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.ReasonForNullSet; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesFateBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesFateBinder.java index ba1d009..2680d85 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesFateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.SpeciesFate; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesStatusBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesStatusBinder.java index 01a7ebe..8697e35 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesStatusBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.SpeciesStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SurroundingActivityBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SurroundingActivityBinder.java index 1c0838d..061f801 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SurroundingActivityBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SurroundingActivityBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.SurroundingActivity; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyOperationBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyOperationBinder.java index ea9218f..5624983 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyOperationBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyOperationBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyTypeBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyTypeBinder.java index bbadaa9..a2f1da1 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/TransmittingBuoyTypeBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/VesselActivitySeineBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/VesselActivitySeineBinder.java index 0de11b2..822d009 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/VesselActivitySeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WeightCategoryBinder.java similarity index 95% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WeightCategoryBinder.java index a5aabaa..5966e3a 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WeightCategoryBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WeightCategoryBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -28,6 +28,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WindBinder.java similarity index 94% rename from services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java rename to services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WindBinder.java index 2a0d8c3..4f8b6ac 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/WindBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WindBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.topia.binder.referential.seine; /*- * #%L @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.WindDto; +import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.